Update pilecaps_adr.py

pilecaps_adr.py

@@ -50,7 +50,7 @@ def detectCircles(imgOriginal ):
   # Apply Hough transform on the blurred image.
    # min distance between circles,  Upper threshold for the internal Canny edge detector.
   detected_circles = cv2.HoughCircles( er1, cv2.HOUGH_GRADIENT, 1, 50, param1= 550,
-                    param2 =21, minRadius = 20, maxRadius = 40) #18 param2
+                    param2 =21, minRadius = 20, maxRadius = 50) #18 param2
     
   # Draw circles that are detected.
   if detected_circles is not None:
@@ -60,9 +60,6 @@ def detectCircles(imgOriginal ):
     #DRAW CIRCLES
       for (x, y, r) in detected_circles:
         cv2.circle(im, (x, y), r, (255, 255, 255), 5)
-  im=cv2.medianBlur(im,1)
-  print('circles')
-  # cv2_imshow(im)
   return im
 
 def detectSmallCircles(img ):
@@ -74,7 +71,7 @@ def detectSmallCircles(img ):
   # Apply Hough transform on the blurred image.
    # min distance between circles,  Upper threshold for the internal Canny edge detector.
   detected_circles = cv2.HoughCircles( imgGry1, cv2.HOUGH_GRADIENT, 1, 60, param1 =550,
-                    param2 =13, minRadius = 1, maxRadius = 10) #18 param2
+                    param2 =13, minRadius = 1, maxRadius = 15) #18 param2
     
   # Draw circles that are detected.
   if detected_circles is not None:
@@ -122,7 +119,7 @@ def removeDashedLines(img4, imgBW ,max,min):
 
   for i in range(len(imgLines)):
       for x1,y1,x2,y2 in imgLines[i]:
-            cv2.line(imgBW,(x1,y1),(x2,y2),(0,255,0),2)
+            cv2.line(imgBW,(x1,y1),(x2,y2),(0,255,0),3)
 
   im_copy=imgBW.copy()
   green=im_copy[:,:,1]
@@ -138,8 +135,8 @@ def removeSmallDashes(imgOriginal,green):
   img1=cv2.dilate(smalldashes, kernel3, iterations=2)
   img2=cv2.erode(img1, kernel3, iterations=2)
 
-  smalldashes=cv2.medianBlur(img2,5)
-  smalldashes=cv2.medianBlur(smalldashes,7)
+  smalldashes=cv2.medianBlur(img2,7)
+  smalldashes=cv2.medianBlur(smalldashes,9)
   # cv2_imshow(smalldashes)
   smalldashesOut=green.copy()
   smalldashesOut=cv2.cvtColor(smalldashesOut,cv2.COLOR_GRAY2BGR)
@@ -148,7 +145,7 @@ def removeSmallDashes(imgOriginal,green):
   imgCopy=imgOriginal.copy()
   for i in range(len(imgLines)):
       for x1,y1,x2,y2 in imgLines[i]:
-          cv2.line(smalldashesOut,(x1,y1),(x2,y2),(0,255,0),2)
+          cv2.line(smalldashesOut,(x1,y1),(x2,y2),(0,255,0),3)
 
 
   smalldashesOut=smalldashesOut[:,:,1]
@@ -167,13 +164,13 @@ def euclidian_distance(point1, point2):
 def removeDashedLinesSmall(img4, imgBW ,max,min):
 
   imgBW=cv2.cvtColor(imgBW,cv2.COLOR_GRAY2BGR)
-  imgLines= cv2.HoughLinesP(img4,1,np.pi/100,20,minLineLength=(max-min)//2.2,maxLineGap = 70)  #2.1
+  imgLines= cv2.HoughLinesP(img4,1,np.pi/100,20,minLineLength=(max-min)//3.5,maxLineGap = 70)  #2.1
 
   for i in range(len(imgLines)):
       for x1,y1,x2,y2 in imgLines[i]:
            dist=euclidian_distance((x1,y1), (x2,y2))
           #  if dist > 1300 and dist <1450:
-           if dist >= (max-min)//2.1 and dist < (max-min)//1.9: #1.4
+           if dist >= (max-min)//2.3 and dist < (max-min)//1.9: #1.4
               cv2.line(imgBW,(x1,y1),(x2,y2),(0,255,0),3)
 
   im_copy=imgBW.copy()
@@ -185,12 +182,12 @@ def ConnectBeamLines(smalldashesOut):
   green1=cv2.bitwise_not(smalldashesOut)
   green2=smalldashesOut.copy()
   green2=cv2.cvtColor(green2,cv2.COLOR_GRAY2BGR)
-  imgLines= cv2.HoughLinesP(green1,0.05,np.pi/250,10,minLineLength=25,maxLineGap = 20)  #was w-h , gap=150  #50
-  for i in range(len(imgLines)):
-      for x1,y1,x2,y2 in imgLines[i]:
-          cv2.line(green2,(x1,y1),(x2,y2),(0,0,0),2)
+  # imgLines= cv2.HoughLinesP(green1,0.05,np.pi/250,10,minLineLength=25,maxLineGap = 20)  #was w-h , gap=150  #50
+  # for i in range(len(imgLines)):
+  #     for x1,y1,x2,y2 in imgLines[i]:
+  #         cv2.line(green2,(x1,y1),(x2,y2),(0,0,0),2)
 
-  imgLines= cv2.HoughLinesP(green1,1,np.pi/250,37,minLineLength=25,maxLineGap = 22)  #try 180
+  imgLines= cv2.HoughLinesP(green1,0.3,np.pi/180,20,minLineLength=25,maxLineGap = 25)  #try 180
 
 
   for i in range(len(imgLines)):
@@ -217,17 +214,14 @@ def ChangeBrightness(img,k):
   return imgdarker
 
 def preprocessold(img,number):
-
   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
+  kernel1=np.ones((3,3),np.uint8)
+  er1=cv2.dilate(imgGry,kernel1, iterations=1) #thinning
+  kernel2=np.ones((2,2),np.uint8)
+  er1=cv2.dilate(er1,kernel2, iterations=1) #thicken
   ret3, thresh = cv2.threshold(er1, 254, 255, cv2.THRESH_BINARY_INV  )
-
+  thresh=cv2.medianBlur(thresh,5)
   return thresh
 
 
@@ -250,8 +244,8 @@ 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), 5)
-          Blackmask=cv2.dilate(Blackmask,kernel, iterations=2)
+          cv2.drawContours(Blackmask,[cnt],0,(255,255,255), 7)
+          Blackmask=cv2.dilate(Blackmask,kernel, iterations=1)
         elif flag.startswith('area'):
           kernel=np.ones((2,2),np.uint8)
           cv2.drawContours(Blackmask,[cnt],0,(255,255,255), 4)
@@ -543,9 +537,9 @@ def getAreasPerimeter(green2,img,number,ratioarea,ratioperim,flag,finalColorArra
   for contour in range(len(contourss)):
       #   imgArea1=img.copy()
       area1 = cv2.contourArea(contourss[contour][0])
-      if (area1 >2000 ):
+      if (area1 >3500 ):
         perimeter = cv2.arcLength(contourss[contour][0],True)
-        approx = cv2.approxPolyDP(contourss[contour][0], 0.01* perimeter, True)
+        approx = cv2.approxPolyDP(contourss[contour][0], 0.007* perimeter, True)
         perimeter1 = cv2.arcLength(approx, True)
         # approx = cv2.approxPolyDP(contourss[contour][0], 0.01* perimeter, True)
         # area1 = cv2.contourArea(approx)
@@ -556,13 +550,13 @@ def getAreasPerimeter(green2,img,number,ratioarea,ratioperim,flag,finalColorArra
         if (angleR != 90.0 and angleR != -90.0 and angleR != 0.0 and angleR != -0.0 ): #inclined b ay degree
             width=widthR
             height=heightR
-        if (area1 > 2000 ): #check perimeter kman fl condition  -- 2800
+        if (area1 > 3500 ): #check perimeter kman fl condition  -- 2800
           # print('areass')
           if ratioarea!=0 and ratioperim!=0:
             # print('numss')
             # if flag=='area':
               # addedMargin=area1+perimeter1*2
-              areaa=round(area1* ratioarea , 2) # true value of area of any shape/ area px value of same shape
+              areaa=area1* ratioarea# true value of area of any shape/ area px value of same shape
               appended.append([areaa,width,height])
 
         #else:
@@ -677,8 +671,8 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
       if eachcolor==firstcolor: # 3shan a3rf el array of colors et3adet kam mara - to support embedded levels 
         counter+=1
 
-      contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,ratioarea,ratioperim,'perimeter',eachcolor) 
-      contourssA,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,ratioarea,ratioperim,'area',eachcolor) 
+      contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,ratioarea,ratioperim,'area',eachcolor) 
+      contourssA,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,ratioarea,ratioperim,'perimeter',eachcolor) 
       SimilarAreaDictionary, colorsUsed , areas_Perimeters= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,ratioarea,ratioperim,flag,finalColorArray,rgbcolor,eachcolor)
   
       for contour in range(len(contourss)):
@@ -688,7 +682,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
           area1 = cv2.contourArea(contourssA[contour][0])
           
           # perimeter1 = cv2.arcLength(contourss[contour][0], True)  
-          if (area1 > 2000 ): #check perimeter kman fl condition  -- 2800
+          if (area1 > 3500 ): #check perimeter kman fl condition  -- 2800
             rect = cv2.minAreaRect(contourss[contour][0])
 
             angleR,widthR ,heightR= StraightenImage(contourss[contour][0],imgArea1)
@@ -703,10 +697,10 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
             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.03 * perimeter, True) #0.0009
+            approx = cv2.approxPolyDP(contourss[contour][0], 0.007 * perimeter, True) #0.0009
             perimeter1 = cv2.arcLength(approx, True)
 
-            for point in contourss[contour][0]:
+            for point in approx:
               x1, y1 = point[0]
               p1 = fitz.Point(x1*ratio,y1*ratio)
               p1=p1*page.derotation_matrix
@@ -719,17 +713,15 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
               lengthShape = width
             else:
               lengthShape = height
-            widthMin= width-10
-            widthMax= width+10
-            heightMin=height-10
-            heightMax= height+10
+            widthMin= width-15
+            widthMax= width+15
+            heightMin=height-15
+            heightMax= height+15
             if ratioarea !=0 and ratioperim!=0:
               widthh=round(width*ratioperim,3)
               heightt=round(height*ratioperim,3)
               # if flag=='area':
               areaa=round(area1* ratioarea, 3) # true value of area of any shape/ area px value of same shape
-              
-              # elif flag=='perimeter':
               perimeterr=round(perimeter1* ratioperim,3)
               lengthShape=round(lengthShape* ratioperim,3)
             else:
@@ -737,8 +729,8 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
               perimeterr=perimeter1
 
             # if flag=='area':
-            areaPerimeterMin= round(areaa,1) - 0.2
-            areaPerimeterMax= round(areaa,1) + 0.2
+            areaPerimeterMin= round(areaa,1) - 0.25
+            areaPerimeterMax= round(areaa,1) + 0.25
             # areaPerimeterMin= round(perimeterr,1) - 0.3
             # areaPerimeterMax= round(perimeterr,1) + 0.3
             masked=SimilarAreaDictionary.loc[SimilarAreaDictionary.index[((SimilarAreaDictionary['Rounded'] >=areaPerimeterMin) &(SimilarAreaDictionary['Rounded']<=areaPerimeterMax)  )]]
@@ -798,7 +790,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
     for contour in range(len(contourss)):
     #   imgArea1=img.copy()
       area1 = cv2.contourArea(contourssA[contour][0])
-      if (area1 >2000 ):
+      if (area1 >3500 ):
         perimeter = cv2.arcLength(contourss[contour][0],True)
 
         shape=[]
@@ -808,9 +800,9 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
         # 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.03 * perimeter, True) #0.0009
+        approx = cv2.approxPolyDP(contourss[contour][0], 0.007 * perimeter, True) #0.0009
         perimeter1 = cv2.arcLength(approx, True)
-        for point in contourss[contour][0]:
+        for point in approx:
             x1, y1 = point[0]
             p1 = fitz.Point(x1*ratio,y1*ratio)
             p1=p1*page.derotation_matrix
@@ -823,10 +815,10 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
         if height>width:
           lengthShape = height
 
-        widthMin= width-10
-        widthMax= width+10
-        heightMin=height-10
-        heightMax= height+10
+        widthMin= width-15
+        widthMax= width+15
+        heightMin=height-15
+        heightMax= height+15
 
         if ratioarea !=0 and ratioperim!=0:
             areaa= round(area1* ratioarea,3) # true value of area of any shape/ area px value of same shape
@@ -834,8 +826,8 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
             lengthShape=round(lengthShape* ratioperim,3)
         else:
           perimeterr=perimeter1
-        areaPerimeterMin= round(areaa,1) - 0.2
-        areaPerimeterMax= round(areaa,1) + 0.2
+        areaPerimeterMin= round(areaa,1) - 0.25
+        areaPerimeterMax= round(areaa,1) + 0.25
         masked=SimilarAreaDictionary.loc[SimilarAreaDictionary.index[((SimilarAreaDictionary['Rounded'] >=areaPerimeterMin) & (SimilarAreaDictionary['Rounded']<=areaPerimeterMax)  )]]
         passed=0
         for i, row in masked.iterrows():