Marthee commited on
Commit
49e4824
·
verified ·
1 Parent(s): 9c9a7e1

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -4
app.py CHANGED
@@ -38,7 +38,7 @@ import deploying_3_3
38
  import Doors_Schedule
39
  import Code_2_7
40
  import Counting_Columns_2_1
41
- # import Find_Hyperlinking_text
42
  import ezdxf
43
  from flask import Flask, render_template, session, redirect, url_for
44
  from flask_session import Session # Capital "S"
@@ -265,7 +265,7 @@ def stringToRGB():
265
  arr=measureproject(vv,dataDoc,opencv_img)
266
 
267
 
268
- if vv[5][2].startswith('2.8') or vv[5][2].startswith('2.1'):
269
  pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(vv[0]))
270
  dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
271
  md, res =dbxTeam.files_download(path=pdfpath)
@@ -368,7 +368,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
368
  arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,[],namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
369
  # arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
370
  ################################# -2.8- #################################
371
- elif result[5][2].startswith('2.8'): #section value - 2.8 floor finishes
372
  #vv[0] array of pdf names
373
  imgss=[]
374
  dpxlinks=[]
@@ -660,7 +660,7 @@ def dltmarkupslegend():
660
  areaPermArr=hatched_areas2_7
661
  if section.startswith('1.0') or section.startswith('3.2') or section.startswith('3.3'):
662
  newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section,areaPermArr=areaPermArr)
663
- elif section.startswith('2.8'):
664
  newlgnd=google_sheet_Legend.deletedoors(deletedrows,SimilarAreaDictionary)
665
  print('done wit 2.8 in deleting, didnt append yet ')
666
  else:
 
38
  import Doors_Schedule
39
  import Code_2_7
40
  import Counting_Columns_2_1
41
+ import Find_Hyperlinking_text
42
  import ezdxf
43
  from flask import Flask, render_template, session, redirect, url_for
44
  from flask_session import Session # Capital "S"
 
265
  arr=measureproject(vv,dataDoc,opencv_img)
266
 
267
 
268
+ if vv[5][2].startswith('2.8') or vv[5][2].startswith('2.6') or vv[5][2].startswith('2.1'):
269
  pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(vv[0]))
270
  dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
271
  md, res =dbxTeam.files_download(path=pdfpath)
 
368
  arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,[],namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
369
  # arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
370
  ################################# -2.8- #################################
371
+ elif result[5][2].startswith('2.8') or result[5][2].startswith('2.6'): #section value - 2.8 floor finishes
372
  #vv[0] array of pdf names
373
  imgss=[]
374
  dpxlinks=[]
 
660
  areaPermArr=hatched_areas2_7
661
  if section.startswith('1.0') or section.startswith('3.2') or section.startswith('3.3'):
662
  newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section,areaPermArr=areaPermArr)
663
+ elif section.startswith('2.8') or section.startswith('2.6'):
664
  newlgnd=google_sheet_Legend.deletedoors(deletedrows,SimilarAreaDictionary)
665
  print('done wit 2.8 in deleting, didnt append yet ')
666
  else: