X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=3cc9f1afca01f534fbf9a15a466905aa58874ee1;hb=24cb311b180d96e12fa70cb063b044a550780bc0;hp=ad942334496c8565447d19e79cb83eba622bee2d;hpb=ca558082f22dae91eb287394b60d37e3cb704d6a;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index ad942334..3cc9f1af 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -22,6 +22,7 @@ class BModulePage(BWizardPage):
         BWizardPage.__init__(self, "module_select.ui")
         self.setTitle(self.tr("Configure the BeRTOS modules"))
         self._setupUi()
+        self._controlGroup = QControlGroup()
         self._connectSignals()
     
     def reloadData(self):
@@ -56,8 +57,8 @@ class BModulePage(BWizardPage):
             checkBox.setChecked(modules[module]["enabled"])
     
     def _fillPropertyTable(self):
-        self.savePage()
         module = self._currentModule()
+        self._controlGroup.clear()
         configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
         configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
         self.pageContent.propertyTable.clear()
@@ -74,13 +75,17 @@ class BModulePage(BWizardPage):
                     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 element in enum:
+                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()
@@ -98,12 +103,13 @@ class BModulePage(BWizardPage):
                 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)
     
     def _currentModule(self):
         return unicode(self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1).text())
     
     def _currentModuleConfigurations(self):
-        return self._projectInfoRetrieve("MODULES")[self._currentModule()]["configuration"]
+        return self._configurations(self._currentModule())
     
     def _currentProperty(self):
         return qvariant_converter.getString(self.pageContent.propertyTable.item(self.pageContent.propertyTable.currentRow(), 0).data(Qt.UserRole))
@@ -111,6 +117,13 @@ class BModulePage(BWizardPage):
     def _currentPropertyItem(self):
         return self.pageContent.propertyTable.item(self.pageContent.propertyTable.currentRow(), 0)
     
+    def _module(self, row):
+        return unicode(self.pageContent.moduleTable.item(row, 1).text())
+    
+    def _configurations(self, module):
+        configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
+        return self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+    
     def _resetPropertyDescription(self):
         for index in range(self.pageContent.propertyTable.rowCount()):
             propertyName = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
@@ -118,9 +131,11 @@ class BModulePage(BWizardPage):
     
     def _showPropertyDescription(self):
         self._resetPropertyDescription()
-        description = self._projectInfoRetrieve("CONFIGURATIONS")[self._currentModuleConfigurations()][self._currentProperty()]["description"]
-        name = self._currentProperty()
-        self._currentPropertyItem().setText(name + "\n" + description)
+        configurations = self._currentModuleConfigurations()
+        if self._currentProperty() in configurations.keys():
+            description = configurations[self._currentProperty()]["description"]
+            name = self._currentProperty()
+            self._currentPropertyItem().setText(name + "\n" + description)
     
     def _setupUi(self):
         self.pageContent.moduleTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)
@@ -140,7 +155,23 @@ class BModulePage(BWizardPage):
     def _connectSignals(self):
         self.connect(self.pageContent.moduleTable, SIGNAL("itemSelectionChanged()"), self._fillPropertyTable)
         self.connect(self.pageContent.propertyTable, SIGNAL("itemSelectionChanged()"), self._showPropertyDescription)
-
+        self.connect(self._controlGroup, SIGNAL("stateChanged"), self._saveValue)
+    
+    def _saveValue(self, index):
+        property = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
+        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())
+        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":
+            if self.pageContent.propertyTable.cellWidget(index, 1).isChecked():
+                configurations[configuration][property]["value"] = "1"
+            else:
+                configurations[configuration][property]["value"] = "0"
+        self._projectInfoStore("CONFIGURATIONS", configurations)
+    
     def _moduleSelectionChanged(self, index):
         module = unicode(self.pageContent.moduleTable.item(index, 1).text())
         if self._buttonGroup.button(index).isChecked():
@@ -203,7 +234,23 @@ class BModulePage(BWizardPage):
                 if dependency not in unsatisfied:
                     unsatisfied |= self.unselectDependencyCheck(module)
         return unsatisfied
+
+class QControlGroup(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+        self._controls = {}
     
-    def savePage(self):
-        for index in range(self.pageContent.propertyTable.rowCount()):
-            print qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
\ No newline at end of file
+    def addControl(self, id, control):
+        self._controls[id] = control
+        if type(control) == QCheckBox:
+            self.connect(control, SIGNAL("stateChanged(int)"), lambda: self._stateChanged(id))
+        elif type(control) == QSpinBox:
+            self.connect(control, SIGNAL("valueChanged(int)"), lambda: self._stateChanged(id))
+        elif type(control) == QComboBox:
+            self.connect(control, SIGNAL("currentIndexChanged(int)"), lambda: self._stateChanged(id))
+    
+    def clear(self):
+        self._controls = {}
+    
+    def _stateChanged(self, id):
+        self.emit(SIGNAL("stateChanged"), id)
\ No newline at end of file