Update pilecaps_adr.py

pilecaps_adr.py

@@ -1413,25 +1413,32 @@ def mapnametoLegend(McTName):
  
     print('mcct',McTName[i][1])
     if isinstance(McTName[i][1], list):
+      guessednames=worksheetw.get_col(1, returnas='matrix', include_tailing_empty=False)
+      print('gg',guessednames)
+      # guessednames=guessednames[3:]
+      print('gg',guessednames)
       for m in McTName[i][1]:
       
-        if m.startswith('gb') or m.startswith('p'):
-          allgbnames+= m +' +'
-
-          roww=worksheetw.find(m)
-          print(roww)
-          for j in range(len(roww)):
-            print('kjjjj',roww[j])
-            ar+=float(worksheetw.cell((roww[j].row ,rowvalue)).value) 
+        if m.startswith('text1'):
+          name=m.removeprefix('text1')
+          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) 
         else:
             item+=m + ' ,'
             print(item)
         n= McTName[i][0] + ' ( '+ allgbnames[:-2] +' , ' + item[:-1]  + ' )  ' 
     else:
-      if McTName[i][1].startswith('gb'):
-        allgbnames+= McTName[i][1] 
+      if McTName[i][1].startswith('text1'):
+        name=McTName[i][1].removeprefix('text1')
+        allgbnames+= name
 
-        roww=worksheetw.find(McTName[i][1])
+        roww=worksheetw.find(name)
         print(roww)
         for j in range(len(roww)):
           print('kjjjj',roww[j])
@@ -1528,6 +1535,7 @@ def mapnametoLegend(McTName):
   spreadsheet_service.spreadsheets().batchUpdate(spreadsheetId=spreadsheet_key, body=body2).execute()
   return summaryId,guessednamesfinal   
 
+
   # print(x,xarea)
 def getguessnames(gc,ws):
   guessednamesfinal=[]