X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=24623ecdb8db89ee57cdb9dcbeb0ddc90cb53e33;hb=38b2221716fa0f648860e1cec14f819daf8cb031;hp=c98ce937ac6140efc2f2857f176089c0c3b15641;hpb=ea34cce8ca92257f5457cb85db93e2073b7250bf;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index c98ce937..24623ecd 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -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:
@@ -72,60 +73,70 @@ class BModulePage(BWizardPage):
         module = self._currentModule()
         self._controlGroup.clear()
         configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
-        configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+        moduleDescription = self._projectInfoRetrieve("MODULES")[module]["description"]
+        self.pageContent.moduleLabel.setText(moduleDescription)
+        self.pageContent.moduleLabel.setVisible(True)
         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)
+        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":
+                    ## 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)
                 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)
-            else:
-                ## int, long or undefined type property
-                spinBox = QSpinBox()
-                self.pageContent.propertyTable.setCellWidget(index, 1, spinBox)
-                if bertos_utils.isInt(configurations[property]):
+                    ## 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
-                    maximmum = 32767
+                    maximum = 32767
                     suff = ""
-                elif 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)
+                    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)
+        else:
+            self.pageContent.propertyTable.setRowCount(0)
     
     def _currentModule(self):
         return unicode(self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1).text())
@@ -148,6 +159,7 @@ class BModulePage(BWizardPage):
     
     def _resetPropertyDescription(self):
         for index in range(self.pageContent.propertyTable.rowCount()):
+            print index
             propertyName = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
             self.pageContent.propertyTable.item(index, 0).setText(propertyName)
     
@@ -173,6 +185,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)
@@ -184,7 +197,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":
@@ -270,6 +283,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 = {}