reset numbering when using gui

BCDA-APS · Sep 16, 2024 · 8d2e8f9 · 8d2e8f9
1 parent 4aa6f8d
commit 8d2e8f9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/gestalt/convert/phoebus/CSSGenerator.py b/gestalt/convert/phoebus/CSSGenerator.py
@@ -6,7 +6,7 @@
 
 from phoebusgen import screen
 
-from gestalt.convert.phoebus.CSSWidget      import CSSWidget
+from gestalt.convert.phoebus.CSSWidget      import CSSWidget, reset_numbering
 from gestalt.convert.phoebus.CSSGroup       import CSSGroup
 from gestalt.convert.phoebus.CSSDisplay     import CSSDisplay
 from gestalt.convert.phoebus.CSSTabbedGroup import CSSTabbedGroup
@@ -241,6 +241,8 @@ def generateScale(self, node, macros={}):
 
 
 def generateCSSFile(template, data, outputfile=""):
+	reset_numbering()
+
 	a_display = CSSDisplay()
 	the_generator = CSSGenerator()
 

diff --git a/gestalt/convert/phoebus/CSSWidget.py b/gestalt/convert/phoebus/CSSWidget.py
@@ -7,6 +7,9 @@
 
 name_numbering = {}
 
+def reset_numbering():
+	name_numbering = {}
+
 class CSSWidget(GroupNode):
 	def __init__(self, classname, node=None, name=None, layout={}, macros={}):
 		super(CSSWidget, self).__init__(classname, name=name, node=node, layout=layout)

diff --git a/gestalt/convert/qt/QtGenerator.py b/gestalt/convert/qt/QtGenerator.py
@@ -2,7 +2,7 @@
 from gestalt.Type import *
 from gestalt.Generator import GestaltGenerator
 
-from gestalt.convert.qt.QtWidget  import QtWidget
+from gestalt.convert.qt.QtWidget  import QtWidget, reset_numbering
 from gestalt.convert.qt.QtGroup   import QtGroup
 from gestalt.convert.qt.QtDisplay import QtDisplay
 from gestalt.convert.qt.QtTabbedGroup    import QtTabbedGroup
@@ -280,6 +280,8 @@ def generateScale(self, node, macros={}):
 
 
 def generateQtFile(template, data, outputfile=""):
+	reset_numbering()
+
 	a_display = QtDisplay()
 	the_generator = QtGenerator()
 

diff --git a/gestalt/convert/qt/QtWidget.py b/gestalt/convert/qt/QtWidget.py
@@ -4,11 +4,14 @@
 
 name_numbering = {}
 
+def reset_numbering():
+	name_numbering = {}
+
 class QtWidget(GroupNode):
-	def __init__(self, classname, node=None, name=None, layout={}, macros={}, loc=None):
+	def __init__(self, classname, node=None, name=None, layout={}, macros={}, loc=None):		
 		super(QtWidget, self).__init__(classname, name=name, node=node, layout=layout, loc=loc)
 		QtWidget.updateProperties(self, macros)
-
+		
 		if "alignment" in self and not isinstance(self["alignment"], Set):
 			data = str(Alignment(self.pop("alignment")))