X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=af1404e9bf476b3ae0b6191ae0d6fb72b8901eea;hb=41e39823c216af723fabcce9b56c16b525adde1f;hp=3cc9f1afca01f534fbf9a15a466905aa58874ee1;hpb=f3e3091dd3017a4fc976e4d334bcecc90fadc344;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index 3cc9f1af..af1404e9 100644
--- a/wizard/BModulePage.py
+++ b/wizard/BModulePage.py
@@ -15,11 +15,13 @@ 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()
@@ -36,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))
@@ -60,50 +73,67 @@ class BModulePage(BWizardPage):
         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)
-            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))
+            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", "")))
-                self._controlGroup.addControl(index, spinBox)
+                    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())
@@ -162,7 +192,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":
@@ -248,6 +278,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 = {}