Update app.py
Browse files
app.py
CHANGED
|
@@ -878,19 +878,19 @@ def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
|
|
| 878 |
# x = path.split("/")
|
| 879 |
# x=x.pop()
|
| 880 |
Df2=Df2.T
|
| 881 |
-
|
| 882 |
Df2.loc['Unit'] = str(dp) #get from user through a dropdown
|
| 883 |
Df2 = Df2.astype(str)
|
| 884 |
if (number ==220):
|
| 885 |
if flag=='area':
|
| 886 |
-
Df2=Df2.reindex(['Area','Color', 'Occurences', 'Total Area', 'Unit'])
|
| 887 |
else:
|
| 888 |
-
Df2=Df2.reindex(['Perimeter','Color', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 889 |
else:
|
| 890 |
if flag=='area':
|
| 891 |
-
Df2=Df2.reindex(['Area', 'Occurences', 'Total Area', 'Unit'])
|
| 892 |
else:
|
| 893 |
-
Df2=Df2.reindex(['Perimeter', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 894 |
|
| 895 |
# display(Df2)
|
| 896 |
return Df2, imgPerimeter1,image_new1
|
|
@@ -1002,6 +1002,11 @@ def update_dropdown(project):
|
|
| 1002 |
######################################################################################
|
| 1003 |
def clear(demo):
|
| 1004 |
return None,None,None,None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1005 |
|
| 1006 |
with gr.Blocks(css="#search {background: orangered}") as mainBlock:
|
| 1007 |
with gr.Row():
|
|
@@ -1045,18 +1050,19 @@ with gr.Blocks(css="#search {background: orangered}") as mainBlock:
|
|
| 1045 |
check=gr.Checkbox(label='SaveOutput')
|
| 1046 |
check1=gr.Checkbox(label='Export to Excel')
|
| 1047 |
with gr.Column():
|
| 1048 |
-
|
| 1049 |
-
|
| 1050 |
-
|
| 1051 |
-
|
| 1052 |
|
| 1053 |
# getMeasurement(plan,SaveOP) #drop, check
|
| 1054 |
show_button.click(fn=getMeasurement, inputs=[ drop, check ,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11],outputs=img1)
|
| 1055 |
-
|
|
|
|
| 1056 |
# btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
|
| 1057 |
#secoond part
|
| 1058 |
# btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
|
| 1059 |
-
btn.click(fn=getMeasurement, inputs=[ drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2],outputs=
|
| 1060 |
project.change(fn=update_dropdown, inputs=[project], outputs=drop)
|
| 1061 |
|
| 1062 |
mainBlock.launch(debug=True,enable_queue=True)
|
|
|
|
| 878 |
# x = path.split("/")
|
| 879 |
# x=x.pop()
|
| 880 |
Df2=Df2.T
|
| 881 |
+
Df2.loc['Name']=''
|
| 882 |
Df2.loc['Unit'] = str(dp) #get from user through a dropdown
|
| 883 |
Df2 = Df2.astype(str)
|
| 884 |
if (number ==220):
|
| 885 |
if flag=='area':
|
| 886 |
+
Df2=Df2.reindex(['Name','Area','Color', 'Occurences', 'Total Area', 'Unit'])
|
| 887 |
else:
|
| 888 |
+
Df2=Df2.reindex(['Name','Perimeter','Color', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 889 |
else:
|
| 890 |
if flag=='area':
|
| 891 |
+
Df2=Df2.reindex(['Name','Area', 'Occurences', 'Total Area', 'Unit'])
|
| 892 |
else:
|
| 893 |
+
Df2=Df2.reindex(['Name','Perimeter', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 894 |
|
| 895 |
# display(Df2)
|
| 896 |
return Df2, imgPerimeter1,image_new1
|
|
|
|
| 1002 |
######################################################################################
|
| 1003 |
def clear(demo):
|
| 1004 |
return None,None,None,None
|
| 1005 |
+
###############################################################
|
| 1006 |
+
def saveExcel(Dictionary):
|
| 1007 |
+
# Dictionary.to_excel("output.xlsx",index=False)
|
| 1008 |
+
d=dropbox_upload_file('.',local_file=Dictionary,dropbox_file_path='/savedMeasurements/'+plan+'summaryNamed.csv')
|
| 1009 |
+
|
| 1010 |
|
| 1011 |
with gr.Blocks(css="#search {background: orangered}") as mainBlock:
|
| 1012 |
with gr.Row():
|
|
|
|
| 1050 |
check=gr.Checkbox(label='SaveOutput')
|
| 1051 |
check1=gr.Checkbox(label='Export to Excel')
|
| 1052 |
with gr.Column():
|
| 1053 |
+
out1=gr.Image(label="Image", type="pil", image_mode="RGBA")
|
| 1054 |
+
out2=gr.Dataframe(label='Dictionary', interactive=True) # row_count = (5, "fixed")
|
| 1055 |
+
|
| 1056 |
+
buttonSaveDf=gr.Button("Save dataframe")
|
| 1057 |
|
| 1058 |
# getMeasurement(plan,SaveOP) #drop, check
|
| 1059 |
show_button.click(fn=getMeasurement, inputs=[ drop, check ,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11],outputs=img1)
|
| 1060 |
+
buttonSaveDf.click(fn=saveExcel,inputs=out2)
|
| 1061 |
+
# clr_btn.click(fn=clear,outputs=[project,radio_button,check,drop])
|
| 1062 |
# btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
|
| 1063 |
#secoond part
|
| 1064 |
# btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
|
| 1065 |
+
btn.click(fn=getMeasurement, inputs=[ drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2],outputs=[out1,out2])
|
| 1066 |
project.change(fn=update_dropdown, inputs=[project], outputs=drop)
|
| 1067 |
|
| 1068 |
mainBlock.launch(debug=True,enable_queue=True)
|