diff --git a/aliasManager_popup.py b/aliasManager_popup.py index 8950cf4..e04294e 100644 --- a/aliasManager_popup.py +++ b/aliasManager_popup.py @@ -92,6 +92,13 @@ def close(self): alphabet_list = list(string.ascii_uppercase) class p(): + + def getContents(self,obj,cell): + res = obj.getContents(cell) + if res and res[0]=="'": + return res[1:] + return res + def aliasManager(self): try: @@ -109,7 +116,7 @@ def aliasManager(self): cell_from = 'A' + str(i) cell_to = str(column_from) + str(i) App.ActiveDocument.Spreadsheet.setAlias(cell_to, '') - App.ActiveDocument.Spreadsheet.setAlias(cell_to, App.ActiveDocument.Spreadsheet.getContents(cell_from)) + App.ActiveDocument.Spreadsheet.setAlias(cell_to, self.getContents(App.ActiveDocument.Spreadsheet,cell_from)) App.ActiveDocument.recompute() FreeCAD.Console.PrintMessage("\nAliases set\n") @@ -135,7 +142,7 @@ def aliasManager(self): cell_to = column_to + str(i) App.ActiveDocument.Spreadsheet.setAlias(cell_from, '') App.ActiveDocument.recompute() - App.ActiveDocument.Spreadsheet.setAlias(cell_to, App.ActiveDocument.Spreadsheet.getContents(cell_reference)) + App.ActiveDocument.Spreadsheet.setAlias(cell_to, self.getContents(App.ActiveDocument.Spreadsheet,cell_reference)) App.ActiveDocument.recompute() FreeCAD.Console.PrintMessage("\nAliases moved\n") @@ -166,12 +173,12 @@ def char_range(c1, c2): cell_to = str(fam_range[index]) + str(i) App.ActiveDocument.Spreadsheet.setAlias(cell_from, '') App.ActiveDocument.recompute() - App.ActiveDocument.Spreadsheet.setAlias(cell_to, App.ActiveDocument.Spreadsheet.getContents(cell_reference)) + App.ActiveDocument.Spreadsheet.setAlias(cell_to, self.getContents(App.ActiveDocument.Spreadsheet,cell_reference)) App.ActiveDocument.recompute() sfx = str(fam_range[index]) + '1' # save file - suffix = App.ActiveDocument.Spreadsheet.getContents(sfx) + suffix = self.getContents(App.ActiveDocument.Spreadsheet,sfx) filename = filePrefix + '_' + suffix + '.fcstd' filePath = os.path.join(docDir, filename) @@ -359,4 +366,5 @@ def disableWidget(currentIndex): def popup(self): self.dialog2 = infoPopup() self.dialog2.exec_() -p() \ No newline at end of file +p() +