Marthee commited on
Commit
208f1e7
·
verified ·
1 Parent(s): 7b33f34

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +6 -5
app.py CHANGED
@@ -39,9 +39,9 @@ import ezdxf
39
  app = Flask(__name__)
40
 
41
 
42
- prjnamesURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=0'
43
- prjpartsURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=2102042200'
44
- prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=1708565170'
45
 
46
 
47
 
@@ -188,12 +188,12 @@ def measureproject(result,dataDoc,img=0,dxffile=0):
188
  temp_file.write(dxfpath)
189
  temp_filename = temp_file.name
190
  print(temp_filename)
191
- doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
192
  dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
193
  pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
194
 
195
  _, buffer = cv2.imencode('.png', outputimg)
196
- arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,[],namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
197
  ################################# -2.2- #################################
198
  # elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
199
  #add here python code
@@ -416,6 +416,7 @@ def dltmarkupslegend():
416
  spreadsheetId=alljson.get('spreadsheetId')
417
  # spreadsheetId =request.args.get('spreadsheetId')
418
  areaPermArr=alljson.get('areaPermArr')
 
419
  # areaPermArr=request.args.get('areaPermArr')
420
  section=alljson.get('section')
421
  # section=request.args.get('section')
 
39
  app = Flask(__name__)
40
 
41
 
42
+ prjnamesURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=0'
43
+ prjpartsURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=34865056'
44
+ prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=1751466819'
45
 
46
 
47
 
 
188
  temp_file.write(dxfpath)
189
  temp_filename = temp_file.name
190
  print(temp_filename)
191
+ doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
192
  dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
193
  pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
194
 
195
  _, buffer = cv2.imencode('.png', outputimg)
196
+ arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
197
  ################################# -2.2- #################################
198
  # elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
199
  #add here python code
 
416
  spreadsheetId=alljson.get('spreadsheetId')
417
  # spreadsheetId =request.args.get('spreadsheetId')
418
  areaPermArr=alljson.get('areaPermArr')
419
+ print('aaaaaaaaaaaaa',areaPermArr)
420
  # areaPermArr=request.args.get('areaPermArr')
421
  section=alljson.get('section')
422
  # section=request.args.get('section')