Update app.py
Browse files
app.py
CHANGED
|
@@ -986,7 +986,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
|
|
| 986 |
temp_file.write(dxfpath)
|
| 987 |
temp_filename = temp_file.name
|
| 988 |
print(temp_filename)
|
| 989 |
-
|
| 990 |
print("result = ",result)
|
| 991 |
SearchArray=result[6]
|
| 992 |
parsed_url = urlparse(result[0])
|
|
@@ -996,14 +996,14 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
|
|
| 996 |
points_Of_drawing_Canvas=drawonpdf(nameofpdf,result[7]) ########################## points of manual drawing hereee
|
| 997 |
if pdf_content:
|
| 998 |
if section.startswith('3.3'):
|
| 999 |
-
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray, pdfpath,result[0],pdf_content)
|
| 1000 |
else:
|
| 1001 |
-
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_pretty_xml, column_xml=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray, pdfpath,result[0],pdf_content)
|
| 1002 |
else:
|
| 1003 |
if section.startswith('3.3'):
|
| 1004 |
-
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,pdfpath,result[0])
|
| 1005 |
else:
|
| 1006 |
-
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_pretty_xml, column_xml=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,pdfpath,result[0])
|
| 1007 |
global colorsused
|
| 1008 |
colorsused=list(SimilarAreaDictionary['Color'])
|
| 1009 |
dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
|
|
@@ -1030,16 +1030,16 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
|
|
| 1030 |
temp_file.write(dxfpath)
|
| 1031 |
temp_filename = temp_file.name
|
| 1032 |
print(temp_filename)
|
| 1033 |
-
|
| 1034 |
SearchArray=result[6]
|
| 1035 |
Thickness=result[7]
|
| 1036 |
print(result)
|
| 1037 |
print("SearchArray = ",SearchArray)
|
| 1038 |
global hatched_areas2_7
|
| 1039 |
if pdf_content:
|
| 1040 |
-
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,Thickness, pdfpath,result[0],pdf_content)
|
| 1041 |
else:
|
| 1042 |
-
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,Thickness, pdfpath,result[0])
|
| 1043 |
# global colorsused
|
| 1044 |
hatched_areas2_7=hatched_areas
|
| 1045 |
colorsused=list(SimilarAreaDictionary['Color'])
|
|
|
|
| 986 |
temp_file.write(dxfpath)
|
| 987 |
temp_filename = temp_file.name
|
| 988 |
print(temp_filename)
|
| 989 |
+
CorrectionRatio=result[7]
|
| 990 |
print("result = ",result)
|
| 991 |
SearchArray=result[6]
|
| 992 |
parsed_url = urlparse(result[0])
|
|
|
|
| 996 |
points_Of_drawing_Canvas=drawonpdf(nameofpdf,result[7]) ########################## points of manual drawing hereee
|
| 997 |
if pdf_content:
|
| 998 |
if section.startswith('3.3'):
|
| 999 |
+
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio, pdfpath,result[0],pdf_content)
|
| 1000 |
else:
|
| 1001 |
+
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_pretty_xml, column_xml=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio, pdfpath,result[0],pdf_content)
|
| 1002 |
else:
|
| 1003 |
if section.startswith('3.3'):
|
| 1004 |
+
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio,pdfpath,result[0])
|
| 1005 |
else:
|
| 1006 |
+
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_pretty_xml, column_xml=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio,pdfpath,result[0])
|
| 1007 |
global colorsused
|
| 1008 |
colorsused=list(SimilarAreaDictionary['Color'])
|
| 1009 |
dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
|
|
|
|
| 1030 |
temp_file.write(dxfpath)
|
| 1031 |
temp_filename = temp_file.name
|
| 1032 |
print(temp_filename)
|
| 1033 |
+
CorrectionRatio=result[8]
|
| 1034 |
SearchArray=result[6]
|
| 1035 |
Thickness=result[7]
|
| 1036 |
print(result)
|
| 1037 |
print("SearchArray = ",SearchArray)
|
| 1038 |
global hatched_areas2_7
|
| 1039 |
if pdf_content:
|
| 1040 |
+
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,CorrectionRatio,Thickness, pdfpath,result[0],pdf_content)
|
| 1041 |
else:
|
| 1042 |
+
doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,CorrectionRatio,Thickness, pdfpath,result[0])
|
| 1043 |
# global colorsused
|
| 1044 |
hatched_areas2_7=hatched_areas
|
| 1045 |
colorsused=list(SimilarAreaDictionary['Color'])
|