Order the configuration property
[bertos.git] / wizard / BModulePage.py
index a5af68600dd3ea6e43600a6bb45e5aa5c7c82220..b124df9c94e9e19e94ab9b3b6e2e0fb33537b628 100644 (file)
@@ -23,126 +23,141 @@ class BModulePage(BWizardPage):
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/module_select.ui")
         self.setTitle(self.tr("Configure the BeRTOS modules"))
-        self._controlGroup = QControlGroup()
+        self._control_group = QControlGroup()
         self._connectSignals()
     
     def reloadData(self):
         self._setupUi()
-        self._setupButtonGroup()
         self._loadModuleData()
-        self._fillModuleTable()
+        self._fillModuleTree()
     
     def _setupButtonGroup(self):
-        self._buttonGroup = QButtonGroup()
-        self._buttonGroup.setExclusive(False)
-        self.connect(self._buttonGroup, SIGNAL("buttonClicked(int)"), self._moduleSelectionChanged)
+        self._button_group = QButtonGroup()
+        self._button_group.setExclusive(False)
+        self.connect(self._button_group, SIGNAL("buttonClicked(int)"), self._moduleSelectionChanged)
     
     def _loadModuleData(self):
         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"])
+            bertos_utils.loadModuleData(self._project())
         except ModuleDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing module information in file %1").arg(e.parameter))
+            self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
         except EnumDefineException, e:
-            self._exceptionOccurred(self.tr("Error parsing enum informations in file %1").arg(e.parameter))
+            self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
         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)
+            self._exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line))
     
-    def _fillModuleTable(self):
+    def _fillModuleTree(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))
-            checkBox = QCheckBox()
-            self._buttonGroup.addButton(checkBox, index)
-            self.pageContent.moduleTable.setCellWidget(index, 0, checkBox)
-            checkBox.setChecked(modules[module]["enabled"])
+        categories = {}
+        for module, information in modules.items():
+            if information["category"] not in categories.keys():
+                categories[information["category"]] = []
+            categories[information["category"]].append(module)
+        for category, modules in categories.items():
+            item = QTreeWidgetItem(QStringList([category]))
+            for module in modules:
+                module_item = QTreeWidgetItem(item, QStringList([module]))
+                module_item.setCheckState(0, Qt.Unchecked)
+            self.pageContent.moduleTree.addTopLevelItem(item)
+        self.pageContent.moduleTree.sortItems(0, Qt.AscendingOrder)
+        
     
     def _fillPropertyTable(self):
         module = self._currentModule()
         if module is not None:
-            self._controlGroup.clear()
+            self._control_group.clear()
             configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
-            moduleDescription = self._projectInfoRetrieve("MODULES")[module]["description"]
-            self.pageContent.moduleLabel.setText(moduleDescription)
+            module_description = self._projectInfoRetrieve("MODULES")[module]["description"]
+            self.pageContent.moduleLabel.setText(module_description)
             self.pageContent.moduleLabel.setVisible(True)
             self.pageContent.propertyTable.clear()
-            if len(configuration) > 0:
-                configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
-                self.pageContent.propertyTable.setRowCount(len(configurations))
-                for index, property in enumerate(configurations):
-                    item = QTableWidgetItem(property)
+            configurations = self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+            param_list = sorted(configurations["paramlist"])
+            self.pageContent.propertyTable.setRowCount(0)
+            index = 0
+            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
+                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":
-                        ## 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)
+                        self._insertCheckBox(index, configurations[property]["value"])
                     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)
+                        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:
-                        ## 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
-                        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"])
-                        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)
+                        # Not defined type, rendered as a text field
+                        self.pageContent.propertyTable.setItem(index, 1, QTableWidgetItem(configurations[property]["value"]))
+                    index += 1
+    
+    def _insertCheckBox(self, index, value):
+        ## boolean property
+        check_box = QCheckBox()
+        self.pageContent.propertyTable.setCellWidget(index, 1, check_box)
+        if value == "1":
+            check_box.setChecked(True)
+        else:
+            check_box.setChecked(False)
+        self._control_group.addControl(index, check_box)
+    
+    def _insertComboBox(self, index, value, value_list):
+        ## enum property
+        combo_box = QComboBox()
+        self.pageContent.propertyTable.setCellWidget(index, 1, combo_box)
+        enum = self._projectInfoRetrieve("LISTS")[value_list]
+        for i, element in enumerate(enum):
+            combo_box.addItem(element)
+            if element == value:
+                combo_box.setCurrentIndex(i)
+        self._control_group.addControl(index, combo_box)
+    
+    def _insertSpinBox(self, index, value, informations):
+        ## int, long or undefined type property
+        spin_box = None
+        if bertos_utils.isLong(informations) or bertos_utils.isUnsignedLong(informations):
+            spin_box = QDoubleSpinBox()
+            spin_box.setDecimals(0)
+        else:
+            spin_box = QSpinBox()
+        self.pageContent.propertyTable.setCellWidget(index, 1, spin_box)
+        minimum = -32768
+        maximum = 32767
+        suff = ""
+        if bertos_utils.isLong(informations):
+            minimum = -2147483648
+            maximum = 2147483647
+            suff = "L"
+        elif bertos_utils.isUnsigned(informations):
+            minimum = 0
+            maximum = 65535
+            suff = "U"
+        elif bertos_utils.isUnsignedLong(informations):
+            minimum = 0
+            maximum = 4294967295
+            suff = "UL"
+        if "min" in informations.keys():
+            minimum = int(informations["min"])
+        if "max" in informations.keys():
+            maximum = int(informations["max"])
+        spin_box.setRange(minimum, maximum)
+        spin_box.setSuffix(suff)
+        spin_box.setValue(int(value.replace("L", "").replace("U", "")))
+        self._control_group.addControl(index, spin_box)
+        
     
     def _currentModule(self):
-        currentModule = self.pageContent.moduleTable.item(self.pageContent.moduleTable.currentRow(), 1)
-        if currentModule is not None:
-            return unicode(currentModule.text())
+        current_module = self.pageContent.moduleTree.currentItem()
+        # return only the child items
+        if current_module is not None and current_module.parent() is not None:
+            return unicode(current_module.text(0))
         else:
             return None
     
@@ -155,34 +170,32 @@ class BModulePage(BWizardPage):
     def _currentPropertyItem(self):
         return self.pageContent.propertyTable.item(self.pageContent.propertyTable.currentRow(), 0)
     
-    def _module(self, row):
-        return unicode(self.pageContent.moduleTable.item(row, 1).text())
-    
     def _configurations(self, module):
         configuration = self._projectInfoRetrieve("MODULES")[module]["configuration"]
-        return self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+        if len(configuration) > 0:
+            return self._projectInfoRetrieve("CONFIGURATIONS")[configuration]
+        else:
+            return {}
     
     def _resetPropertyDescription(self):
         for index in range(self.pageContent.propertyTable.rowCount()):
-            propertyName = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
-            self.pageContent.propertyTable.item(index, 0).setText(propertyName)
+            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():
+                break
+            self.pageContent.propertyTable.item(index, 0).setText(self._currentModuleConfigurations()[property_name]['brief'])
     
     def _showPropertyDescription(self):
         self._resetPropertyDescription()
         configurations = self._currentModuleConfigurations()
         if self._currentProperty() in configurations.keys():
-            description = configurations[self._currentProperty()]["description"]
+            description = configurations[self._currentProperty()]["brief"]
             name = self._currentProperty()
-            self._currentPropertyItem().setText(name + "\n" + description)
+            self._currentPropertyItem().setText(description + "\n" + name)
     
     def _setupUi(self):
-        self.pageContent.moduleTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)
-        self.pageContent.moduleTable.horizontalHeader().setStretchLastSection(True)
-        self.pageContent.moduleTable.horizontalHeader().setVisible(False)
-        self.pageContent.moduleTable.verticalHeader().setResizeMode(QHeaderView.ResizeToContents)
-        self.pageContent.moduleTable.verticalHeader().setVisible(False)
-        self.pageContent.moduleTable.setColumnCount(2)
-        self.pageContent.moduleTable.setRowCount(0)
+        self.pageContent.moduleTree.clear()
+        self.pageContent.moduleTree.setHeaderHidden(True)
         self.pageContent.propertyTable.horizontalHeader().setResizeMode(QHeaderView.Stretch)
         self.pageContent.propertyTable.horizontalHeader().setVisible(False)
         self.pageContent.propertyTable.verticalHeader().setResizeMode(QHeaderView.ResizeToContents)
@@ -192,9 +205,10 @@ class BModulePage(BWizardPage):
         self.pageContent.moduleLabel.setVisible(False)
     
     def _connectSignals(self):
-        self.connect(self.pageContent.moduleTable, SIGNAL("itemSelectionChanged()"), self._fillPropertyTable)
+        self.connect(self.pageContent.moduleTree, SIGNAL("itemPressed(QTreeWidgetItem*, int)"), self._fillPropertyTable)
+        self.connect(self.pageContent.moduleTree, SIGNAL("itemChanged(QTreeWidgetItem*, int)"), self._dependencyCheck)
         self.connect(self.pageContent.propertyTable, SIGNAL("itemSelectionChanged()"), self._showPropertyDescription)
-        self.connect(self._controlGroup, SIGNAL("stateChanged"), self._saveValue)
+        self.connect(self._control_group, SIGNAL("stateChanged"), self._saveValue)
     
     def _saveValue(self, index):
         property = qvariant_converter.getString(self.pageContent.propertyTable.item(index, 0).data(Qt.UserRole))
@@ -213,55 +227,74 @@ class BModulePage(BWizardPage):
     
     def _moduleSelectionChanged(self, index):
         module = unicode(self.pageContent.moduleTable.item(index, 1).text())
-        if self._buttonGroup.button(index).isChecked():
+        if self._button_group.button(index).isChecked():
+            self._moduleSelected(module)
+        else:
+            self._moduleUnselected(module)
+    
+    def _dependencyCheck(self, item):
+        checked = False
+        module = unicode(item.text(0))
+        if item.checkState(0) == Qt.Checked:
             self._moduleSelected(module)
         else:
             self._moduleUnselected(module)
+            self.removeFileDependencies(module)
     
     def _moduleSelected(self, selectedModule):
         modules = self._projectInfoRetrieve("MODULES")
         modules[selectedModule]["enabled"] = True
         self._projectInfoStore("MODULES", modules)
         depends = self._projectInfoRetrieve("MODULES")[selectedModule]["depends"]
-        unsatisfied = self.selectDependencyCheck(selectedModule)
+        unsatisfied = []
+        if self.pageContent.automaticFix.isChecked():
+            unsatisfied = self.selectDependencyCheck(selectedModule)
         if len(unsatisfied) > 0:
-            message = self.tr("The module %1 needs the following modules:\n%2.\n\nDo you want to resolve automatically the problem?")
-            message = message.arg(selectedModule).arg(", ".join(unsatisfied))
-            choice = QMessageBox.warning(self, self.tr("Dependency error"), message, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes)
-            if choice == QMessageBox.Yes:
-                for module in unsatisfied:
-                    modules = self._projectInfoRetrieve("MODULES")
-                    modules[module]["enabled"] = True
-                for index in range(self.pageContent.moduleTable.rowCount()):
-                    if unicode(self.pageContent.moduleTable.item(index, 1).text()) in unsatisfied:
-                        self._buttonGroup.button(index).setChecked(True)
+            for module in unsatisfied:
+                modules = self._projectInfoRetrieve("MODULES")
+                modules[module]["enabled"] = True
+            for category in range(self.pageContent.moduleTree.topLevelItemCount()):
+                item = self.pageContent.moduleTree.topLevelItem(category)
+                for child in range(item.childCount()):
+                    if unicode(item.child(child).text(0)) in unsatisfied:
+                        item.child(child).setCheckState(0, Qt.Checked)
     
     def _moduleUnselected(self, unselectedModule):
         modules = self._projectInfoRetrieve("MODULES")
         modules[unselectedModule]["enabled"] = False
         self._projectInfoStore("MODULES", modules)
-        unsatisfied = self.unselectDependencyCheck(unselectedModule)
+        unsatisfied = []
+        if self.pageContent.automaticFix.isChecked():
+            unsatisfied = self.unselectDependencyCheck(unselectedModule)
         if len(unsatisfied) > 0:
-            message = self.tr("The module %1 is needed by the following modules:\n%2.\n\nDo you want to resolve automatically the problem?")
+            message = self.tr("The module %1 is needed by the following modules:\n%2.\n\nDo you want to remove these modules too?")
             message = message.arg(unselectedModule).arg(", ".join(unsatisfied))
             choice = QMessageBox.warning(self, self.tr("Dependency error"), message, QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes)
             if choice == QMessageBox.Yes:
                 for module in unsatisfied:
                     modules = self._projectInfoRetrieve("MODULES")
                     modules[module]["enabled"] = False
-                for index in range(self.pageContent.moduleTable.rowCount()):
-                    if unicode(self.pageContent.moduleTable.item(index, 1).text()) in unsatisfied:
-                        self._buttonGroup.button(index).setChecked(False)
-    
+                for category in range(self.pageContent.moduleTree.topLevelItemCount()):
+                    item = self.pageContent.moduleTree.topLevelItem(category)
+                    for child in range(item.childCount()):
+                        if unicode(item.child(child).text(0)) in unsatisfied:
+                            item.child(child).setCheckState(0, Qt.Unchecked)
     
     def selectDependencyCheck(self, module):
         unsatisfied = set()
         modules = self._projectInfoRetrieve("MODULES")
+        files = self._projectInfoRetrieve("FILES")
         for dependency in modules[module]["depends"]:
-            if not modules[dependency]["enabled"]:
+            if dependency in modules and not modules[dependency]["enabled"]:
                 unsatisfied |= set([dependency])
                 if dependency not in unsatisfied:
                     unsatisfied |= self.selectDependencyCheck(dependency)
+            if dependency not in modules:
+                if dependency in files:
+                    files[dependency] += 1
+                else:
+                    files[dependency] = 1
+        self._projectInfoStore("FILES", files)
         return unsatisfied
     
     def unselectDependencyCheck(self, dependency):
@@ -273,6 +306,17 @@ class BModulePage(BWizardPage):
                 if dependency not in unsatisfied:
                     unsatisfied |= self.unselectDependencyCheck(module)
         return unsatisfied
+    
+    def removeFileDependencies(self, module):
+        modules = self._projectInfoRetrieve("MODULES")
+        files = self._projectInfoRetrieve("FILES")
+        dependencies = modules[module]["depends"]
+        for dependency in dependencies:
+            if dependency in files:
+                files[dependency] -= 1
+                if files[dependency] == 0:
+                    del files[dependency]
+        self._projectInfoStore("FILES", files)
 
 class QControlGroup(QObject):
     def __init__(self):