Update dxf__omar3_2.py

dxf__omar3_2.py

@@ -87,100 +87,88 @@ def flip(img):
 """### Hatched areas"""
 
 def get_hatched_areas(filename):
-    doc = ezdxf.readfile(filename)
-    doc.header['$MEASUREMENT'] = 1
-    msp = doc.modelspace()
-    trial=0
-    hatched_areas = []
-
-    for entity in msp:
-        # print(entity.dxftype())
+      doc = ezdxf.readfile(filename)
+      doc.header['$MEASUREMENT'] = 1
+      msp = doc.modelspace()
+      trial=0
+      hatched_areas = []
+
+      for entity in msp:
+
         if entity.dxftype() == 'HATCH':
             flag=0
             trial=0
-            # print("Gowa el hatch")
+
+            print(entity.dxftype())
+
             for path in entity.paths:
-              # print("gowa el for")
-              try:
+              if str(path.type)=='BoundaryPathType.POLYLINE':
+                print('First type of Hatch')
                 vertices = [(vertex[0], vertex[1])for vertex in path.vertices]
                 if(len(vertices)>3):
-
                  poly = ShapelyPolygon(vertices)
 
-                 if poly.area > 0.5:
+                 minx, miny, maxx, maxy = poly.bounds
+
+                 # Calculate the width and height of the bounding box
+                 width = maxx - minx
+                 height = maxy - miny
+
+
+
+                 if (poly.area > 1.5 and (height > 0.7 and width > 0.7)):
                    area1 = round(poly.area,3)
                    perimeter = round (poly.length,3)
-
                    if trial==0:
                      hatched_areas.append([vertices,area1,perimeter])
                      trial=1
-                    #  print("hatched_areas = ", hatched_areas)
-
                    else:
-
                         for i in range(len(hatched_areas)):
-
                             if(area1 == hatched_areas[i][1]):
                               flag=1
-
-                        # if(flag==0):
-                        #     hatched_areas.append([vertices,area1])
-
-                  #  hatched_areas.append([vertices,area1])
-                # print("Gowa el hatch2")
-
-
-
-                #  print("Gowa el if ely b3d el hatch")
-
-                # if entity.area > 0.5:
-                #   hatched_areas.append([entity.area])
-
-              except:
-                # print("in except")
+              elif str(path.type) == 'BoundaryPathType.EDGE':
+                print('Second type of Hatch')
+              
                 vert=[]
                 flag=0
                 flag2=0
                 for edge in path.edges:
                   x,y=edge.start
                   x1,y1=edge.end
-                  # print(edge.start)
-                  # print(edge.end)
                   if(flag==0):
                     vert=[(x,y),(x1,y1)]
                   else:
                       vert.append([x1,y1])
                   flag=1
-                # print(vert)
                 poly = ShapelyPolygon(vert)
-                # print("New Hatch Area = ",poly.area)
+                minx, miny, maxx, maxy = poly.bounds
+
+                 # Calculate the width and height of the bounding box
+                width = maxx - minx
+                height = maxy - miny
 
-                if (poly.area > 0.5):
+                if (poly.area > 1.5 and (height > 0.7 and width > 0.7)):
                    area1= round(poly.area,3)
                    perimeter = round (poly.length,3)
-
                    for i in range(len(hatched_areas)):
-
                       if(area1 == hatched_areas[i][1]):
                         flag2=1
-
                    if(flag2==0):
                        hatched_areas.append([vert,area1,perimeter])
-                  #  hatched_areas.append([vert,area1])
-                # # hatched_areas.append(vertices)
-                # continue
+              else:
+                print(path.type)
 
         elif entity.dxftype() == 'SOLID':
-
             vertices = [entity.dxf.vtx0, entity.dxf.vtx1, entity.dxf.vtx2, entity.dxf.vtx3]
             poly = ShapelyPolygon(vertices)
-            # print("Gowa el solid")
+            minx, miny, maxx, maxy = poly.bounds
 
+            # Calculate the width and height of the bounding box
+            width = maxx - minx
+            height = maxy - miny
 
-            if poly.area > 0.5:
+            if (poly.area > 1.5 and (height > 0.7 and width > 0.7)):
              hatched_areas.append([vertices,poly.area,poly.length])
-            #  print("Gowa el if ely b3d el solid")
-
 
         elif entity.dxftype() == 'LWPOLYLINE':
 
@@ -196,51 +184,71 @@ def get_hatched_areas(filename):
              if(vertices[0][0] == vertices[len(vertices)-1][0]  or vertices[0][1] == vertices[len(vertices)-1][1]):
 
                poly=ShapelyPolygon(vertices)
-              #  print("vertices==",vertices)
+               minx, miny, maxx, maxy = poly.bounds
 
-               if poly.area > 0.5:
+               # Calculate the width and height of the bounding box
+               width = maxx - minx
+               height = maxy - miny
 
+               if (poly.area > 1.5 and (height > 0.7 and width > 0.7)):
                 area1 = round(poly.area,3)
                 perimeter = round (poly.length,3)
-
                 for i in range(len(hatched_areas)):
-
                   if(area1 == hatched_areas[i][1]):
                      flag=1
-
                 if(flag==0):
                    hatched_areas.append([vertices,area1,perimeter])
 
 
+        elif entity.dxftype() == 'POLYLINE':
 
-        elif entity.dxftype() == 'SPLINE':
+          flag=0
+          vertices = [(v.dxf.location.x, v.dxf.location.y) for v in entity.vertices]
+          print('Vertices:', vertices)
 
-          spline_entity = entity
+          if(len(vertices)>3):
 
-          vertices = []
+             if(vertices[0][0] == vertices[len(vertices)-1][0]  or vertices[0][1] == vertices[len(vertices)-1][1]):
 
-          control_points = spline_entity.control_points
+               poly=ShapelyPolygon(vertices)
+               minx, miny, maxx, maxy = poly.bounds
 
+               # Calculate the width and height of the bounding box
+               width = maxx - minx
+               height = maxy - miny
 
-          if(len(control_points)>3):
+               if (poly.area > 1.5 and (height > 0.7 and width > 0.7)):
+                area1 = round(poly.area,3)
+                perimeter = round (poly.length,3)
+                for i in range(len(hatched_areas)):
+                  if(area1 == hatched_areas[i][1]):
+                     flag=1
+                if(flag==0):
+                   hatched_areas.append([vertices,area1,perimeter])
 
+        elif entity.dxftype() == 'SPLINE':
+          spline_entity = entity
+          vertices = []
+          control_points = spline_entity.control_points
+          if(len(control_points)>3):
             for i in range(len(control_points)):
               vertices.append([control_points[i][0],control_points[i][1]])
-
-
-
             poly=ShapelyPolygon(vertices)
 
+            minx, miny, maxx, maxy = poly.bounds
 
+            # Calculate the width and height of the bounding box
+            width = maxx - minx
+            height = maxy - miny
 
 
-            if poly.area > 0.5:
-
+            if (poly.area > 1.5 and (height > 0.7 and width > 0.7)):
                 area1 = round(poly.area,3)
                 perimeter = round (poly.length,3)
-
                 hatched_areas.append([vertices,area1,perimeter])
-    return hatched_areas
+
+      sorted_data = sorted(hatched_areas, key=lambda x: x[1])
+      return sorted_data
 
 """### Rotate polygon"""
 
@@ -301,15 +309,22 @@ def Create_DF(dxfpath):
 
   hatched_areas = get_hatched_areas(dxfpath)
   # SimilarAreaDictionary= pd.DataFrame(columns=['Area', 'Total Area', 'Perimeter', 'Total Perimeter', 'Occurences', 'Color'])
-  SimilarAreaDictionary= pd.DataFrame(columns=['Guess','Color','Occurences','Area','Total Area','Perimeter','Total Perimeter','Length','Total Length','Texts'])
+  SimilarAreaDictionary= pd.DataFrame(columns=['Guess','Color','Occurences','Area','Total Area','Perimeter','Total Perimeter','Length','Total Length','Texts','Comments'])
     
-  colorRanges=generate_color_array(300)
+  colorRanges2=generate_color_array(300)
+  colorRanges=[[255,0,0],[0,0,255],[0,255,255],[0,64,0],[255,204,0],[255,128,64],[255,0,128],[255,128,192],[128,128,255],[128,64,0],[0,255,0],[179,106,179],[115,52,179],[0,128,192],[128,0,128],[128,0,0],[0,128,255],[255,182,128],[255,0,255],[0,0,128],[0,128,64],[255,255,0],[128,0,64],[203,203,106],[128,255,166],[255,128,0],[255,98,98],[90,105,138],[114,10,72],[36,82,78],[225,105,29],[108,62,40],[11,35,75],[42,176,203],[255,153,153],[129,74,138],[99,123,137],[159,179,30]]
+  colorUsed=[]
   TotalArea=0
   TotalPerimeter=0
   for i in range(len(hatched_areas)):
       area = hatched_areas[i][1]  # area
       perimeter = hatched_areas[i][2]  # perimeter
-      color = colorRanges[i]
+      if(i < len(colorRanges)):
+        color = colorRanges[i]
+        colorUsed.append(color)
+      else:
+        color = colorRanges2[i]
+        colorUsed.append(color)
       TotalArea = area
       TotalPerimeter = perimeter
       tol=1
@@ -325,7 +340,7 @@ def Create_DF(dxfpath):
       else:
           TotalArea=area
           TotalPerimeter=perimeter
-          new_data = {'Area': area, 'Total Area': TotalArea ,'Perimeter': perimeter, 'Total Perimeter': TotalPerimeter, 'Occurences': 1, 'Color':color} #add color here and read color to insert in
+          new_data = {'Area': area, 'Total Area': TotalArea ,'Perimeter': perimeter, 'Total Perimeter': TotalPerimeter, 'Occurences': 1, 'Color':color,'Comments':''} #add color here and read color to insert in
           SimilarAreaDictionary = pd.concat([SimilarAreaDictionary, pd.DataFrame([new_data])], ignore_index=True)
 
   # print(SimilarAreaDictionary)
@@ -333,13 +348,12 @@ def Create_DF(dxfpath):
 """### Draw on Image and PDF"""
 
 def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,pdfpath,pdfname):
-
   hatched_areas = get_hatched_areas(dxfpath)
   img=pdftoimg(datadoc)
   flipped_horizontal=flip(img)
   allcnts = []
   imgg = flipped_horizontal
-  imgtransparent1=imgg.copy()
+  # imgtransparent1=imgg.copy()
   doc = fitz.open('pdf',datadoc)
   page2 = doc[0]
   rotationOld=page2.rotation
@@ -375,19 +389,16 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,pdfpath,pdfname):
           cntPoints.append([int(x), int(y)])
           cntPoints1.append([x, y])
 
-      
-
       for poi in np.array(cntPoints1):
           x1, y1 = poi
           p1 = fitz.Point(x1,y1)
           # p1 = fitz.Point(x1,y1)
-          p1=p1*derotationMatrix
+          p1=p1*page2.derotation_matrix
           shapee.append([p1[0],p1[1]])
 
       shapee=np.flip(shapee,1)
       shapee=rotate_polygon(shapee,rotationangle,rotationOld,page2.mediabox)
 
-      
       tol=1
       condition1 = (SimilarAreaDictionary['Area'] >= polygon[1] - tol) & (SimilarAreaDictionary['Area'] <= polygon[1] +tol)
       condition2 = (SimilarAreaDictionary['Perimeter'] >= polygon[2] -tol) & (SimilarAreaDictionary['Perimeter'] <= polygon[2] +tol)
@@ -438,5 +449,5 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,pdfpath,pdfname):
   for page in doc:
       for annot in page.annots():
           list1.loc[len(list1)] =annot.info
-  return doc,image_new1, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1
+  return doc,image_new1, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas