From 1036809f1d624f7b815b82539d7b90f92827dacd Mon Sep 17 00:00:00 2001 From: Julien Masnada Date: Sun, 5 May 2024 18:26:18 +0200 Subject: [PATCH 1/2] Avoid invalid aliases --- aliasManager_popup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/aliasManager_popup.py b/aliasManager_popup.py index 8950cf4..ab4e089 100644 --- a/aliasManager_popup.py +++ b/aliasManager_popup.py @@ -44,6 +44,7 @@ from PySide import QtGui, QtCore from FreeCAD import Gui import os +import re import string App = FreeCAD Gui = FreeCADGui @@ -108,8 +109,10 @@ def aliasManager(self): for i in range(row_from,row_to+1): cell_from = 'A' + str(i) cell_to = str(column_from) + str(i) + alias = App.ActiveDocument.Spreadsheet.getContents(cell_from) + alias = re.sub(r'(?is)[^a-zA-Z0-9_]+', '', alias) App.ActiveDocument.Spreadsheet.setAlias(cell_to, '') - App.ActiveDocument.Spreadsheet.setAlias(cell_to, App.ActiveDocument.Spreadsheet.getContents(cell_from)) + App.ActiveDocument.Spreadsheet.setAlias(cell_to, alias) App.ActiveDocument.recompute() FreeCAD.Console.PrintMessage("\nAliases set\n") @@ -133,9 +136,11 @@ def aliasManager(self): cell_reference = 'A'+ str(i) cell_from = column_from + str(i) cell_to = column_to + str(i) + alias = App.ActiveDocument.Spreadsheet.getContents(cell_reference) + alias = re.sub(r'(?is)[^a-zA-Z0-9_]+', '', alias) 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, alias) App.ActiveDocument.recompute() FreeCAD.Console.PrintMessage("\nAliases moved\n") From 4dd9f2e8678646f1f138c8292f7c2db554002aa6 Mon Sep 17 00:00:00 2001 From: Julien Masnada Date: Sun, 5 May 2024 18:32:39 +0200 Subject: [PATCH 2/2] Fixed all alias generation --- aliasManager_popup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aliasManager_popup.py b/aliasManager_popup.py index ab4e089..9f453a8 100644 --- a/aliasManager_popup.py +++ b/aliasManager_popup.py @@ -169,9 +169,11 @@ def char_range(c1, c2): cell_reference = 'A' + str(i) cell_from = str(fam_range[index-1]) + str(i) cell_to = str(fam_range[index]) + str(i) + alias = App.ActiveDocument.Spreadsheet.getContents(cell_reference) + alias = re.sub(r'(?is)[^a-zA-Z0-9_]+', '', alias) 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, alias) App.ActiveDocument.recompute() sfx = str(fam_range[index]) + '1'