Update pilecaps_adr.py

pilecaps_adr.py

@@ -681,23 +681,12 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
   green2=allpreSteps(img)
   doc = fitz.open('dropbox_plans/1.0/'+path)
   page = doc[0]
-  # page.set_rotation(270)
   pix=page.get_pixmap()
-  print('SHAPPEE',img.shape)
-  # if img.shape[0] > img.shape[1]:
-  ratio =  pix.width / img.shape[1]  
-  # ratio0 = img.shape[1]  * pix.width
-  #   ratio=    pix.height /img.shape[0] 
- 
+  ratio =  pix.width / img.shape[1]   
   areasinImage=[]
-  totaldf=pd.DataFrame()
   imgArea1= img.copy()
   imgPerimeter1=img.copy()
   imgtransparent1=img.copy()
-
-  Blackmask = np.zeros(img.shape[:2], dtype="uint8")
-
-  invertedmask=img
   allpoints=[]
 
   if number ==220:
@@ -750,18 +739,12 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
             area1 = cv2.contourArea(approx)
             approx = cv2.approxPolyDP(contourss[contour][0], 0.01 * perimeter, True) #0.0009
             perimeter1 = cv2.arcLength(approx, True)
-
             for point in approx:
-                x1, y1 = point[0]
-                
-                shape.append([int(x1*ratio),int(y1*ratio)])
-                # shape= np.fliplr(shape)
-                
-                # cv2.circle(imgArea1, (x1, y1), 4, (0, 255, 0), -1)
-            allpoints.append(shape)
-            # print(x,y,width,height)
-            # print(allpoints)
-            # print(shape)
+              x1, y1 = point[0]
+              p1 = fitz.Point(x1*ratio,y1*ratio)
+              p1=p1*page.derotation_matrix
+              shape.append([p1[0],p1[1]])
+        
             if (angleR != 90.0 and angleR != -90.0 and angleR != 0.0 and angleR != -0.0 ): #inclined b ay degree 
               width=widthR
               height=heightR
@@ -860,16 +843,12 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
         area1 = cv2.contourArea(approxa)
         approx = cv2.approxPolyDP(contourss[contour][0], 0.01 * perimeter, True) #0.0009
         perimeter1 = cv2.arcLength(approx, True)
-        M = cv2.moments(contourssA[contour][0])
-        if M['m00'] != 0:
-          cx = int(M['m10']/M['m00'])
-          cy = int(M['m01']/M['m00'])
-  
-        for point in approxa:
-            x1, y1 = point[0]
-
-            shape.append([int(x1*ratio),int(y1*ratio)])
-        # shape=rotate_polygon(shape, 90)
+        for point in approx:
+          x1, y1 = point[0]
+          p1 = fitz.Point(x1*ratio,y1*ratio)
+          p1=p1*page.derotation_matrix
+          shape.append([p1[0],p1[1]])
+            
         if (angleR != 90.0 and angleR != -90.0 and angleR != 0.0 and angleR != -0.0 ): #inclined b ay degree
             width=widthR
             height=heightR