Update app.py
Browse files
app.py
CHANGED
|
@@ -408,7 +408,7 @@ def allLevelsofColor(BlackmaskDetected,img,levelonly, invertedmask,color,finalCo
|
|
| 408 |
if (area1 > 1000 ):
|
| 409 |
if hier[3]> -1:
|
| 410 |
cv2.drawContours(Blackmask,[cnt],0,(255,255,255), -1)
|
| 411 |
-
cv2.drawContours(Blackmask,[cnt],0,(0,0,0),
|
| 412 |
cv2.drawContours(BlackmaskDetected,[cnt],0,(255,255,255), -1)
|
| 413 |
|
| 414 |
firstLevel=cv2.bitwise_and(invertedmask,invertedmask,mask=Blackmask)
|
|
@@ -438,7 +438,7 @@ def allLevelsofColor(BlackmaskDetected,img,levelonly, invertedmask,color,finalCo
|
|
| 438 |
area1 = cv2.contourArea(cnt)
|
| 439 |
if (area1 > 1000 ):
|
| 440 |
cv2.drawContours(firstLevel1,[cnt],0,(255,255,255), -1)
|
| 441 |
-
cv2.drawContours(firstLevel1,[cnt],0,(255,255,255),
|
| 442 |
cv2.drawContours(BlackmaskDetected,[cnt],0,(0,0,0), -1)
|
| 443 |
|
| 444 |
return firstLevel1, BlackmaskDetected
|
|
@@ -964,11 +964,11 @@ def getMeasurement(plan,SaveOP, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num
|
|
| 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 |
return imgPerimeter1,Dictionary
|
| 969 |
else:
|
| 970 |
area=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
|
| 971 |
-
area = cv2.cvtColor(area, cv2.COLOR_RGB2BGR)
|
| 972 |
# if SaveOP:
|
| 973 |
# pushToDropbox(plan,area,perim,df)
|
| 974 |
return area
|
|
|
|
| 408 |
if (area1 > 1000 ):
|
| 409 |
if hier[3]> -1:
|
| 410 |
cv2.drawContours(Blackmask,[cnt],0,(255,255,255), -1)
|
| 411 |
+
cv2.drawContours(Blackmask,[cnt],0,(0,0,0), 20)
|
| 412 |
cv2.drawContours(BlackmaskDetected,[cnt],0,(255,255,255), -1)
|
| 413 |
|
| 414 |
firstLevel=cv2.bitwise_and(invertedmask,invertedmask,mask=Blackmask)
|
|
|
|
| 438 |
area1 = cv2.contourArea(cnt)
|
| 439 |
if (area1 > 1000 ):
|
| 440 |
cv2.drawContours(firstLevel1,[cnt],0,(255,255,255), -1)
|
| 441 |
+
cv2.drawContours(firstLevel1,[cnt],0,(255,255,255), 10)
|
| 442 |
cv2.drawContours(BlackmaskDetected,[cnt],0,(0,0,0), -1)
|
| 443 |
|
| 444 |
return firstLevel1, BlackmaskDetected
|
|
|
|
| 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 |
return imgPerimeter1,Dictionary
|
| 969 |
else:
|
| 970 |
area=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
|
| 971 |
+
# area = cv2.cvtColor(area, cv2.COLOR_RGB2BGR)
|
| 972 |
# if SaveOP:
|
| 973 |
# pushToDropbox(plan,area,perim,df)
|
| 974 |
return area
|