Correct a problema about the empty configurations
[bertos.git] / wizard / BModulePage.py
index deed395e9aec2c7a679e5ca8a7e53b8203b19749..ee713ab4e459e05c0cd5ced60062c4a834961ded 100644 (file)
@@ -23,11 +23,11 @@ class BModulePage(BWizardPage):
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/module_select.ui")
         self.setTitle(self.tr("Configure the BeRTOS modules"))
-        self._setupUi()
         self._controlGroup = QControlGroup()
         self._connectSignals()
     
     def reloadData(self):
+        self._setupUi()
         self._setupButtonGroup()
         self._loadModuleData()
         self._fillModuleTable()
@@ -43,8 +43,9 @@ class BModulePage(BWizardPage):
             lists = bertos_utils.loadDefineListsDict(self._projectInfoRetrieve("SOURCES_PATH"))
             configurations = {}
             for module, informations in modules.items():
-                configurations[informations["configuration"]] = bertos_utils.loadConfigurationInfos(self._projectInfoRetrieve("SOURCES_PATH") +
-                                                                                                    "/" + informations["configuration"])
+                if len(informations["configuration"]) > 0:
+                    configurations[informations["configuration"]] = bertos_utils.loadConfigurationInfos(self._projectInfoRetrieve("SOURCES_PATH") +
+                                                                                                        "/" + informations["configuration"])
         except ModuleDefineException, e:
             self._exceptionOccurred(self.tr("Error parsing module information in file %1").arg(e.parameter))
         except EnumDefineException, e:
@@ -70,55 +71,93 @@ class BModulePage(BWizardPage):
     
     def _fillPropertyTable(self):
         module = self._currentModule()
-        self._controlGroup.clear()
-        configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
-        configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
-        self.pageContent.propertyTable.clear()
-        self.pageContent.propertyTable.setRowCount(len(configurations))
-        for index, property in enumerate(configurations):
-            item = QTableWidgetItem(property)
-            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)
-            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)
+        if module is not None:
+            self._controlGroup.clear()
+            configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
+            moduleDescription = self._projectInfoRetrieve("MODULES")[module]["description"]
+            self.pageContent.moduleLabel.setText(moduleDescription)
+            self.pageContent.moduleLabel.setVisible(True)
+            self.pageContent.propertyTable.clear()
+            if len(configuration) > 0:
+                configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+                self.pageContent.propertyTable.setRowCount(len(configurations))
+                for index, property in enumerate(configurations):
+                    item = QTableWidgetItem(property)
+                    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":
+                        self._insertCheckBox(index, configurations[property]["value"])
+                    elif "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "enum":
+                        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:
+                        # Not defined type, rendered as a text field
+                        self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(property))
             else:
-                ## int, long or undefined type property
-                spinBox = QSpinBox()
-                self.pageContent.propertyTable.setCellWidget(index, 1, spinBox)
-                if "min" in configurations[property]["informations"].keys():
-                    minimum = int(configurations[property]["informations"]["min"])
-                else:
-                    minimum = -32768
-                spinBox.setMinimum(minimum)
-                if "max" in configurations[property]["informations"].keys():
-                    maximum = int(configurations[property]["informations"]["max"])
-                else:
-                    maximum = 32767
-                spinBox.setMaximum(maximum)
-                if "long" in configurations[property]["informations"].keys() and configurations[property]["informations"]["long"] == "True":
-                    spinBox.setSuffix("L")
-                spinBox.setValue(int(configurations[property]["value"].replace("L", "")))
-                self._controlGroup.addControl(index, spinBox)
+                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):
-        return unicode(self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1).text())
+        currentModule = self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1)
+        if currentModule is not None:
+            return unicode(currentModule.text())
+        else:
+            return None
     
     def _currentModuleConfigurations(self):
         return self._configurations(self._currentModule())
@@ -134,7 +173,10 @@ class BModulePage(BWizardPage):
     
     def _configurations(self, module):
         configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
-        return self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+        if len(configuration) > 0:
+            return self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+        else:
+            return {}
     
     def _resetPropertyDescription(self):
         for index in range(self.pageContent.propertyTable.rowCount()):
@@ -163,6 +205,7 @@ class BModulePage(BWizardPage):
         self.pageContent.propertyTable.verticalHeader().setVisible(False)
         self.pageContent.propertyTable.setColumnCount(2)
         self.pageContent.propertyTable.setRowCount(0)
+        self.pageContent.moduleLabel.setVisible(False)
     
     def _connectSignals(self):
         self.connect(self.pageContent.moduleTable, SIGNAL("itemSelectionChanged()"), self._fillPropertyTable)
@@ -174,7 +217,7 @@ class BModulePage(BWizardPage):
         configuration = self._projectInfoRetrieve("MODULES")[self._currentModule()]["configuration"]
         configurations = self._projectInfoRetrieve("CONFIGURATIONS")
         if "type" not in configurations[configuration][property]["informations"].keys() or configurations[configuration][property]["informations"]["type"] == "int":
-            configurations[configuration][property]["value"] = str(self.pageContent.propertyTable.cellWidget(index, 1).value())
+            configurations[configuration][property]["value"] = str(int(self.pageContent.propertyTable.cellWidget(index, 1).value()))
         elif configurations[configuration][property]["informations"]["type"] == "enum":
             configurations[configuration][property]["value"] = unicode(self.pageContent.propertyTable.cellWidget(index, 1).currentText())
         elif configurations[configuration][property]["informations"]["type"] == "boolean":
@@ -260,6 +303,8 @@ class QControlGroup(QObject):
             self.connect(control, SIGNAL("valueChanged(int)"), lambda: self._stateChanged(id))
         elif type(control) == QComboBox:
             self.connect(control, SIGNAL("currentIndexChanged(int)"), lambda: self._stateChanged(id))
+        elif type(control) == QDoubleSpinBox:
+            self.connect(control, SIGNAL("valueChanged(double)"), lambda: self._stateChanged(id))
     
     def clear(self):
         self._controls = {}