X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=5af9e6641009e0c7cadf92c39c6d1dcbe7b6ba6f;hb=6c47601c34ecd30ab6f4f25be8d43ac841b70221;hp=af1404e9bf476b3ae0b6191ae0d6fb72b8901eea;hpb=41e39823c216af723fabcce9b56c16b525adde1f;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index af1404e9..5af9e664 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -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()
@@ -71,72 +71,80 @@ class BModulePage(BWizardPage):
     
     def _fillPropertyTable(self):
         module = self._currentModule()
-        self._controlGroup.clear()
-        configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
-        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":
-                    ## 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:
-                    ## 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)
+        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":
+                        ## 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:
-                        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)
-        else:
-            self.pageContent.propertyTable.setRowCount(0)
+                        ## 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)
+            else:
+                self.pageContent.propertyTable.setRowCount(0)
     
     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())
@@ -156,6 +164,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)
     
@@ -181,6 +190,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)