Update app.py

app.py

@@ -21,15 +21,30 @@ from werkzeug.wsgi import wrap_file
 import tameem3_2
 import pypdfium2 as pdfium
 import pixelconversion
+import tameem2_1
 import urllib.request
 import base64
 import io
 from urllib.parse import unquote
-
-
+import API
 app = Flask(__name__)
 
 # out_file = open("static/data/myfile.json", "w")
+@app.route('/getprojectnames/',methods=['GET'])
+def getprjnamesfromTestAPI():
+    prjnames=API.getPrjNames()
+    return jsonify(prjnames)
+
+@app.route('/getprojectparts/<jsdata>',methods=['GET'])
+def getprjpartsfromTestAPI(jsdata):
+    prjparts=API.getprjParts(jsdata)
+    return jsonify(prjparts)
+
+@app.route('/getprojectsections/<jsdata>',methods=['GET'])
+def getprjSectionsfromTestAPI(jsdata):
+    sections=API.getprjSections(jsdata)
+    return jsonify(sections)
+
 
 #retrieves project parts 
 @app.route('/getmethod/<jsdata>',methods=['GET','POST'])
@@ -40,7 +55,7 @@ def get_javascript_data(jsdata):
     print(matches)
     return jsonify (list(matches))
 #---------------------------------------------------------------
-    
+
 #get projects of 'project name'
 def update_dropdown(section):
     if section.startswith('1.0'):
@@ -49,6 +64,8 @@ def update_dropdown(section):
         plans_inrepo=os.listdir('dropbox_plans/3.2')
     elif section.startswith('2.2'):
         plans_inrepo=os.listdir('dropbox_plans/2.2') 
+    elif section.startswith('2.1'):
+        plans_inrepo=os.listdir('dropbox_plans/2.1') 
     else:
         return ''
     #if 'foundation' in radio and project in plans_inrepo
@@ -68,7 +85,7 @@ def update_dropdown(section):
 def getInfotoMeasure():
     # db.create_folder()
     mylist=[1,2,3,4]
-    return render_template("proposed-GUI.html",mylist=mylist)
+    return render_template("proposed-GUI2.html",mylist=mylist)
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 #Hex value to RGB value
@@ -95,26 +112,25 @@ def stringToRGB():
     # return opencv_img 
     return jsonify(arr)
 
-
+@app.route('/2.1Trial/',methods=["POST"])
+def measure2_1():
+    name = request.get_json()
+    result=name.get('allvalues')
+    arr=measureproject(result)
+    return arr
 #MAIN FUNCTION -- calls python code to measure the chosen plan from the interface
 # @app.route('/projecttomeasure/<jsdata>',methods=["GET","POST"])
-def measureproject(result,img):
+def measureproject(result,img=0):
     colorarr=[]
     # result = json.loads(jsdata) 
     pdfpath='/'
     #################################  -1.0- #################################
+    
     for word in result[5]:
         pdfpath+=word +'/'
     arr=[]
 
     if result[5][2].startswith('1.0'): #section value - 1.0 substructure- pile caps
-        # img0 = plan2img('dropbox_plans/1.0/'+str(result[0]) )
-       
-        # if (result[1]!=0):
-        # img=stringToRGB(result[6], img0.shape)
-        # print('p',result[6])
-        
-
         for item in result[2]:
             # item1 ='#'+item 
             c=hexRGB(item)
@@ -142,6 +158,10 @@ def measureproject(result,img):
 
         #let first result to be the img 
         #return results in arr=[base64.b64encode(buffer).decode('utf-8'),pdflink,spreadsheetId,spreadsheet_url] like the previous sections in the above lines 
+    elif result[5][2].startswith('2.1'): #section value - 2.1 frames
+        url = tameem2_1.mainfun( result[0], pdfpath)
+        return jsonify([url])
+
     return  arr
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
@@ -258,6 +278,8 @@ def getimg(jsdata):
         doc = fitz.open('dropbox_plans/3.2/'+str(jsdata[3]) )
     elif jsdata[2].startswith('2.2'):
         doc = fitz.open('dropbox_plans/2.2/'+str(jsdata[3]) )
+    elif jsdata[2].startswith('2.1'):
+        doc = fitz.open('dropbox_plans/2.1/'+str(jsdata[3]) )
     else: 
         return ''
     for page in doc:
@@ -273,6 +295,8 @@ def getimg(jsdata):
         doc=pixelconversion.openDrawPDF(path='dropbox_plans/3.2/'+str(jsdata[3]))
     elif jsdata[2].startswith('2.2'):
         doc=pixelconversion.openDrawPDF(path='dropbox_plans/2.2/'+str(jsdata[3]))
+    elif jsdata[2].startswith('2.1'):
+        doc=pixelconversion.openDrawPDF(path='dropbox_plans/2.1/'+str(jsdata[3]))
     pdfpath='/'+jsdata[0]+'/'+jsdata[1]+'/'+jsdata[2]+'/'+'Scale Document' +'/'
     dburl=db.dropbox_upload_file(doc=doc,pdfname=str(jsdata[3]) ,pdfpath=pdfpath,flag=1)
     areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(pdfpath, str(jsdata[3]))