From 42e88245f948bfa4c6d99458cf16fea4e55231b0 Mon Sep 17 00:00:00 2001 From: spanner888 Date: Sun, 21 Feb 2021 16:47:33 +1100 Subject: [PATCH 1/3] python2 to python3 changed xrange to range --- aliasManager_popup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aliasManager_popup.py b/aliasManager_popup.py index 8950cf4..b2096ec 100644 --- a/aliasManager_popup.py +++ b/aliasManager_popup.py @@ -151,7 +151,7 @@ def aliasManager(self): def char_range(c1, c2): """Generates the characters from `c1` to `c2`, inclusive.""" - for c in xrange(ord(c1), ord(c2)+1): + for c in range(ord(c1), ord(c2)+1): yield str.capitalize(chr(c)) fam_range = [] @@ -359,4 +359,4 @@ def disableWidget(currentIndex): def popup(self): self.dialog2 = infoPopup() self.dialog2.exec_() -p() \ No newline at end of file +p() From c6fba42cb94143ed5575b102ced9841ec05e03a5 Mon Sep 17 00:00:00 2001 From: spanner888 Date: Sun, 21 Feb 2021 16:54:42 +1100 Subject: [PATCH 2/3] use row immediately above data for filename suffix, instead of alwasy frist row --- aliasManager_popup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliasManager_popup.py b/aliasManager_popup.py index b2096ec..304465b 100644 --- a/aliasManager_popup.py +++ b/aliasManager_popup.py @@ -168,7 +168,8 @@ def char_range(c1, c2): App.ActiveDocument.recompute() App.ActiveDocument.Spreadsheet.setAlias(cell_to, App.ActiveDocument.Spreadsheet.getContents(cell_reference)) App.ActiveDocument.recompute() - sfx = str(fam_range[index]) + '1' + sfx = str(fam_range[index]) + str(row_from - 1) #'1' + FreeCAD.Console.PrintMessage(str(cell_reference) + ", " + str(cell_from) + ", " + str(cell_to) + ", " + str(sfx) +"\n") # save file suffix = App.ActiveDocument.Spreadsheet.getContents(sfx) From c65a5027675f6bc82dbfba9eb1ab464e3ffa255d Mon Sep 17 00:00:00 2001 From: spanner888 Date: Sun, 21 Feb 2021 16:57:54 +1100 Subject: [PATCH 3/3] Fixed failing & simplified file saves --- aliasManager_popup.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/aliasManager_popup.py b/aliasManager_popup.py index 304465b..336ca78 100644 --- a/aliasManager_popup.py +++ b/aliasManager_popup.py @@ -171,13 +171,16 @@ def char_range(c1, c2): sfx = str(fam_range[index]) + str(row_from - 1) #'1' FreeCAD.Console.PrintMessage(str(cell_reference) + ", " + str(cell_from) + ", " + str(cell_to) + ", " + str(sfx) +"\n") - # save file + # save COPY of each file, keeps original file open with original name. suffix = App.ActiveDocument.Spreadsheet.getContents(sfx) filename = filePrefix + '_' + suffix + '.fcstd' filePath = os.path.join(docDir, filename) - FreeCAD.Console.PrintMessage("\nSaving view to %s\n" % filePath) - App.getDocument(filePrefix).saveAs(filePath) + #Some designs prob need refresh/compute before save + App.ActiveDocument.recompute() + FreeCAD.Console.PrintMessage("\nSaving copy file to %s\n" % filePath) + doc.saveCopy(filePath) + #App.getDocument(filePrefix).saveAs(filePath) # Clear last aliases created: for j in range(row_from,row_to+1): @@ -185,11 +188,7 @@ def char_range(c1, c2): App.ActiveDocument.Spreadsheet.setAlias(cell_to, '') App.ActiveDocument.recompute() - # Turn working file to original naming: - filename = filePrefix + '.fcstd' - filePath = os.path.join(docDir, filename) - FreeCAD.Console.PrintMessage("\nSaving original view to %s\n" % filePath) - App.getDocument(filePrefix).saveAs(filePath) + doc.save() FreeCAD.Console.PrintMessage("\nPart family files generated\n")