X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=100abb5666488b290da0f2e3c8d3085f21e0ace5;hb=28200763bd0b90237ce7bc2133857f5e3148c044;hp=2afcf1be1e94b48c0f2e16a5dbbbf9d2a77ab69a;hpb=fea9d2e39d8694ff5f6e542fe4eb641a3a56aa33;p=bertos.git diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py index 2afcf1be..100abb56 100644 --- a/wizard/BToolchainPage.py +++ b/wizard/BToolchainPage.py @@ -10,72 +10,80 @@ # import os +import collections from BWizardPage import * import BToolchainSearch import bertos_utils import qvariant_converter +from const import * + class BToolchainPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "toolchain_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui") self.setTitle(self.tr("Select toolchain")) self._validationProcess = None - self._populateToolchainList() + self._updateUi() + #self._populateToolchainList() self._connectSignals() def _updateUi(self): - if self.pageContent.customDirBox.isChecked(): - self._enableCustomDir() - else: - self._disableCustomDir() - if self.pageContent.pathBox.isChecked() or (self.pageContent.customDirBox.isChecked() and self.pageContent.customDirList.count() != 0): - self.pageContent.doSearchButton.setEnabled(True) - else: - self.pageContent.doSearchButton.setEnabled(False) + self.pageContent.infoLabel.setVisible(False) def _populateToolchainList(self): toolchains = self.toolchains() - for element in toolchains: - item = QListWidgetItem(element) - item.setData(Qt.UserRole, QVariant(element)) + for key, value in toolchains.items(): + item = QListWidgetItem(key) + item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": key})) self.pageContent.toolchainList.addItem(item) - + if value: + self.validateToolchain(self.pageContent.toolchainList.row(item)) + def _clearList(self): self.pageContent.toolchainList.clear() def _selectionChanged(self): - self.emit(SIGNAL("completeChanged()")) + if self.pageContent.toolchainList.currentIndex != -1: + infos = collections.defaultdict(lambda: unicode("not defined")) + infos.update(qvariant_converter.getStringDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole))) + self.pageContent.infoLabel.setText("GCC " + infos["version"] + " (" + infos["build"] + ")\nTarget: " + infos["target"] + "\nPath: " + os.path.normpath(infos["path"])) + self.pageContent.infoLabel.setVisible(True) + self.emit(SIGNAL("completeChanged()")) def _search(self): dirList = self.searchDirList() - if(self.pathSearch()): + if self.pathSearch(): dirList += [element for element in bertos_utils.getSystemPath()] toolchainList = bertos_utils.findToolchains(dirList) - storedToolchainList = self.toolchains() - toolchainList = set(toolchainList) - set(storedToolchainList) + storedToolchains = self.toolchains() for element in toolchainList: - item = QListWidgetItem(element) - item.setData(Qt.UserRole, QVariant(element)) - self.pageContent.toolchainList.addItem(item) - self.setToolchains(list(toolchainList.union(storedToolchainList))) + if not element in storedToolchains.keys(): + item = QListWidgetItem(element) + item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": element})) + self.pageContent.toolchainList.addItem(item) + storedToolchains[element] = False + self.setToolchains(storedToolchains) def _connectSignals(self): self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self._selectionChanged) self.connect(self.pageContent.addButton, SIGNAL("clicked()"), self.addToolchain) self.connect(self.pageContent.removeButton, SIGNAL("clicked()"), self.removeToolchain) self.connect(self.pageContent.searchButton, SIGNAL("clicked()"), self.searchToolchain) - self.connect(self.pageContent.checkButton, SIGNAL("clicked()"), self.validateToolchains) + self.connect(self.pageContent.checkButton, SIGNAL("clicked()"), self.validateAllToolchains) def _validItem(self, index, infos): item = self.pageContent.toolchainList.item(index) + newData = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole)) + newData.update(infos) + item.setData(Qt.UserRole, qvariant_converter.convertStringDict(newData)) needed = self._projectInfoRetrieve("CPU_INFOS") - if infos["target"].find(needed["TOOLCHAIN"]) != -1: + if "target" in infos.keys() and infos["target"].find(needed["TOOLCHAIN"]) != -1: item.setIcon(QIcon(":/images/ok.png")) else: item.setIcon(QIcon(":/images/warning.png")) - item.setText(infos["version"] + " " + infos["target"]) + item.setText("GCC " + infos["version"] + " - " + infos["target"]) def _invalidItem(self, index): item = self.pageContent.toolchainList.item(index) @@ -85,18 +93,18 @@ class BToolchainPage(BWizardPage): sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "") if not sel_toolchain.isEmpty(): item = QListWidgetItem(sel_toolchain) - item.setData(Qt.UserRole, QVariant(sel_toolchain)) + item.setData(Qt.UserRole, qvariant_converter.convertString({"path": sel_toolchain})) self.pageContent.toolchainList.addItem(item) toolchains = self.toolchains() - toolchains = set(toolchains + [sel_toolchain]) - self.setToolchains(list(toolchains)) + toolchains[sel_toolchain] = False + self.setToolchains(toolchains) def removeToolchain(self): if self.pageContent.toolchainList.currentRow() != -1: item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow()) - toolchain = qvariant_converter.getString(item.data(Qt.UserRole)) + toolchain = qvariant_converter.getStringDict(item.data(Qt.UserRole))["path"] toolchains = self.toolchains() - toolchains.remove(toolchain) + del toolchains[toolchain] self.setToolchains(toolchains) def searchToolchain(self): @@ -104,27 +112,51 @@ class BToolchainPage(BWizardPage): self.connect(search, SIGNAL("accepted()"), self._search) search.exec_() - def validateToolchains(self): + def validateAllToolchains(self): for i in range(self.pageContent.toolchainList.count()): - filename = qvariant_converter.getString(self.pageContent.toolchainList.item(i).data(Qt.UserRole)) + self.validateToolchain(i) + + def validateToolchain(self, i): + filename = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(i).data(Qt.UserRole))["path"] + valid = False + info = {} + ## Check for the other tools of the toolchain + for tool in TOOLCHAIN_ITEMS: + if os.path.exists(filename.replace("gcc", tool)): + valid = True + else: + valid = False + break + ## Try to retrieve the informations about the toolchain only for the valid toolchains + if valid: self._validationProcess = QProcess() self._validationProcess.start(filename, ["-v"]) self._validationProcess.waitForStarted(1000) if self._validationProcess.waitForFinished(200): description = str(self._validationProcess.readAllStandardError()) - infos = bertos_utils.getToolchainInfo(description) - if len(infos.keys()) == 4: - self._validItem(i, infos) - else: - self._invalidItem(i) + info = bertos_utils.getToolchainInfo(description) + if len(info.keys()) >= 4: + valid = True else: self._validationProcess.kill() - self._invalidItem(i) + ## Add the item in the list with the appropriate associate data. + if valid: + self._validItem(i, info) + else: + self._invalidItem(i) + toolchains = self.toolchains() + toolchains[filename] = True + self.setToolchains(toolchains) def isComplete(self): if self.pageContent.toolchainList.currentRow() != -1: self._projectInfoStore("TOOLCHAIN", - qvariant_converter.getString(self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole))) + qvariant_converter.getStringDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole))) return True else: - return False \ No newline at end of file + return False + + def reloadData(self): + self._clearList() + self._updateUi() + self._populateToolchainList() \ No newline at end of file