Split the fillPropertyTable method in submethods

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2297 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index a5af68600dd3ea6e43600a6bb45e5aa5c7c82220..64f9fd0b4b72c2749fd42e4cf66879705982cdec 100644 (file)
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -86,59 +86,72 @@ class BModulePage(BWizardPage):
                     item.setData(Qt.UserRole, qvariant_converter.convertString(property))
                     self.pageContent.propertyTable.setItem(index, 0, item)
                     if "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "boolean":
-                        ## boolean property
-                        checkBox = QCheckBox()
-                        self.pageContent.propertyTable.setCellWidget(index, 1, checkBox)
-                        if configurations[property]["value"] == "1":
-                            checkBox.setChecked(True)
-                        else:
-                            checkBox.setChecked(False)
-                        self._controlGroup.addControl(index, checkBox)
+                        self._insertCheckBox(index, configurations[property]["value"])
                     elif "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "enum":
-                        ## enum property
-                        comboBox = QComboBox()
-                        self.pageContent.propertyTable.setCellWidget(index, 1, comboBox)
-                        enum = self._projectInfoRetrieve("LISTS")[configurations[property]["informations"]["value_list"]]
-                        for i, element in enumerate(enum):
-                            comboBox.addItem(element)
-                            if element == configurations[property]["value"]:
-                                comboBox.setCurrentIndex(i)
-                        self._controlGroup.addControl(index, comboBox)
+                        self._insertComboBox(index, configurations[property]["value"], configurations[property]["informations"]["value_list"])
+                    elif "type" in configurations[property]["informations"] and configurations[property]["informations"]["type"] == "int":
+                        self._insertSpinBox(index, configurations[property]["value"], configurations[property]["informations"])
                     else:
-                        ## int, long or undefined type property
-                        spinBox = None
-                        if bertos_utils.isLong(configurations[property]) or bertos_utils.isUnsignedLong(configurations[property]):
-                            spinBox = QDoubleSpinBox()
-                            spinBox.setDecimals(0)
-                        else:
-                            spinBox = QSpinBox()
-                        self.pageContent.propertyTable.setCellWidget(index, 1, spinBox)
-                        minimum = -32768
-                        maximum = 32767
-                        suff = ""
-                        if bertos_utils.isLong(configurations[property]):
-                            minimum = -2147483648
-                            maximum = 2147483647
-                            suff = "L"
-                        elif bertos_utils.isUnsigned(configurations[property]):
-                            minimum = 0
-                            maximum = 65535
-                            suff = "U"
-                        elif bertos_utils.isUnsignedLong(configurations[property]):
-                            minimum = 0
-                            maximum = 4294967295
-                            suff = "UL"
-                        if "min" in configurations[property]["informations"].keys():
-                            minimum = int(configurations[property]["informations"]["min"])
-                        if "max" in configurations[property]["informations"].keys():
-                            maximum = int(configurations[property]["informations"]["max"])
-                        spinBox.setRange(minimum, maximum)
-                        spinBox.setSuffix(suff)
-                        spinBox.setValue(int(configurations[property]["value"].replace("L", "").replace("U", "")))
-                        self._controlGroup.addControl(index, spinBox)
+                        # Not defined type, rendered as a text field
+                        self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(property))
             else:
                 self.pageContent.propertyTable.setRowCount(0)
     
+    def _insertCheckBox(self, index, value):
+        ## boolean property
+        checkBox = QCheckBox()
+        self.pageContent.propertyTable.setCellWidget(index, 1, checkBox)
+        if value == "1":
+            checkBox.setChecked(True)
+        else:
+            checkBox.setChecked(False)
+        self._controlGroup.addControl(index, checkBox)
+    
+    def _insertComboBox(self, index, value, value_list):
+        ## enum property
+        comboBox = QComboBox()
+        self.pageContent.propertyTable.setCellWidget(index, 1, comboBox)
+        enum = self._projectInfoRetrieve("LISTS")[value_list]
+        for i, element in enumerate(enum):
+            comboBox.addItem(element)
+            if element == value:
+                comboBox.setCurrentIndex(i)
+        self._controlGroup.addControl(index, comboBox)
+    
+    def _insertSpinBox(self, index, value, informations):
+        ## int, long or undefined type property
+        spinBox = None
+        if bertos_utils.isLong(informations) or bertos_utils.isUnsignedLong(informations):
+            spinBox = QDoubleSpinBox()
+            spinBox.setDecimals(0)
+        else:
+            spinBox = QSpinBox()
+        self.pageContent.propertyTable.setCellWidget(index, 1, spinBox)
+        minimum = -32768
+        maximum = 32767
+        suff = ""
+        if bertos_utils.isLong(informations):
+            minimum = -2147483648
+            maximum = 2147483647
+            suff = "L"
+        elif bertos_utils.isUnsigned(informations):
+            minimum = 0
+            maximum = 65535
+            suff = "U"
+        elif bertos_utils.isUnsignedLong(informations):
+            minimum = 0
+            maximum = 4294967295
+            suff = "UL"
+        if "min" in informations.keys():
+            minimum = int(informations["min"])
+        if "max" in informations.keys():
+            maximum = int(informations["max"])
+        spinBox.setRange(minimum, maximum)
+        spinBox.setSuffix(suff)
+        spinBox.setValue(int(value.replace("L", "").replace("U", "")))
+        self._controlGroup.addControl(index, spinBox)
+        
+    
     def _currentModule(self):
         currentModule = self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1)
         if currentModule is not None:

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 6065c677cf6241bc4e7869bbad4fbfe9697f4a8e..cbec405d88d86d6d1289cd3dcb99c1a9ba005ccc 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -299,38 +299,38 @@ def sub(string, parameter, value):
     """
     return re.sub(r"(?P<define>#define\s+" + parameter + r"\s+)([^\s]+)", r"\g<define>" + value, string)
 
-def isInt(value):
+def isInt(informations):
     """
     Return True if the value is a simple int.
     """
-    if "long" not in value["informations"].keys() and "unsigned" not in value["informations"].keys():
+    if ("long" not in informatios.keys() or not informations["long"]) and ("unsigned" not in informations.keys() or informations["unsigned"]):
         return True
     else:
         return False
 
-def isLong(value):
+def isLong(informations):
     """
     Return True if the value is a long.
     """
-    if "long" in value["informations"].keys() and value["informations"]["long"] and "unsigned" not in value["informations"].keys():
+    if "long" in informations.keys() and informations["long"] and "unsigned" not in informations.keys():
         return True
     else:
         return False
 
-def isUnsigned(value):
+def isUnsigned(informations):
     """
     Return True if the value is an unsigned.
     """
-    if "unsigned" in value["informations"].keys() and value["informations"]["unsigned"] and "long" not in value["informations"].keys():
+    if "unsigned" in informations.keys() and informations["unsigned"] and "long" not in informations.keys():
         return True
     else:
         return False
 
-def isUnsignedLong(value):
+def isUnsignedLong(informations):
     """
     Return True if the value is an unsigned long.
     """
-    if "unsigned" in value["informations"].keys() and "long" in value["informations"].keys() and value["informations"]["unsigned"] and value["informations"]["long"]:
+    if "unsigned" in informations.keys() and "long" in informations.keys() and informations["unsigned"] and informations["long"]:
         return True
     else:
         return False
\ No newline at end of file