Marthee commited on
Commit
436ca6c
·
1 Parent(s): 568520b

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +8 -7
app.py CHANGED
@@ -895,11 +895,11 @@ def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
895
  # display(Df2)
896
  return Df2, imgPerimeter1,image_new1
897
 
898
- def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,num1=0,num2=0):
899
  print(type(img))
900
  green2=allpreSteps(img)
901
 
902
- colorArray=[color,color1,color2,color3,color4,color5,color6,color7]
903
  finalColorArray=[]
904
  for c in colorArray:
905
  checkcolor=c.lstrip('#')
@@ -944,7 +944,7 @@ def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color
944
  return imgPerimeter1,Dictionary
945
 
946
  ''' General measurement function'''
947
- def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1=0,num2=0):
948
 
949
  if plan==None:
950
  area,perim,df=None,None,None
@@ -963,7 +963,7 @@ def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,i
963
 
964
 
965
  if num1!=0 and num2!=0:
966
- imgPerimeter1,Dictionary= PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2)
967
  imgPerimeter1= cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
968
  if SaveOP:
969
  pushToDropbox(plan,imgPerimeter1,Dictionary)
@@ -971,7 +971,7 @@ def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,i
971
  exportToExcel(plan,Dictionary)
972
  return imgPerimeter1,Dictionary
973
  else:
974
- area=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
975
  area = cv2.cvtColor(area, cv2.COLOR_BGR2RGB)
976
  # if SaveOP:
977
  # pushToDropbox(plan, area)
@@ -1027,6 +1027,7 @@ with gr.Blocks(css="#search {background: orangered}") as mainBlock:
1027
  in9=gr.ColorPicker(label="color" )
1028
  in10=gr.ColorPicker(label="color" )
1029
  in11=gr.ColorPicker(label="color" )
 
1030
 
1031
  # clr_btn=gr.Button(value='Clear')
1032
  #######################################################
@@ -1057,13 +1058,13 @@ with gr.Blocks(css="#search {background: orangered}") as mainBlock:
1057
  buttonSaveDf=gr.Button("Save dataframe")
1058
 
1059
  # getMeasurement(plan,SaveOP) #drop, check
1060
- show_button.click(fn=getMeasurement, inputs=[ drop, check ,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11],outputs=img1)
1061
  buttonSaveDf.click(fn=saveExcel,inputs=[out2,project])
1062
  # clr_btn.click(fn=clear,outputs=[project,radio_button,check,drop])
1063
  # btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
1064
  #secoond part
1065
  # btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
1066
- btn.click(fn=getMeasurement, inputs=[ drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2],outputs=[out1,out2])
1067
  project.change(fn=update_dropdown, inputs=[project], outputs=drop)
1068
 
1069
  mainBlock.launch(debug=True,enable_queue=True)
 
895
  # display(Df2)
896
  return Df2, imgPerimeter1,image_new1
897
 
898
+ def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,color8,num1=0,num2=0):
899
  print(type(img))
900
  green2=allpreSteps(img)
901
 
902
+ colorArray=[color,color1,color2,color3,color4,color5,color6,color7,color8]
903
  finalColorArray=[]
904
  for c in colorArray:
905
  checkcolor=c.lstrip('#')
 
944
  return imgPerimeter1,Dictionary
945
 
946
  ''' General measurement function'''
947
+ def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1=0,num2=0):
948
 
949
  if plan==None:
950
  area,perim,df=None,None,None
 
963
 
964
 
965
  if num1!=0 and num2!=0:
966
+ imgPerimeter1,Dictionary= PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2)
967
  imgPerimeter1= cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
968
  if SaveOP:
969
  pushToDropbox(plan,imgPerimeter1,Dictionary)
 
971
  exportToExcel(plan,Dictionary)
972
  return imgPerimeter1,Dictionary
973
  else:
974
+ area=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
975
  area = cv2.cvtColor(area, cv2.COLOR_BGR2RGB)
976
  # if SaveOP:
977
  # pushToDropbox(plan, area)
 
1027
  in9=gr.ColorPicker(label="color" )
1028
  in10=gr.ColorPicker(label="color" )
1029
  in11=gr.ColorPicker(label="color" )
1030
+ in12=gr.ColorPicker(label="color" )
1031
 
1032
  # clr_btn=gr.Button(value='Clear')
1033
  #######################################################
 
1058
  buttonSaveDf=gr.Button("Save dataframe")
1059
 
1060
  # getMeasurement(plan,SaveOP) #drop, check
1061
+ show_button.click(fn=getMeasurement, inputs=[ drop, check ,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12],outputs=img1)
1062
  buttonSaveDf.click(fn=saveExcel,inputs=[out2,project])
1063
  # clr_btn.click(fn=clear,outputs=[project,radio_button,check,drop])
1064
  # btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
1065
  #secoond part
1066
  # btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
1067
+ 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])
1068
  project.change(fn=update_dropdown, inputs=[project], outputs=drop)
1069
 
1070
  mainBlock.launch(debug=True,enable_queue=True)