X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=02a743741c6b751081b3659460be149c575655a5;hb=2d4ed0db91173bdb604fa50892409ed6c81db6a2;hp=f3edd0e64be40c7a1f96a8a9cf3555157078c7bb;hpb=7b112f4f1d09be0c418fa3e9252b5dbbf6b53854;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index f3edd0e6..02a74374 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):
@@ -39,25 +40,21 @@ class BModulePage(BWizardPage):
     def _loadModuleData(self):
         try:
             modules = bertos_utils.loadModuleInfosDict(self._projectInfoRetrieve("SOURCES_PATH"))
-        except SyntaxError:
-            self._exceptionOccurred(self.tr("Wrong syntax in module definitions"))
-            return
-        try:
             lists = bertos_utils.loadDefineListsDict(self._projectInfoRetrieve("SOURCES_PATH"))
-        except SyntaxError:
-            self._exceptionOccurred(self.tr("Wrong syntax in enum definitions"))
-            return
-        configurations = {}
-        for module, informations in modules.items():
-            try:
+            configurations = {}
+            for module, informations in modules.items():
                 configurations[informations["configuration"]] = bertos_utils.loadConfigurationInfos(self._projectInfoRetrieve("SOURCES_PATH") +
                                                                                                     "/" + informations["configuration"])
-            except SyntaxError:
-                self._exceptionOccurred(self.tr("Wrong syntax in %1 configuration file").arg(informations["configuration"]))
-                return
-        self._projectInfoStore("MODULES", modules)
-        self._projectInfoStore("LISTS", lists)
-        self._projectInfoStore("CONFIGURATIONS", configurations)
+        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")
@@ -103,21 +100,35 @@ class BModulePage(BWizardPage):
                 self._controlGroup.addControl(index, comboBox)
             else:
                 ## int, long or undefined type property
-                spinBox = QSpinBox()
+                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"])
-                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):