X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=5af9e6641009e0c7cadf92c39c6d1dcbe7b6ba6f;hb=6c47601c34ecd30ab6f4f25be8d43ac841b70221;hp=86095d9079aa03ce68e30b55eed5d7dcb1dc37ab;hpb=255e98716335ab8e40da330bad016a8983046dec;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 86095d90..5af9e664 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -15,6 +15,7 @@ from PyQt4.QtGui import * from BWizardPage import * import bertos_utils +from DefineException import * from const import * class BModulePage(BWizardPage): @@ -22,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() @@ -37,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)) @@ -59,55 +71,80 @@ 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": + ## 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 + 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: - ## 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"]) - else: - 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", ""))) - self._controlGroup.addControl(index, spinBox) + 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()) @@ -127,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) @@ -152,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) @@ -163,7 +202,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": @@ -249,6 +288,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 = {}