X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBModulePage.py;h=74cd7cb266d7676213f6bd7e397948d8147eb244;hb=d685c5f413bd6cbd5f00c35da830a9a93ff943f1;hp=83a2375f6d5814a73e01a1cb4671003491ce0111;hpb=a2a182c7d2ea815fdde029258d9c843d7adce2ec;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 83a2375f..74cd7cb2 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() @@ -39,22 +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(): - 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") @@ -70,65 +61,93 @@ class BModulePage(BWizardPage): def _fillPropertyTable(self): module = self._currentModule() - self._controlGroup.clear() - configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"] - configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration] - 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) - 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) + 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": + self._insertCheckBox(index, configurations[property]["value"]) + elif "type" in configurations[property]["informations"].keys() and configurations[property]["informations"]["type"] == "enum": + 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: + # Not defined type, rendered as a text field + self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(property)) else: - ## int, long or undefined type property - spinBox = QSpinBox() - self.pageContent.propertyTable.setCellWidget(index, 1, spinBox) - if bertos_utils.isInt(configurations[property]): - minimum = -32768 - maximmum = 32767 - suff = "" - elif bertos_utils.isLong(configurations[property]): - minimum = -2147483648L - maximum = 2147483647L - suff = "L" - elif bertos_utils.isUnsigned(configurations[property]): - minimum = 0 - maximum = 65535 - suff = "U" - elif bertos_utils.isUnsignedLong(configurations[property]): - minimum = 0 - maximum = 4294967295L - 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) + 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): - 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()) @@ -144,7 +163,10 @@ 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()): @@ -155,7 +177,7 @@ class BModulePage(BWizardPage): 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) @@ -173,6 +195,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 +207,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 +293,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 = {}