Change the int type identification

[bertos.git] / wizard / BModulePage.py

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index 3cc9f1afca01f534fbf9a15a466905aa58874ee1..c98ce937ac6140efc2f2857f176089c0c3b15641 100644 (file)
--- 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,28 @@ 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():
+                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))
@@ -90,19 +102,29 @@ class BModulePage(BWizardPage):
                 ## 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 = -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"])
-                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", "")))
+                spinBox.setRange(minimum, maximum)
+                spinBox.setSuffix(suff)
+                spinBox.setValue(int(configurations[property]["value"].replace("L", "").replace("U", "")))
                 self._controlGroup.addControl(index, spinBox)
     
     def _currentModule(self):