Update app.py
Browse files
app.py
CHANGED
|
@@ -1141,12 +1141,12 @@ def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,
|
|
| 1141 |
Dictionary, imgPerimeter1,image_new1,colorsUsed =MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
|
| 1142 |
|
| 1143 |
Dictionary=Dictionary.T
|
| 1144 |
-
s=s.to_html()
|
| 1145 |
# Dictionary.to_excel("output.xlsx")
|
| 1146 |
|
| 1147 |
if (radioButton1=='Area'):
|
| 1148 |
-
return image_new1,Dictionary
|
| 1149 |
-
return imgPerimeter1,Dictionary
|
| 1150 |
|
| 1151 |
''' General measurement function'''
|
| 1152 |
def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1=0,num2=0):
|
|
@@ -1168,13 +1168,13 @@ def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,i
|
|
| 1168 |
|
| 1169 |
|
| 1170 |
if num1!=0 and num2!=0:
|
| 1171 |
-
imgPerimeter1,Dictionary
|
| 1172 |
imgPerimeter1= cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
|
| 1173 |
if SaveOP:
|
| 1174 |
pushToDropbox(plan,imgPerimeter1,Dictionary)
|
| 1175 |
if check1:
|
| 1176 |
exportToExcel(plan,Dictionary)
|
| 1177 |
-
return imgPerimeter1,Dictionary
|
| 1178 |
else:
|
| 1179 |
area=PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
|
| 1180 |
area = cv2.cvtColor(area, cv2.COLOR_BGR2RGB)
|
|
@@ -1276,7 +1276,7 @@ with gr.Blocks(css="#search {background: orangered}") as mainBlock:
|
|
| 1276 |
with gr.Column():
|
| 1277 |
out1=gr.Image(label="Image", type="pil", image_mode="RGBA")
|
| 1278 |
out2=gr.Dataframe(label='Dictionary', interactive=True) # row_count = (5, "fixed")
|
| 1279 |
-
out3=gr.HTML( elem_id="coords", visible=True)
|
| 1280 |
|
| 1281 |
|
| 1282 |
buttonSaveDf=gr.Button("Save dataframe")
|
|
@@ -1288,7 +1288,7 @@ with gr.Blocks(css="#search {background: orangered}") as mainBlock:
|
|
| 1288 |
# btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
|
| 1289 |
#secoond part
|
| 1290 |
# btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
|
| 1291 |
-
btn.click(fn=getMeasurement, inputs=[ drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2],outputs=[out1,out2
|
| 1292 |
project.change(fn=update_dropdown, inputs=[project], outputs=drop)
|
| 1293 |
|
| 1294 |
mainBlock.launch(debug=True,enable_queue=True)
|
|
|
|
| 1141 |
Dictionary, imgPerimeter1,image_new1,colorsUsed =MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
|
| 1142 |
|
| 1143 |
Dictionary=Dictionary.T
|
| 1144 |
+
# s=s.to_html()
|
| 1145 |
# Dictionary.to_excel("output.xlsx")
|
| 1146 |
|
| 1147 |
if (radioButton1=='Area'):
|
| 1148 |
+
return image_new1,Dictionary #,str(rgbValue),
|
| 1149 |
+
return imgPerimeter1,Dictionary
|
| 1150 |
|
| 1151 |
''' General measurement function'''
|
| 1152 |
def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1=0,num2=0):
|
|
|
|
| 1168 |
|
| 1169 |
|
| 1170 |
if num1!=0 and num2!=0:
|
| 1171 |
+
imgPerimeter1,Dictionary = PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2)
|
| 1172 |
imgPerimeter1= cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
|
| 1173 |
if SaveOP:
|
| 1174 |
pushToDropbox(plan,imgPerimeter1,Dictionary)
|
| 1175 |
if check1:
|
| 1176 |
exportToExcel(plan,Dictionary)
|
| 1177 |
+
return imgPerimeter1,Dictionary
|
| 1178 |
else:
|
| 1179 |
area=PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
|
| 1180 |
area = cv2.cvtColor(area, cv2.COLOR_BGR2RGB)
|
|
|
|
| 1276 |
with gr.Column():
|
| 1277 |
out1=gr.Image(label="Image", type="pil", image_mode="RGBA")
|
| 1278 |
out2=gr.Dataframe(label='Dictionary', interactive=True) # row_count = (5, "fixed")
|
| 1279 |
+
# out3=gr.HTML( elem_id="coords", visible=True)
|
| 1280 |
|
| 1281 |
|
| 1282 |
buttonSaveDf=gr.Button("Save dataframe")
|
|
|
|
| 1288 |
# btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
|
| 1289 |
#secoond part
|
| 1290 |
# btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
|
| 1291 |
+
btn.click(fn=getMeasurement, inputs=[ drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2],outputs=[out1,out2])
|
| 1292 |
project.change(fn=update_dropdown, inputs=[project], outputs=drop)
|
| 1293 |
|
| 1294 |
mainBlock.launch(debug=True,enable_queue=True)
|