X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=c44492843fbec92be4eafcacd092fca8ae3102a4;hb=179b0cb7522fc025ec5c86ca228f109de6282401;hp=9ee813ada3c922b630323fdd3d9f50867b0257c6;hpb=f49c05f2b6fcd22c94d01e6e59f97d5b0c97f1ef;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 9ee813ad..c4449284 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -15,13 +15,16 @@ from PyQt4.QtGui import * from BWizardPage import * import bertos_utils +from DefineException import * +from const import * class BModulePage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "module_select.ui") + 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): @@ -35,18 +38,29 @@ class BModulePage(BWizardPage): self.connect(self._buttonGroup, SIGNAL("buttonClicked(int)"), self._moduleSelectionChanged) def _loadModuleData(self): - modules = bertos_utils.loadModuleInfosDict(self._projectInfoRetrieve("SOURCES_PATH")) - 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"]) - self._projectInfoStore("MODULES", modules) - self._projectInfoStore("LISTS", lists) - self._projectInfoStore("CONFIGURATIONS", configurations) + try: + modules = bertos_utils.loadModuleInfosDict(self._projectInfoRetrieve("SOURCES_PATH")) + lists = bertos_utils.loadDefineListsDict(self._projectInfoRetrieve("SOURCES_PATH")) + configurations = {} + for module, informations in modules.items(): + 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: + self._exceptionOccurred(self.tr("Error parsing enum informations in file %1").arg(e.parameter)) + except ConfigurationDefineException, e: + self._exceptionOccurred(self.tr("Error parsing configuration informations in file %1").arg(e.parameter)) + else: + self._projectInfoStore("MODULES", modules) + self._projectInfoStore("LISTS", lists) + self._projectInfoStore("CONFIGURATIONS", configurations) def _fillModuleTable(self): modules = self._projectInfoRetrieve("MODULES") + if modules is None: + return self.pageContent.moduleTable.setRowCount(len(modules)) for index, module in enumerate(modules): self.pageContent.moduleTable.setItem(index, 1, QTableWidgetItem(module)) @@ -57,74 +71,78 @@ class BModulePage(BWizardPage): def _fillPropertyTable(self): 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) - else: - checkBox.setChecked(False) - 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 index, element in enumerate(enum): - comboBox.addItem(element) - if element == configurations[property]["value"]: - comboBox.setCurrentIndex(index) - 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"]) + if len(configuration) > 0: + configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration] + self.pageContent.propertyTable.setRowCount(len(configurations) + 1) + 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) + else: + spinBox = QSpinBox() + self.pageContent.propertyTable.setCellWidget(index, 1, spinBox) 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", ""))) - - def _savePage(self, previousRow, previousColumn): - module = self._module(previousRow) - moduleConfigurations = self._projectInfoRetrieve("CONFIGURATIONS")[self._configurations(module)] - for index in range(self.pageContent.propertyTable.rowCount()): - parameter = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole)) - if "type" not in moduleConfigurations[parameter]["informations"].keys() or moduleConfigurations[parameter]["informations"]["type"] == "int": - moduleConfigurations[parameter]["value"] = str(self.pageContent.propertyTable.cellWidget(index, 1).value()) - elif moduleConfigurations[parameter]["informations"]["type"] == "enum": - moduleConfigurations[parameter]["value"] = unicode(self.pageContent.propertyTable.cellWidget(index, 1).currentText()) - elif moduleConfigurations[parameter]["informations"]["type"] == "boolean": - if self.pageContent.propertyTable.cellWidget(index, 1).isChecked(): - moduleConfigurations[parameter]["value"] = "1" - else: - moduleConfigurations[parameter]["value"] = "0" - - def _pageChanged(self, row, column, previousRow, previousColumn): - if previousRow != -1 and previousColumn != -1: - self._savePage(previousRow, previousColumn) - self._fillPropertyTable() + 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()) def _currentModuleConfigurations(self): - return self._configurations(self._currentModule())["configurations"] + return self._configurations(self._currentModule()) def _currentProperty(self): return qvariant_converter.getString(self.pageContent.propertyTable.item(self.pageContent.propertyTable.currentRow(), 0).data(Qt.UserRole)) @@ -136,7 +154,8 @@ class BModulePage(BWizardPage): return unicode(self.pageContent.moduleTable.item(row, 1).text()) def _configurations(self, module): - return self._projectInfoRetrieve("MODULES")[module]["configuration"] + configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"] + return self._projectInfoRetrieve("CONFIGURATIONS")[configuration] def _resetPropertyDescription(self): for index in range(self.pageContent.propertyTable.rowCount()): @@ -145,7 +164,7 @@ class BModulePage(BWizardPage): def _showPropertyDescription(self): self._resetPropertyDescription() - configurations = self._projectInfoRetrieve("CONFIGURATIONS")[self._currentModuleConfigurations()] + configurations = self._currentModuleConfigurations() if self._currentProperty() in configurations.keys(): description = configurations[self._currentProperty()]["description"] name = self._currentProperty() @@ -165,11 +184,28 @@ 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("currentCellChanged(int, int, int, int)"), self._pageChanged) + 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(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": + 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(): @@ -231,4 +267,26 @@ class BModulePage(BWizardPage): unsatisfied |= set([module]) if dependency not in unsatisfied: unsatisfied |= self.unselectDependencyCheck(module) - return unsatisfied \ No newline at end of file + return unsatisfied + +class QControlGroup(QObject): + def __init__(self): + QObject.__init__(self) + self._controls = {} + + 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)) + elif type(control) == QDoubleSpinBox: + self.connect(control, SIGNAL("valueChanged(double)"), lambda: self._stateChanged(id)) + + def clear(self): + self._controls = {} + + def _stateChanged(self, id): + self.emit(SIGNAL("stateChanged"), id) \ No newline at end of file