Update pilecaps_adr.py

pilecaps_adr.py

@@ -218,17 +218,21 @@ def ChangeBrightness(img,k):
 
 def preprocessold(img,number):
 
-  blurG = cv2.GaussianBlur(ChangeBrightness(img,6),(3,3),0 )
+  blurG = ChangeBrightness(img,3)
   imgGry = cv2.cvtColor(blurG, cv2.COLOR_BGR2GRAY)
   kernel=np.ones((3,3),np.uint8)
   er1=cv2.dilate(imgGry,kernel, iterations=2) #thinning
+  kernel=np.ones((2,2),np.uint8)
+  er1=cv2.erode(er1,kernel, iterations=3) #thicken
+  # er1=cv2.dilate(er1,kernel, iterations=1) #thicken
+  # er1=cv2.dilate(er1,kernel, iterations=1) #thicken
   if number == 0:
-    ret3, thresh = cv2.threshold(er1, 0, 255, cv2.THRESH_BINARY_INV  + cv2.THRESH_OTSU)
+    ret3, thresh = cv2.threshold(er1, 254, 255, cv2.THRESH_BINARY_INV  )
   else:
     ret3, thresh = cv2.threshold(er1, 220, 255, cv2.THRESH_BINARY_INV) #`140 - 141
-
   return thresh
 
+
 def preprocess(imgOriginal,number,green2,flag,layeredflag,BlackmaskDetected1=0):
   #first preprocessing ( old method - black img with white shapes)
   img1=preprocessold(imgOriginal,number)
@@ -248,12 +252,12 @@ def preprocess(imgOriginal,number,green2,flag,layeredflag,BlackmaskDetected1=0):
         x, y , width, height = cv2.boundingRect(cnt)
         if flag.startswith('perimeter'):
           kernel=np.ones((2,2),np.uint8)
-          cv2.drawContours(Blackmask,[cnt],0,(255,255,255), 6)
-          Blackmask=cv2.dilate(Blackmask,kernel, iterations=1)
+          cv2.drawContours(Blackmask,[cnt],0,(255,255,255), 5)
+          Blackmask=cv2.dilate(Blackmask,kernel, iterations=2)
         elif flag.startswith('area'):
           kernel=np.ones((2,2),np.uint8)
-          cv2.drawContours(Blackmask,[cnt],0,(255,255,255), 5)
-          Blackmask=cv2.erode(Blackmask,kernel, iterations=1)
+          cv2.drawContours(Blackmask,[cnt],0,(255,255,255), 4)
+          Blackmask=cv2.dilate(Blackmask,kernel, iterations=1)
         contours1, hier1 = cv2.findContours(Blackmask, cv2.RETR_EXTERNAL,cv2.CHAIN_APPROX_SIMPLE)
         finalcnts.append(contours1)
   finalcnts=tuple(finalcnts)
@@ -591,8 +595,8 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,ratioarea,ratioperim,
       widthMax= width1+10
       heightMin=height1-10
       heightMax= height1+10
-      areaPerimeterMin= round(item1,1) - 0.3
-      areaPerimeterMax= round(item1,1) + 0.3
+      areaPerimeterMin= round(item1,1) - 0.2
+      areaPerimeterMax= round(item1,1) + 0.2
       # print (areaMin, areaMax)
       if color != [0,0,0]: #colored images 
 
@@ -683,7 +687,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
           shape=[]
           
           # cv2_imshow(imgStraight)
-          area1 = cv2.contourArea(contourss[contour][0])
+          area1 = cv2.contourArea(contourssA[contour][0])
           
           # perimeter1 = cv2.arcLength(contourss[contour][0], True)  
           if (area1 > 2000 ): #check perimeter kman fl condition  -- 2800
@@ -699,9 +703,9 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
 
             x, y , width, height = cv2.boundingRect(contourss[contour][0])
             perimeter = cv2.arcLength(contourss[contour][0], True)
-            approx = cv2.approxPolyDP(contourssA[contour][0], 0.0002* perimeter, True)
-            area1 = cv2.contourArea(approx)
-            approx = cv2.approxPolyDP(contourss[contour][0], 0.01 * perimeter, True) #0.0009
+            # approx = cv2.approxPolyDP(contourssA[contour][0], 0.0002* perimeter, True)
+            # area1 = cv2.contourArea(approx)
+            approx = cv2.approxPolyDP(contourss[contour][0], 0.03 * perimeter, True) #0.0009
             perimeter1 = cv2.arcLength(approx, True)
 
             for point in approx:
@@ -735,8 +739,8 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
               perimeterr=perimeter1
 
             # if flag=='area':
-            areaPerimeterMin= round(areaa,1) - 0.3
-            areaPerimeterMax= round(areaa,1) + 0.3
+            areaPerimeterMin= round(areaa,1) - 0.2
+            areaPerimeterMax= round(areaa,1) + 0.2
             # areaPerimeterMin= round(perimeterr,1) - 0.3
             # areaPerimeterMax= round(perimeterr,1) + 0.3
             masked=SimilarAreaDictionary.loc[SimilarAreaDictionary.index[((SimilarAreaDictionary['Rounded'] >=areaPerimeterMin) &(SimilarAreaDictionary['Rounded']<=areaPerimeterMax)  )]]
@@ -745,7 +749,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
             passed=0
             for i, row in masked.iterrows():
               if passed ==0:
-                if  (   SimilarAreaDictionary['Rounded'].loc[i]  <= areaPerimeterMax and SimilarAreaDictionary['Rounded'].loc[i]  >= areaPerimeterMin) :
+                if SimilarAreaDictionary['Color'].loc[i] == [rgbcolor[0],rgbcolor[1],rgbcolor[2]]  and   (   SimilarAreaDictionary['Rounded'].loc[i]  <= areaPerimeterMax and SimilarAreaDictionary['Rounded'].loc[i]  >= areaPerimeterMin) :
                     if (SimilarAreaDictionary['Width'].loc[i] <=widthMax and SimilarAreaDictionary['Width'].loc[i] >= widthMin)  and (SimilarAreaDictionary['Height'].loc[i] <= heightMax  and SimilarAreaDictionary['Height'].loc[i] >= heightMin  ) or (SimilarAreaDictionary['Width'].loc[i] <=heightMax and SimilarAreaDictionary['Width'].loc[i] >= heightMin)  and (SimilarAreaDictionary['Height'].loc[i] <= widthMax  and SimilarAreaDictionary['Height'].loc[i] >= widthMin  ) :
                         SimilarAreaDictionary['Total Area'].loc[i]+=areaa
                         SimilarAreaDictionary['Area'].loc[i]=areaa
@@ -765,11 +769,11 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
                         annot.set_colors( fill=(  int(SimilarAreaDictionary['R'].loc[i])/255 ,  int(SimilarAreaDictionary['G'].loc[i])/255 ,  int(SimilarAreaDictionary['B'].loc[i])/255 ) ) 
                         # annot.set_colors( fill=(1,0,1) )
                         annot.set_opacity(0.5)
-                        annot.set_info(content='Area='+str(areaa)+' m2' +'\n \nPerimeter='+str(perimeterr)+' m',subject='ADR Team')#,title='uuum')
+                        annot.set_info(content='Area= '+str(areaa)+' m2' +'\n \nPerimeter= '+str(perimeterr)+' m'   +'\n \nLength= '+str(lengthShape)+' m',subject='ADR Team')#,title='uuum')
                         # annot.set_line_ends(fitz.PDF_ANNOT_LE_DIAMOND, fitz.PDF_ANNOT_LE_CIRCLE)
                         annot.update()
            
-            cv2.putText(imgtransparent1,'Area= '+str(area1) , (x+50,y-10)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
+            # cv2.putText(imgtransparent1,'Area= '+str(area1) , (x+50,y-10)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
             # cv2.putText(imgtransparent1,'Width= '+str(width) , (x+50,y-10)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
             # cv2.putText(imgtransparent1,'Length= '+str(height) , (x+50,y-20)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
             areasinImage.append(areaa)
@@ -778,12 +782,12 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
             cv2.putText(imgPerimeter1,'Area: '+str(areaa)+' m2', (x+50,y-40)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
 
   
-    for i,row in SimilarAreaDictionary.iterrows():
-      # print(row)
-      if row[5] not in areasinImage: # column of area 
-        SimilarAreaDictionary = SimilarAreaDictionary.drop(SimilarAreaDictionary.loc[SimilarAreaDictionary.index==i].index)
+    # for i,row in SimilarAreaDictionary.iterrows():
+    #   # print(row)
+    #   if row[5] not in areasinImage: # column of area 
+    #     SimilarAreaDictionary = SimilarAreaDictionary.drop(SimilarAreaDictionary.loc[SimilarAreaDictionary.index==i].index)
 
-    print(SimilarAreaDictionary)
+    # print(SimilarAreaDictionary)
     # display(totaldf)
   #########################
   else:
@@ -795,7 +799,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
     # print('filled')
     for contour in range(len(contourss)):
     #   imgArea1=img.copy()
-      area1 = cv2.contourArea(contourss[contour][0])
+      area1 = cv2.contourArea(contourssA[contour][0])
       if (area1 >2000 ):
         perimeter = cv2.arcLength(contourss[contour][0],True)
 
@@ -804,9 +808,9 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
         x, y , width, height = cv2.boundingRect(contourss[contour][0])
         # approxo = cv2.approxPolyDP(contourss[contour],0.1*cv2.arcLength(contourss[contour],True),True)
         # approx = cv2.approxPolyDP(contourss[contour][0], 0.005 * perimeter, True)
-        approxa = cv2.approxPolyDP(contourssA[contour][0], 0.0002* perimeter, True)
-        area1 = cv2.contourArea(approxa)
-        approx = cv2.approxPolyDP(contourss[contour][0], 0.01 * perimeter, True) #0.0009
+        # approxa = cv2.approxPolyDP(contourssA[contour][0], 0.0002* perimeter, True)
+        # area1 = cv2.contourArea(approxa)
+        approx = cv2.approxPolyDP(contourss[contour][0], 0.03 * perimeter, True) #0.0009
         perimeter1 = cv2.arcLength(approx, True)
         for point in approx:
             x1, y1 = point[0]
@@ -821,19 +825,19 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
         if height>width:
           lengthShape = height
 
-        widthMin= width-15
-        widthMax= width+15
-        heightMin=height-15
-        heightMax= height+15
+        widthMin= width-10
+        widthMax= width+10
+        heightMin=height-10
+        heightMax= height+10
 
         if ratioarea !=0 and ratioperim!=0:
-            areaa=area1* ratioarea # true value of area of any shape/ area px value of same shape
+            areaa= round(area1* ratioarea,3) # true value of area of any shape/ area px value of same shape
             perimeterr=round(perimeter1* ratioperim,3)
             lengthShape=round(lengthShape* ratioperim,3)
         else:
           perimeterr=perimeter1
-        areaPerimeterMin= round(areaa,1) - 0.4
-        areaPerimeterMax= round(areaa,1) + 0.4
+        areaPerimeterMin= round(areaa,1) - 0.2
+        areaPerimeterMax= round(areaa,1) + 0.2
         masked=SimilarAreaDictionary.loc[SimilarAreaDictionary.index[((SimilarAreaDictionary['Rounded'] >=areaPerimeterMin) & (SimilarAreaDictionary['Rounded']<=areaPerimeterMax)  )]]
         passed=0
         for i, row in masked.iterrows():
@@ -858,7 +862,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
                     annot.set_colors( fill=(  int(SimilarAreaDictionary['R'].loc[i])/255 ,  int(SimilarAreaDictionary['G'].loc[i])/255 ,  int(SimilarAreaDictionary['B'].loc[i])/255 ) )
                     # annot.set_colors( fill=(1,0,1) )
                     annot.set_opacity(0.5)
-                    annot.set_info(content='Area='+str(areaa)+' m2' +'\n \nPerimeter='+str(perimeterr)+' m',subject='ADR Team')#,title='uuum')
+                    annot.set_info(content='Area= '+str(areaa)+' m2' +'\n \nPerimeter= '+str(perimeterr)+' m'  +'\n \nLength= '+str(lengthShape)+' m',subject='ADR Team')#,title='uuum')
                     # annot.set_line_ends(fitz.PDF_ANNOT_LE_DIAMOND, fitz.PDF_ANNOT_LE_CIRCLE)
                     annot.update()