X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBModulePage.py;h=deed395e9aec2c7a679e5ca8a7e53b8203b19749;hb=080f681f5d8c2fdaf2577492b7a7bde72c101fbb;hp=86095d9079aa03ce68e30b55eed5d7dcb1dc37ab;hpb=255e98716335ab8e40da330bad016a8983046dec;p=bertos.git

diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py
index 86095d90..deed395e 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):
@@ -37,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))