Update pilecaps_adr.py

pilecaps_adr.py

@@ -651,31 +651,6 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,ratioarea,ratioperim,
 
 
 
-def rotate_point(point, angle, center_point=(0, 0)):
-    """Rotates a point around center_point(origin by default)
-    Angle is in degrees.
-    Rotation is counter-clockwise
-    """
-    angle_rad = radians(angle % 360)
-    # Shift the point so that center_point becomes the origin
-    new_point = (point[0] - center_point[0], point[1] - center_point[1])
-    new_point = (new_point[0] * cos(angle_rad) - new_point[1] * sin(angle_rad),
-                 new_point[0] * sin(angle_rad) + new_point[1] * cos(angle_rad))
-    # Reverse the shifting we have done
-    new_point = (new_point[0] + center_point[0], new_point[1] + center_point[1])
-    return new_point
-
-def rotate_polygon(polygon, angle, center_point=(0, 0)):
-    """Rotates the given polygon which consists of corners represented as (x,y)
-    around center_point (origin by default)
-    Rotation is counter-clockwise
-    Angle is in degrees
-    """
-    rotated_polygon = []
-    for corner in polygon:
-        rotated_corner = rotate_point(corner, angle, center_point)
-        rotated_polygon.append(rotated_corner)
-    return rotated_polygon
 
 def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,pdfpath):
   green2=allpreSteps(img)
@@ -690,14 +665,8 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
   allpoints=[]
 
   if number ==220:
-    # finalColorArray= colorOrder(img,finalColorArray)
-    # if flag== 'area':
-    #   SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Area','Occurences','Total Area' , 'R','G','B']) #
-    # else:
-      # SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Perimeter','Occurences','Total Perimeter' ,'R','G','B'])
     SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Occurences','Area','Total Area','Perimeter','Total Perimeter','Length','Total Length','R','G','B'])
     firstcolor=finalColorArray[0]
-    # print(lastcolor)
     counter=0
     maskDone=img.copy()
     for eachcolor in finalColorArray:
@@ -710,11 +679,6 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
       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)
   
-      a = SimilarAreaDictionary.to_numpy()
-      
-      # for component in zip(contourss,hierarchy):
-      #     contour = component[0]
-      #     currentHierarchy = component[1]
       for contour in range(len(contourss)):
           shape=[]
           
@@ -739,18 +703,19 @@ 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]
               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
             if width>height:
               lengthShape = width
-            if height>width:
+            else:
               lengthShape = height
             widthMin= width-10
             widthMax= width+10
@@ -780,7 +745,7 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
             passed=0
             for i, row in masked.iterrows():
               if passed ==0:
-                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['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
@@ -844,11 +809,10 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
         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]
-          p1 = fitz.Point(x1*ratio,y1*ratio)
-          p1=p1*page.derotation_matrix
-          shape.append([p1[0],p1[1]])
-            
+            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
@@ -909,8 +873,8 @@ def drawAllContours(img,number,finalColorArray,ratioarea,ratioperim,flag , path,
  
   # annotationsSave
 
-  
   pdflink= db.dropbox_upload_file(doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/')
+  print('pdfpath,link',pdfpath,pdflink)
   dbx=db.dropbox_connect()
   md, res =dbx.files_download(path= pdfpath+path)
   data = res.content
@@ -1132,11 +1096,9 @@ def legendGoogleSheets(SimilarAreaDictionary,path ,pdfpath, spreadsheetId=0):
   ws.create_developer_metadata('path',pdfpath)
   splittedpdfpath=re.split(r'[`\-=~!@#$%^&*()_+\[\]{};\'\\:"|<,/<>?]', pdfpath)
   namepathArr=[legendTitle , spreadsheetId,ws.get_developer_metadata('path')[0].value]
-  if splittedpdfpath[-2].startswith('2.2'):
-    df=[]
-    worksheet.update( df.values.tolist()) #CHECKKKK 
-
-
+  if splittedpdfpath[-2].startswith('2.2') or splittedpdfpath[-2].startswith('2.1') :
+    worksheet.set_dataframe(start='A1',df=SimilarAreaDictionary)
+    print(SimilarAreaDictionary)
   else:
     top_header_format = [
         {'mergeCells': { #areas
@@ -1198,23 +1160,24 @@ def legendGoogleSheets(SimilarAreaDictionary,path ,pdfpath, spreadsheetId=0):
     worksheet.cell((2,6)).value='Perimeters'
     worksheet.cell((2,8)).value='Lengths'
     second_row_data=['Nr','m2','Total','m','Total','m','Total']
-
-    worksheet.update_row(3,second_row_data,col_offset=2)
-
-    worksheet.update_col(3,list(SimilarAreaDictionary['Occurences']),row_offset=3)
-    worksheet.update_col(4,list(SimilarAreaDictionary['Area']),row_offset=3)
-    worksheet.update_col(5,list(SimilarAreaDictionary['Total Area']),row_offset=3)
-    worksheet.update_col(6,list(SimilarAreaDictionary['Perimeter']),row_offset=3)
-    worksheet.update_col(7,list(SimilarAreaDictionary['Total Perimeter']),row_offset=3)
+    if splittedpdfpath[-2].startswith('1.0') or  splittedpdfpath[-2].startswith('3.2'):
+      worksheet.update_row(3,second_row_data,col_offset=2)
+
+      worksheet.update_col(3,list(SimilarAreaDictionary['Occurences']),row_offset=3)
+      worksheet.update_col(4,list(SimilarAreaDictionary['Area']),row_offset=3)
+      worksheet.update_col(5,list(SimilarAreaDictionary['Total Area']),row_offset=3)
+      worksheet.update_col(6,list(SimilarAreaDictionary['Perimeter']),row_offset=3)
+      worksheet.update_col(7,list(SimilarAreaDictionary['Total Perimeter']),row_offset=3)
+    
+      worksheet.update_col(8,list(SimilarAreaDictionary['Length']),row_offset=3)
+      worksheet.update_col(9,list(SimilarAreaDictionary['Total Length']),row_offset=3)
+      if splittedpdfpath[-2].startswith('1.0'):
+        colorsUsed=[]
+        for i in range(len(SimilarAreaDictionary)):
+          colorsUsed.append([SimilarAreaDictionary['R'].iloc[i]  ,SimilarAreaDictionary['G'].iloc[i] , SimilarAreaDictionary['B'].iloc[i]] )
+      elif splittedpdfpath[-2].startswith('3.2'):
+        colorsUsed=list(SimilarAreaDictionary['Color'])
   
-    worksheet.update_col(8,list(SimilarAreaDictionary['Length']),row_offset=3)
-    worksheet.update_col(9,list(SimilarAreaDictionary['Total Length']),row_offset=3)
-    if splittedpdfpath[-2].startswith('1.0'):
-      colorsUsed=[]
-      for i in range(len(SimilarAreaDictionary)):
-        colorsUsed.append([SimilarAreaDictionary['R'].iloc[i]  ,SimilarAreaDictionary['G'].iloc[i] , SimilarAreaDictionary['B'].iloc[i]] )
-    elif splittedpdfpath[-2].startswith('3.2'):
-      colorsUsed=list(SimilarAreaDictionary['Color'])
     #legend specs here 
     rowsLen=len(SimilarAreaDictionary.values.tolist()) #kam row -- last row = rowsLen +1
     lastcell=worksheet.cell((rowsLen+2,1)) #row,col
@@ -1361,9 +1324,9 @@ def legendGoogleSheets(SimilarAreaDictionary,path ,pdfpath, spreadsheetId=0):
     model_cell.set_horizontal_alignment( pygsheets.custom_types.HorizontalAlignment.CENTER )
     model_cell.color  = (213/255,	219/255	,255/255)
     pygsheets.DataRange('A2','I2', worksheet=worksheet).apply_format(model_cell)
-    spreadsheet_url = "https://docs.google.com/spreadsheets/d/%s" % spreadsheetId
-    print(spreadsheet_url)
-    drive_service.permissions().update(transferOwnership=True , fileId=spreadsheetId,permissionId='11OfoB4Z6wOVII8mYmbnCbbqTQs7rYA65') 
+  spreadsheet_url = "https://docs.google.com/spreadsheets/d/%s" % spreadsheetId
+  print(spreadsheet_url)
+  drive_service.permissions().update(transferOwnership=True , fileId=spreadsheetId,permissionId='11OfoB4Z6wOVII8mYmbnCbbqTQs7rYA65') 
 
 
   return gc,spreadsheet_service,spreadsheetId ,spreadsheet_url  , namepathArr
@@ -1449,8 +1412,6 @@ def mapnametoLegend(McTName):
             allgbnames+= name +' +'
             indices = [o for o, x in enumerate(guessednames) if x == name]
             print(indices)
-            # roww=worksheetw.find(str(name))
-            # print(roww)
             for j in range(len(indices)):
               # print('kjjjj',roww[j])
               ar+=float(worksheetw.cell((indices[j]+1 ,rowvalue)).value)