X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=afbe9891cbb1deb91c975dfb87d3a4726d61cb3e;hb=c5314cdb9fd0c2b69083fd608dfafd4d1c5cdb3d;hp=f95b8e7a3067e075864e081feaa4d30c13ebba16;hpb=4a19f44aa3ee90ca65710b2f3153bcaa8ec6c245;p=bertos.git diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index f95b8e7a..afbe9891 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -46,6 +46,7 @@ class BModulePage(BWizardPage): self.pageContent.propertyTable.setColumnCount(2) self.pageContent.propertyTable.setRowCount(0) self.pageContent.moduleLabel.setVisible(False) + self.pageContent.warningLabel.setVisible(False) def connectSignals(self): """ @@ -77,11 +78,23 @@ class BModulePage(BWizardPage): """ module = self.currentModule() if module is not None: + try: + supported = bertos_utils.isSupported(self.project(), module=module) + except SupportedException, e: + self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(module)) + supported = True self._control_group.clear() configuration = self.projectInfo("MODULES")[module]["configuration"] module_description = self.projectInfo("MODULES")[module]["description"] self.pageContent.moduleLabel.setText(module_description) self.pageContent.moduleLabel.setVisible(True) + if not supported: + self.pageContent.warningLabel.setVisible(True) + selected_cpu = self.projectInfo("CPU_NAME") + self.pageContent.warningLabel.setText(self.tr("Warning: the selected module, \ + is not completely supported by the %1.").arg(selected_cpu)) + else: + self.pageContent.warningLabel.setVisible(False) self.pageContent.propertyTable.clear() self.pageContent.propertyTable.setRowCount(0) if configuration != "": @@ -91,23 +104,30 @@ class BModulePage(BWizardPage): for i, property in param_list: if "type" in configurations[property]["informations"] and configurations[property]["informations"]["type"] == "autoenabled": # Doesn't show the hidden fields - pass + continue + try: + param_supported = bertos_utils.isSupported(self.project(), property_id=(configuration, property)) + except SupportedException, e: + self.exceptionOccurred(self.tr("Error evaluating \"%1\" for parameter %2").arg(e.support_string).arg(property)) + param_supported = True + if not param_supported: + # Doesn't show the unsupported parameters + continue + # Set the row count to the current index + 1 + self.pageContent.propertyTable.setRowCount(index + 1) + 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"] and configurations[property]["informations"]["type"] == "boolean": + self.insertCheckBox(index, configurations[property]["value"]) + elif "type" in configurations[property]["informations"] 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: - # Set the row count to the current index + 1 - self.pageContent.propertyTable.setRowCount(index + 1) - 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": - 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(configurations[property]["value"])) - index += 1 + # Not defined type, rendered as a text field + self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(configurations[property]["value"])) + index += 1 if self.pageContent.propertyTable.rowCount() == 0: module_label = self.pageContent.moduleLabel.text() module_label += "\n\nNo configuration needed." @@ -132,7 +152,7 @@ class BModulePage(BWizardPage): """ self.resetPropertyDescription() configurations = self.currentModuleConfigurations() - if self.currentProperty() in configurations.keys(): + if self.currentProperty() in configurations: description = configurations[self.currentProperty()]["brief"] name = self.currentProperty() self.currentPropertyItem().setText(description + "\n" + name) @@ -144,7 +164,7 @@ class BModulePage(BWizardPage): property = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole)) configuration = self.projectInfo("MODULES")[self.currentModule()]["configuration"] configurations = self.projectInfo("CONFIGURATIONS") - if "type" not in configurations[configuration][property]["informations"].keys() or configurations[configuration][property]["informations"]["type"] == "int": + if "type" not in configurations[configuration][property]["informations"] 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()) @@ -183,7 +203,7 @@ class BModulePage(BWizardPage): return categories = {} for module, information in modules.items(): - if information["category"] not in categories.keys(): + if information["category"] not in categories: categories[information["category"]] = [] categories[information["category"]].append(module) for category, module_list in categories.items(): @@ -191,6 +211,13 @@ class BModulePage(BWizardPage): for module in module_list: enabled = modules[module]["enabled"] module_item = QTreeWidgetItem(item, QStringList([module])) + try: + supported = bertos_utils.isSupported(self.project(), module=module) + except SupportedException, e: + self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(module)) + supported = True + if not supported: + module_item.setForeground(0, QBrush(QColor(Qt.red))) if enabled: module_item.setCheckState(0, Qt.Checked) else: @@ -257,9 +284,9 @@ class BModulePage(BWizardPage): minimum = 0 maximum = 4294967295 suff = "UL" - if "min" in informations.keys(): + if "min" in informations: minimum = int(informations["min"]) - if "max" in informations.keys(): + if "max" in informations: maximum = int(informations["max"]) spin_box.setRange(minimum, maximum) spin_box.setSuffix(suff) @@ -313,7 +340,7 @@ class BModulePage(BWizardPage): for index in range(self.pageContent.propertyTable.rowCount()): property_name = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole)) # Awful solution! Needed because if the user change the module, the selection changed... - if property_name not in self.currentModuleConfigurations().keys(): + if property_name not in self.currentModuleConfigurations(): break self.pageContent.propertyTable.item(index, 0).setText(self.currentModuleConfigurations()[property_name]['brief']) @@ -322,16 +349,6 @@ class BModulePage(BWizardPage): Resolves the selection dependencies. """ modules = self.projectInfo("MODULES") - try: - supported = bertos_utils.isSupported(selectedModule, self.project()) - except SupportedException, e: - self.exceptionOccurred(self.tr("Error evaluating \"%1\" for module %2").arg(e.support_string).arg(selectedModule)) - supported = True - # Temporary feedback - if supported: - print "%s is supported" %selectedModule - else: - print "%s is not supported" %selectedModule modules[selectedModule]["enabled"] = True self.setProjectInfo("MODULES", modules) depends = self.projectInfo("MODULES")[selectedModule]["depends"]