Update app.py
Browse files
app.py
CHANGED
|
@@ -891,14 +891,14 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
|
|
| 891 |
|
| 892 |
# apdf.write('b.pdf')
|
| 893 |
# annotationsDraw
|
| 894 |
-
return imgPerimeter1,image_new1,
|
| 895 |
# drawAllContours(img,0,[],1.11,25579,'area') #,[190,47,250] ,[47,251,255] ,[80,240,15],[253,163,40]
|
| 896 |
# imgPerimeter1,image_new1,Dictionary=drawAllContours(img,220,[47,251,255],[251,163,47],1.105,27233.5,'area')
|
| 897 |
|
| 898 |
|
| 899 |
def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
|
| 900 |
|
| 901 |
-
imgPerimeter1,image_new1,Df2=drawAllContours(green2,img,number,finalColorArray,num1,num2,flag)
|
| 902 |
# x = path.split("/")
|
| 903 |
# x=x.pop()
|
| 904 |
Df2=Df2.T
|
|
@@ -912,9 +912,9 @@ def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
|
|
| 912 |
Df2=Df2.reindex(['MC-Template-Name','Perimeter','Color', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 913 |
else:
|
| 914 |
if flag=='area':
|
| 915 |
-
Df2=Df2.reindex(['MC-Template-Name','Area', 'Occurences', 'TotalArea', 'Unit'])
|
| 916 |
else:
|
| 917 |
-
Df2=Df2.reindex(['MC-Template-Name','Perimeter', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 918 |
|
| 919 |
# display(Df2)
|
| 920 |
return Df2, imgPerimeter1,image_new1
|
|
|
|
| 891 |
|
| 892 |
# apdf.write('b.pdf')
|
| 893 |
# annotationsDraw
|
| 894 |
+
return imgPerimeter1,image_new1,SimilarAreaDictionary
|
| 895 |
# drawAllContours(img,0,[],1.11,25579,'area') #,[190,47,250] ,[47,251,255] ,[80,240,15],[253,163,40]
|
| 896 |
# imgPerimeter1,image_new1,Dictionary=drawAllContours(img,220,[47,251,255],[251,163,47],1.105,27233.5,'area')
|
| 897 |
|
| 898 |
|
| 899 |
def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
|
| 900 |
|
| 901 |
+
imgPerimeter1,image_new1,Df2,s=drawAllContours(green2,img,number,finalColorArray,num1,num2,flag)
|
| 902 |
# x = path.split("/")
|
| 903 |
# x=x.pop()
|
| 904 |
Df2=Df2.T
|
|
|
|
| 912 |
Df2=Df2.reindex(['MC-Template-Name','Perimeter','Color', 'Occurences', 'Total Perimeter', 'Unit'])
|
| 913 |
else:
|
| 914 |
if flag=='area':
|
| 915 |
+
Df2=Df2.reindex(['MC-Template-Name','Area', 'Occurences', 'TotalArea','Color', 'Unit'])
|
| 916 |
else:
|
| 917 |
+
Df2=Df2.reindex(['MC-Template-Name','Perimeter', 'Occurences', 'Total Perimeter','Color', 'Unit'])
|
| 918 |
|
| 919 |
# display(Df2)
|
| 920 |
return Df2, imgPerimeter1,image_new1
|