Marthee commited on
Commit
b20bfb9
·
1 Parent(s): 0ea692b

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +10 -5
app.py CHANGED
@@ -1,5 +1,5 @@
1
  from __future__ import print_function
2
- from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify
3
  import os
4
  import json
5
  import fitz
@@ -38,11 +38,12 @@ def getprjnamesfromTestAPI():
38
  @app.route('/getprojectparts/<jsdata>',methods=['GET'])
39
  def getprjpartsfromTestAPI(jsdata):
40
  prjparts=API.getprjParts(jsdata)
41
- return jsonify(prjparts)
42
 
43
  @app.route('/getprojectsections/<jsdata>',methods=['GET'])
44
  def getprjSectionsfromTestAPI(jsdata):
45
- sections=API.getprjSections(jsdata)
 
46
  return jsonify(sections)
47
 
48
 
@@ -85,7 +86,7 @@ def update_dropdown(section):
85
  def getInfotoMeasure():
86
  # db.create_folder()
87
  mylist=[1,2,3,4]
88
- return render_template("proposed-GUI.html",mylist=mylist)
89
  #_________________________________________________________________________________________________________________________
90
  #_________________________________________________________________________________________________________________________
91
  #Hex value to RGB value
@@ -112,7 +113,7 @@ def stringToRGB():
112
  # return opencv_img
113
  return jsonify(arr)
114
 
115
- @app.route('/2o1Trial/',methods=["POST"])
116
  def measure2_1():
117
  name = request.get_json()
118
  result=name.get('allvalues')
@@ -135,6 +136,7 @@ def measureproject(result,img=0):
135
  # item1 ='#'+item
136
  c=hexRGB(item)
137
  colorarr.append(c)
 
138
  imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed,spreadsheet_url, spreadsheetId,list1, pdflink, areas_Perimeters, namepathArr =pilecaps_adr.drawAllContours(img,result[1],colorarr, result[3], result[4],'area', result[0],pdfpath)
139
  _, buffer = cv2.imencode('.png', image_new1)
140
  arr=[base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(),spreadsheet_url , spreadsheetId,colorsUsed,list1.to_dict(), pdflink, areas_Perimeters, namepathArr]
@@ -169,7 +171,9 @@ def measureproject(result,img=0):
169
  @app.route("/canvaspdftoimgBackground/<jsdata>",methods=["GET", "POST"])
170
  def pdftoimgCanvas(jsdata):
171
  img=plan2img('dropbox_plans/1.0/'+jsdata)
 
172
  # print('imgdone','dropbox_plans/1.0/'+jsdata )
 
173
  _, buffer = cv2.imencode('.png', img)
174
  arr=[base64.b64encode(buffer).decode('utf-8') , img.shape[0],img.shape[1]]
175
  return jsonify(arr)
@@ -392,6 +396,7 @@ def getlinkscreated(jsdata):
392
 
393
  #_________________________________________________________________________________________________________________________
394
  #_________________________________________________________________________________________________________________________
 
395
  if __name__ == "__main__":
396
  app.run(host="0.0.0.0", port=7860)
397
 
 
1
  from __future__ import print_function
2
+ from flask import Flask, render_template,request , json , jsonify
3
  import os
4
  import json
5
  import fitz
 
38
  @app.route('/getprojectparts/<jsdata>',methods=['GET'])
39
  def getprjpartsfromTestAPI(jsdata):
40
  prjparts=API.getprjParts(jsdata)
41
+ return prjparts
42
 
43
  @app.route('/getprojectsections/<jsdata>',methods=['GET'])
44
  def getprjSectionsfromTestAPI(jsdata):
45
+ data=json.loads(jsdata)
46
+ sections=API.getprjSections(data[0],data[1])
47
  return jsonify(sections)
48
 
49
 
 
86
  def getInfotoMeasure():
87
  # db.create_folder()
88
  mylist=[1,2,3,4]
89
+ return render_template("proposed-GUI2.html",mylist=mylist)
90
  #_________________________________________________________________________________________________________________________
91
  #_________________________________________________________________________________________________________________________
92
  #Hex value to RGB value
 
113
  # return opencv_img
114
  return jsonify(arr)
115
 
116
+ @app.route('/2.1Trial/',methods=["POST"])
117
  def measure2_1():
118
  name = request.get_json()
119
  result=name.get('allvalues')
 
136
  # item1 ='#'+item
137
  c=hexRGB(item)
138
  colorarr.append(c)
139
+ print('RATIOS=',result[3], result[4])
140
  imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed,spreadsheet_url, spreadsheetId,list1, pdflink, areas_Perimeters, namepathArr =pilecaps_adr.drawAllContours(img,result[1],colorarr, result[3], result[4],'area', result[0],pdfpath)
141
  _, buffer = cv2.imencode('.png', image_new1)
142
  arr=[base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(),spreadsheet_url , spreadsheetId,colorsUsed,list1.to_dict(), pdflink, areas_Perimeters, namepathArr]
 
171
  @app.route("/canvaspdftoimgBackground/<jsdata>",methods=["GET", "POST"])
172
  def pdftoimgCanvas(jsdata):
173
  img=plan2img('dropbox_plans/1.0/'+jsdata)
174
+ # img=cv2.resize(img, (0, 0), fx = 0.5, fy = 0.5)
175
  # print('imgdone','dropbox_plans/1.0/'+jsdata )
176
+
177
  _, buffer = cv2.imencode('.png', img)
178
  arr=[base64.b64encode(buffer).decode('utf-8') , img.shape[0],img.shape[1]]
179
  return jsonify(arr)
 
396
 
397
  #_________________________________________________________________________________________________________________________
398
  #_________________________________________________________________________________________________________________________
399
+
400
  if __name__ == "__main__":
401
  app.run(host="0.0.0.0", port=7860)
402