X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=17812cd991ce394445a80ec71892d55c25871b3f;hb=ea62a2f8101c1fcc896892d2407f051ef3a9bc0b;hp=a5af68600dd3ea6e43600a6bb45e5aa5c7c82220;hpb=2c51b3b45b9354fdb096af76c96e2305b1fbd2e1;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index a5af6860..17812cd9 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -39,23 +39,13 @@ class BModulePage(BWizardPage): def _loadModuleData(self): 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"]) + bertos_utils.loadModuleData(self._project()) except ModuleDefineException, e: - self._exceptionOccurred(self.tr("Error parsing module information in file %1").arg(e.parameter)) + self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) except EnumDefineException, e: - self._exceptionOccurred(self.tr("Error parsing enum informations in file %1").arg(e.parameter)) + self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) 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) + self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) def _fillModuleTable(self): modules = self._projectInfoRetrieve("MODULES") @@ -82,63 +72,76 @@ class BModulePage(BWizardPage): configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration] self.pageContent.propertyTable.setRowCount(len(configurations)) for index, property in enumerate(configurations): - item = QTableWidgetItem(property) + item = QTableWidgetItem(configurations[property]["brief"]) 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) + self._insertCheckBox(index, configurations[property]["value"]) 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) + 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: - ## 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) + # Not defined type, rendered as a text field + self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(property)) else: 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): currentModule = self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1) if currentModule is not None: @@ -160,20 +163,26 @@ 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()): propertyName = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole)) - self.pageContent.propertyTable.item(index, 0).setText(propertyName) + # Awful solution! Needed because if the user change the module, the selection changed... + if propertyName not in self._currentModuleConfigurations().keys(): + break + self.pageContent.propertyTable.item(index, 0).setText(self._currentModuleConfigurations()[propertyName]['brief']) def _showPropertyDescription(self): self._resetPropertyDescription() configurations = self._currentModuleConfigurations() if self._currentProperty() in configurations.keys(): - description = configurations[self._currentProperty()]["description"] + description = configurations[self._currentProperty()]["brief"] name = self._currentProperty() - self._currentPropertyItem().setText(name + "\n" + description) + self._currentPropertyItem().setText(description + "\n" + name) def _setupUi(self): self.pageContent.moduleTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)