Update google_sheet_Legend.py

google_sheet_Legend.py

@@ -111,6 +111,7 @@ def update_sheet(spreadsheetId, SimilarAreaDictionary, pdfpath):
         worksheet.cell((2, 6)).value = 'Perimeters'
         worksheet.cell((2, 8)).value = 'Lengths'
         worksheet.cell((2, 10)).value = 'Texts'
+        worksheet.cell((2, 11)).value = 'Comments'
         second_row_data = ['Nr', 'm2', 'Total', 'm', 'Total', 'm', 'Total']
         worksheet.update_row(3, second_row_data, col_offset=2)
         worksheet.update_col(1, list(SimilarAreaDictionary['Guess']), row_offset=3)
@@ -122,6 +123,8 @@ def update_sheet(spreadsheetId, SimilarAreaDictionary, pdfpath):
         worksheet.update_col(8, list(SimilarAreaDictionary['Length']), row_offset=3)
         worksheet.update_col(9, list(SimilarAreaDictionary['Total Length']), row_offset=3)
         worksheet.update_col(10, list(SimilarAreaDictionary['Texts']), row_offset=3)
+        worksheet.update_col(11, list(SimilarAreaDictionary['Comments']), row_offset=3)
+        
         if splittedpdfpath[-2].startswith('1.0'):
             colorsUsed = [
                 [SimilarAreaDictionary['R'].iloc[i], SimilarAreaDictionary['G'].iloc[i], SimilarAreaDictionary['B'].iloc[i]]
@@ -461,6 +464,7 @@ def getguessnames(gc,ws):
 
 def deletefromlegend(deletedrows,SimilarAreaDictionarycopy,section, areaPermArr=[]):
   items=[]
+  print('dletefromlegend')
   idx=0
   if section.startswith('1.0'):
     areaPermArr=ast.literal_eval(areaPermArr)
@@ -471,66 +475,160 @@ def deletefromlegend(deletedrows,SimilarAreaDictionarycopy,section, areaPermArr=
   areastodelete = []
   perimstodelete=[]
   lengthstodelete=[]
-  
 
   for item in strings:
-    items.append(str(item).split('\n \n'))
-  # print('itemsssssss',float(re.findall("\d+\.\d+", str(items[i][0]).split()[0])[0])) #take area and perim mn hna l sec 3.2 and +/- value  margin 
-  
-  for i in range(len(items)):
-    print('ITEMSS',str(items[i]).split())
-    items=ast.literal_eval(str(items[i]))
-    areastodelete.append(float(re.findall("\d+\.\d+", str(items[i][0]).split()[1])[0]))
-    perimstodelete.append(float(re.findall("\d+\.\d+", str(items[i][1]).split()[1])[0]) )
-    lengthstodelete.append(float(re.findall("\d+\.\d+", str(items[i][2]).split()[1])[0]) )
-  
+    newitem=str(item).split('\n \n')
+    input_str = " ".join(str(newitem).split())
+    # Search for the Area value
+    matchA = re.search(r"Area=(\d+\.\d+)", input_str)
+    matchL = re.search(r"Length=(\d+\.\d+)", input_str)
+    matchP = re.search(r"Perimeter=(\d+\.\d+)", input_str)
+
+    if matchA:
+      areastodelete.append(float(matchA.group(1)))
+    if matchP:
+      perimstodelete.append(float(matchP.group(1)))
+    if matchL:
+      lengthstodelete.append(float(matchL.group(1))) 
+  print('Areas to delete:', areastodelete)
+  print('Perimeters to delete:', perimstodelete)
+  print('Lengths to delete:', lengthstodelete)
+
   for i in range(len(areastodelete)):#item in areastodelete:
-    areamin=round(areastodelete[i],1)- 0.3
-    areamax=round(areastodelete[i],1)+ 0.3
-    perimmin=round(perimstodelete[i],1)- 0.3
-    perimmax=round(perimstodelete[i],1)+ 0.3
     if section.startswith('1.0'):
-      for p in range(len(areaPermArr)):
-        
+      tol=0.3
+    elif section.startswith('3.2'):
+      tol=1
+    areamin=round(areastodelete[i],1)- tol
+    areamax=round(areastodelete[i],1)+ tol
+    if section.startswith('1.0'):
+      for p in range(len(areaPermArr)):  
         if areastodelete[i] in areaPermArr[p]:
-          print('AAA',areaPermArr[p])
-          area= areaPermArr[p][0]
           width= areaPermArr[p][1]
           height= areaPermArr[p][2]
-    # if section.startswith('1.0'):
+          break
       widthMin= width -10
       widthMax= width +10
       heightMin = height-10
       heightMax=height+10
-      found=SimilarAreaDictionarycopy.loc[SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Rounded'] >=areamin) & (SimilarAreaDictionarycopy['Rounded']<=areamax) & (SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)   ) & ( ((SimilarAreaDictionarycopy['Width']>=widthMin) & (SimilarAreaDictionarycopy['Width']<=widthMax) & (SimilarAreaDictionarycopy['Height']>=heightMin) & (SimilarAreaDictionarycopy['Height']<=heightMax) ) | ((SimilarAreaDictionarycopy['Width']>=heightMin) & (SimilarAreaDictionarycopy['Width']<=heightMax) & (SimilarAreaDictionarycopy['Height']>=widthMin) & (SimilarAreaDictionarycopy['Height']<=widthMax) )) ]]
+      if len(areastodelete)>0:
+        found=SimilarAreaDictionarycopy.loc[SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Rounded'] >=areamin) & (SimilarAreaDictionarycopy['Rounded']<=areamax)  ) & ( ((SimilarAreaDictionarycopy['Width']>=widthMin) & (SimilarAreaDictionarycopy['Width']<=widthMax) & (SimilarAreaDictionarycopy['Height']>=heightMin) & (SimilarAreaDictionarycopy['Height']<=heightMax) ) | ((SimilarAreaDictionarycopy['Width']>=heightMin) & (SimilarAreaDictionarycopy['Width']<=heightMax) & (SimilarAreaDictionarycopy['Height']>=widthMin) & (SimilarAreaDictionarycopy['Height']<=widthMax) )) ]]
     elif section.startswith('3.2'):
-      areamin=round(areastodelete[i],1)- 0.1
-      areamax= round(areastodelete[i],1) + 0.1
-
       found=SimilarAreaDictionarycopy.loc[SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Area'] >=areamin) & (SimilarAreaDictionarycopy['Area']<=areamax)   )]]
+    if len(found.index.values) >0:
+      occ=SimilarAreaDictionarycopy.loc[found.index.values[0],'Occurences']
+      if occ== 1: #drop row
+        SimilarAreaDictionarycopy= SimilarAreaDictionarycopy.drop(found.index.values[0])
+      else: #occ minus 1 , total area - areavalue , total perim - perimvalue
+        print('occ>1')
+        if section.startswith('1.0'):
+          if len(areastodelete)>0:
+            idx=SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Rounded'] >=areamin) & (SimilarAreaDictionarycopy['Rounded']<=areamax)  ) & ( ((SimilarAreaDictionarycopy['Width']>=widthMin) & (SimilarAreaDictionarycopy['Width']<=widthMax) & (SimilarAreaDictionarycopy['Height']>=heightMin) & (SimilarAreaDictionarycopy['Height']<=heightMax) ) | ((SimilarAreaDictionarycopy['Width']>=heightMin) & (SimilarAreaDictionarycopy['Width']<=heightMax) & (SimilarAreaDictionarycopy['Height']>=widthMin) & (SimilarAreaDictionarycopy['Height']<=widthMax) )) ]
+        elif section.startswith('3.2'):
+          idx=SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Area'] >=areamin) & (SimilarAreaDictionarycopy['Area']<=areamax) )]
+        if len(areastodelete)>0:
+          comment = SimilarAreaDictionarycopy.loc[idx, 'Comments']
+          if pd.notna(comment.iloc[0]) and 'Area' in str(comment.iloc[0]):
+            matches = re.findall(r'\b\d+\b', str(SimilarAreaDictionarycopy.loc[idx, 'Comments']))
+            area_occurrences = int(matches[1]) -1
+            perimeter_occurrences = int(matches[2])
+            print(area_occurrences, perimeter_occurrences)
+            SimilarAreaDictionarycopy.loc[idx, 'Comments'] = f'Area occurrences: {area_occurrences}, Perimeter occurrences: {perimeter_occurrences}'
+            if area_occurrences > perimeter_occurrences:
+              SimilarAreaDictionarycopy.loc[idx,'Occurences'] = area_occurrences
+            elif perimeter_occurrences> area_occurrences:
+              SimilarAreaDictionarycopy.loc[idx,'Occurences'] = perimeter_occurrences 
+            elif int(area_occurrences)==int(perimeter_occurrences):
+                SimilarAreaDictionarycopy.loc[idx,'Occurences'] = int(SimilarAreaDictionarycopy.loc[idx,'Occurences']) - 1                     
+                if section.startswith('1.0'):
+                  SimilarAreaDictionarycopy.loc[idx,'Total Length'] = SimilarAreaDictionarycopy.loc[idx,'Total Length'] - lengthstodelete[i]
+         
+          else:
+            print('not yet')
+            area_occurrences = SimilarAreaDictionarycopy.loc[idx, 'Occurences'].iloc[0] -1
+            perimeter_occurrences = SimilarAreaDictionarycopy.loc[idx, 'Occurences'].iloc[0]
+            print(area_occurrences,perimeter_occurrences)
+            SimilarAreaDictionarycopy.loc[idx, 'Comments'] = f'Area occurrences: {area_occurrences}, Perimeter occurrences: {perimeter_occurrences}'
+          SimilarAreaDictionarycopy.loc[idx,'Total Area'] = SimilarAreaDictionarycopy.loc[idx,'Total Area'] - areastodelete[i]
+ 
 
-    if len(found.index.values ) >0:
+  for i in range(len(perimstodelete)):#item in areastodelete:
+    if section.startswith('1.0'):
+      tol=0.3
+    elif section.startswith('3.2'):
+      tol=10
+    
+    if len(perimstodelete)>0:
+        print(perimstodelete[i])
+        perimmin=round(perimstodelete[i],1)- 0.3
+        perimmax=round(perimstodelete[i],1)+ 0.3
+        print('perimmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm')
+    if section.startswith('1.0'):
+      for p in range(len(areaPermArr)):  
+        if areastodelete[i] in areaPermArr[p]:
+          print('AAA',areaPermArr[p])
+          area= areaPermArr[p][0]
+          width= areaPermArr[p][1]
+          height= areaPermArr[p][2]
+          break
+      widthMin= width -10
+      widthMax= width +10
+      heightMin = height-10
+      heightMax=height+10
+      found=SimilarAreaDictionarycopy.loc[SimilarAreaDictionarycopy.index[( (SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)   ) & ( ((SimilarAreaDictionarycopy['Width']>=widthMin) & (SimilarAreaDictionarycopy['Width']<=widthMax) & (SimilarAreaDictionarycopy['Height']>=heightMin) & (SimilarAreaDictionarycopy['Height']<=heightMax) ) | ((SimilarAreaDictionarycopy['Width']>=heightMin) & (SimilarAreaDictionarycopy['Width']<=heightMax) & (SimilarAreaDictionarycopy['Height']>=widthMin) & (SimilarAreaDictionarycopy['Height']<=widthMax) )) ]]
+    elif section.startswith('3.2'):
+      found=SimilarAreaDictionarycopy.loc[SimilarAreaDictionarycopy.index[( (SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)    )]]
+    
+    if len(found.index.values) >0:
       occ=SimilarAreaDictionarycopy.loc[found.index.values[0],'Occurences']
       if occ== 1: #drop row
         print('occ=1')
+        print(found)
         SimilarAreaDictionarycopy= SimilarAreaDictionarycopy.drop(found.index.values[0])
 
       else: #occ minus 1 , total area - areavalue , total perim - perimvalue
         print('occ>1')
         if section.startswith('1.0'):
-          idx=SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Rounded'] >=areamin) & (SimilarAreaDictionarycopy['Rounded']<=areamax) & (SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)   ) & ( ((SimilarAreaDictionarycopy['Width']>=widthMin) & (SimilarAreaDictionarycopy['Width']<=widthMax) & (SimilarAreaDictionarycopy['Height']>=heightMin) & (SimilarAreaDictionarycopy['Height']<=heightMax) ) | ((SimilarAreaDictionarycopy['Width']>=heightMin) & (SimilarAreaDictionarycopy['Width']<=heightMax) & (SimilarAreaDictionarycopy['Height']>=widthMin) & (SimilarAreaDictionarycopy['Height']<=widthMax) )) ]
+          if len(perimstodelete)>0:
+            idx=SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)   ) & ( ((SimilarAreaDictionarycopy['Width']>=widthMin) & (SimilarAreaDictionarycopy['Width']<=widthMax) & (SimilarAreaDictionarycopy['Height']>=heightMin) & (SimilarAreaDictionarycopy['Height']<=heightMax) ) | ((SimilarAreaDictionarycopy['Width']>=heightMin) & (SimilarAreaDictionarycopy['Width']<=heightMax) & (SimilarAreaDictionarycopy['Height']>=widthMin) & (SimilarAreaDictionarycopy['Height']<=widthMax) )) ]
         elif section.startswith('3.2'):
-          perimmin=round(perimstodelete[i],1)- 50
-          perimmax=round(perimstodelete[i],1)+ 50
-          idx=SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Area'] >=areamin) & (SimilarAreaDictionarycopy['Area']<=areamax)  & (SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)    )]
-        SimilarAreaDictionarycopy.loc[idx,'Total Area'] = SimilarAreaDictionarycopy.loc[idx,'Total Area'] - areastodelete[i]
-        SimilarAreaDictionarycopy.loc[idx,'Total Perimeter'] = SimilarAreaDictionarycopy.loc[idx,'Total Perimeter'] - perimstodelete[i]
-        SimilarAreaDictionarycopy.loc[idx,'Total Length'] = SimilarAreaDictionarycopy.loc[idx,'Total Length'] - lengthstodelete[i]
-        SimilarAreaDictionarycopy.loc[idx,'Occurences'] = int(SimilarAreaDictionarycopy.loc[idx,'Occurences']) - 1
+          if len(perimstodelete)>0:
+            perimmin=round(perimstodelete[i],1)- 1
+            perimmax=round(perimstodelete[i],1)+ 1
+            idx=SimilarAreaDictionarycopy.index[((SimilarAreaDictionarycopy['Perimeter'] >=perimmin) & (SimilarAreaDictionarycopy['Perimeter']<=perimmax)    )]
+        
+          
+        if len(perimstodelete)>0:
+          comment = SimilarAreaDictionarycopy.loc[idx, 'Comments']
+          if pd.notna(comment.iloc[0]) and 'Area' in str(comment.iloc[0]):
+            matches = re.findall(r'\b\d+\b', str(SimilarAreaDictionarycopy.loc[idx, 'Comments']))
+            area_occurrences = int(matches[1]) 
+            perimeter_occurrences = int(matches[2])-1
+            print(area_occurrences, perimeter_occurrences)
+            SimilarAreaDictionarycopy.loc[idx, 'Comments'] = f'Area occurrences: {area_occurrences}, Perimeter occurrences: {perimeter_occurrences}'
+            if area_occurrences > perimeter_occurrences:
+              SimilarAreaDictionarycopy.loc[idx,'Occurences'] = area_occurrences
+            elif perimeter_occurrences> area_occurrences:
+              SimilarAreaDictionarycopy.loc[idx,'Occurences'] = perimeter_occurrences 
+            elif int(area_occurrences)==int(perimeter_occurrences):
+                SimilarAreaDictionarycopy.loc[idx,'Occurences'] = int(SimilarAreaDictionarycopy.loc[idx,'Occurences']) - 1                     
+                if section.startswith('1.0'):
+                  SimilarAreaDictionarycopy.loc[idx,'Total Length'] = SimilarAreaDictionarycopy.loc[idx,'Total Length'] - lengthstodelete[i]
+         
+          else:
+            print('not yet')
+            area_occurrences = SimilarAreaDictionarycopy.loc[idx, 'Occurences'].iloc[0] 
+            perimeter_occurrences = SimilarAreaDictionarycopy.loc[idx, 'Occurences'].iloc[0] -1
+           
+            SimilarAreaDictionarycopy.loc[idx, 'Comments'] = f'Area occurrences: {area_occurrences}, Perimeter occurrences: {perimeter_occurrences}'
+            area_occurrences = SimilarAreaDictionarycopy.loc[idx, 'Occurences'].iloc[0] -1
+            perimeter_occurrences = SimilarAreaDictionarycopy.loc[idx, 'Occurences'].iloc[0]
+          
+            
+          SimilarAreaDictionarycopy.loc[idx,'Total Perimeter'] = SimilarAreaDictionarycopy.loc[idx,'Total Perimeter'] - perimstodelete[i]
   return SimilarAreaDictionarycopy
 
-#############################################################
-
+######################
 # # -*- coding: utf-8 -*-
 # """Google Sheet to XML.ipynb