X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=2236fcfe3bd463eace52f6670a28ba0390a4e725;hb=7615ed0ec58864bc2d5e8de82bde7ee36a998b17;hp=b3acb4d97622aaf567173497eeedf5d3cf1701c4;hpb=147451dc3bd84ba979b3c55b8dfe0261cccbfb48;p=bertos.git diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py index b3acb4d9..2236fcfe 100644 --- a/wizard/BToolchainPage.py +++ b/wizard/BToolchainPage.py @@ -9,32 +9,22 @@ # Author: Lorenzo Berni # +import os + from BWizardPage import * +import BToolchainSearch import bertos_utils +import qvariant_converter class BToolchainPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, "toolchain_select.ui") self.setTitle(self.tr("Select toolchain")) - self._setupUi() - self._populateToolchainList() - self._populateDirList() + self._validationProcess = None + #self._populateToolchainList() self._connectSignals() - def _setupUi(self): - path = self._settingsRetrieve("path_search").toBool() - if not path is None: - self.pageContent.pathBox.setChecked(path) - else: - self.pageContent.pathBox.setChecked(False) - customPath = self._settingsRetrieve("custom_dir").toBool() - if not customPath is None: - self.pageContent.customDirBox.setChecked(customPath) - else: - self.pageContent.customDirBox.setChecked(False) - self._updateUi() - def _updateUi(self): if self.pageContent.customDirBox.isChecked(): self._enableCustomDir() @@ -46,112 +36,108 @@ class BToolchainPage(BWizardPage): self.pageContent.doSearchButton.setEnabled(False) def _populateToolchainList(self): - toolchains = self._settingsRetrieve("toolchains").toList() - for element in toolchains: - item = QListWidgetItem(element.toString()) - item.setData(Qt.UserRole, element) + toolchains = self.toolchains() + for key, value in toolchains.items(): + item = QListWidgetItem(key) + item.setData(Qt.UserRole, qvariant_converter.convertString(key)) self.pageContent.toolchainList.addItem(item) - - def _populateDirList(self): - search_dir_list = self._settingsRetrieve("search_dir_list").toList() - for element in search_dir_list: - item = QListWidgetItem(element.toString()) - item.setData(Qt.UserRole, element) - self.pageContent.customDirList.addItem(item) - - def _disableCustomDir(self): - self.pageContent.customDirList.setEnabled(False) - self.pageContent.addDirButton.setEnabled(False) - self.pageContent.removeDirButton.setEnabled(False) - - def _enableCustomDir(self): - self.pageContent.customDirList.setEnabled(True) - self.pageContent.addDirButton.setEnabled(True) - self.pageContent.removeDirButton.setEnabled(True) - + if value: + self.validateToolchain(self.pageContent.toolchainList.row(item)) + def _clearList(self): self.pageContent.toolchainList.clear() def _selectionChanged(self): self.emit(SIGNAL("completeChanged()")) + def _search(self): + dirList = self.searchDirList() + if(self.pathSearch()): + dirList += [element for element in bertos_utils.getSystemPath()] + toolchainList = bertos_utils.findToolchains(dirList) + storedToolchains = self.toolchains() + for element in toolchainList: + if not element in storedToolchains.keys(): + item = QListWidgetItem(element) + item.setData(Qt.UserRole, qvariant_converter.convertString(element)) + self.pageContent.toolchainList.addItem(item) + storedToolchains[element] = False + self.setToolchains(storedToolchains) + def _connectSignals(self): - self.connect(self.pageContent.pathBox, SIGNAL("clicked()"), self._updateUi) - self.connect(self.pageContent.customDirBox, SIGNAL("clicked()"), self._updateUi) - self.connect(self.pageContent.searchButton, SIGNAL("clicked()"), self.toSearchSubpage) - self.connect(self.pageContent.cancelButton, SIGNAL("clicked()"), self.toSelectionSubpage) - self.connect(self.pageContent.doSearchButton, SIGNAL("clicked()"), self.doSearch) - self.connect(self.pageContent.addDirButton, SIGNAL("clicked()"), self.addDir) - self.connect(self.pageContent.removeDirButton, SIGNAL("clicked()"), self.removeDir) 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.validateAllToolchains) - def toSearchSubpage(self): - self.pageContent.pageSelector.setCurrentIndex(1) - - def toSelectionSubpage(self): - self.pageContent.pageSelector.setCurrentIndex(0) - - def doSearch(self): - path = [] - if self.pageContent.pathBox.isChecked(): - path += bertos_utils.getSystemPath() - if self.pageContent.customDirBox.isChecked(): - for element in range(self.pageContent.customDirList.count()): - path += [unicode(self.pageContent.customDirList.item(element).data(Qt.UserRole).toString())] - toolchains = bertos_utils.findToolchains(path) - toolchains_stored = self._settingsRetrieve("toolchains").toList() - toolchains += [unicode(toolchain.toString()) for toolchain in toolchains_stored] - toolchains = set(toolchains) - toolchains = list(toolchains) - self._clearList() - for toolchain in toolchains: - item = QListWidgetItem(toolchain) - item.setData(Qt.UserRole, QVariant(toolchain)) - self.pageContent.toolchainList.addItem(item) - self._settingsStore("toolchains", toolchains) - self.toSelectionSubpage() + def _validItem(self, index, infos): + item = self.pageContent.toolchainList.item(index) + needed = self._projectInfoRetrieve("CPU_INFOS") + if infos["target"].find(qvariant_converter.getString(needed["TOOLCHAIN"])) != -1: + item.setIcon(QIcon(":/images/ok.png")) + else: + item.setIcon(QIcon(":/images/warning.png")) + item.setText("GCC " + infos["version"] + " - " + infos["target"]) + + def _invalidItem(self, index): + item = self.pageContent.toolchainList.item(index) + item.setIcon(QIcon(":/images/error.png")) def addToolchain(self): sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "") - item = QListWidgetItem(sel_toolchain) - item.setData(Qt.UserRole, QVariant(sel_toolchain)) - self.pageContent.toolchainList.addItem(item) - toolchains = self._settingsRetrieve("toolchains").toList() - toolchains = set([toolchain.toString() for toolchain in toolchains] + [sel_toolchain]) - self._settingsStore("toolchains", list(toolchains)) + if not sel_toolchain.isEmpty(): + item = QListWidgetItem(sel_toolchain) + item.setData(Qt.UserRole, qvariant_converter.convertString(sel_toolchain)) + self.pageContent.toolchainList.addItem(item) + toolchains = self.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()) - item = item.data(Qt.UserRole).toString() - toolchains = self._settingsRetrieve("toolchains").toList() - toolchains = [toolchain.toString() for toolchain in toolchains] - toolchains.remove(unicode(item)) - self._settingsStore("toolchains", toolchains) + toolchain = qvariant_converter.getString(item.data(Qt.UserRole)) + toolchains = self.toolchains() + del toolchains[toolchain] + self.setToolchains(toolchains) + + def searchToolchain(self): + search = BToolchainSearch.BToolchainSearch() + self.connect(search, SIGNAL("accepted()"), self._search) + search.exec_() - def addDir(self): - directory = QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), "", QFileDialog.ShowDirsOnly) - if not directory.isEmpty(): - item = QListWidgetItem(directory) - item.setData(Qt.UserRole, QVariant(directory)) - self.pageContent.customDirList.addItem(item) - search_dir_list = self._settingsRetrieve("search_dir_list").toList() - search_dir_list = set([d.toString() for d in search_dir_list] + [directory]) - self._settingsStore("search_dir_list", list(search_dir_list)) + def validateAllToolchains(self): + for i in range(self.pageContent.toolchainList.count()): + self.validateToolchain(i) - def removeDir(self): - if self.pageContent.customDirList.currentRow() != -1: - item = self.pageContent.customDirList.takeItem(self.pageContent.customDirList.currentRow()) - search_dir_list = self._settingsRetrieve("search_dir_list").toList() - search_dir_list = set([d.toString() for d in search_dir_list]) - search_dir_list.remove(item.data(Qt.UserRole).toString()) - self._settingsStore("search_dir_list", list(search_dir_list)) + def validateToolchain(self, i): + filename = qvariant_converter.getString(self.pageContent.toolchainList.item(i).data(Qt.UserRole)) + 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) + else: + self._validationProcess.kill() + self._invalidItem(i) + toolchains = self.toolchains() + toolchains[filename] = True + self.setToolchains(toolchains) def isComplete(self): if self.pageContent.toolchainList.currentRow() != -1: - self._projectInfoStore("TOOLCHAIN", self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole).toString()) + self._projectInfoStore("TOOLCHAIN", + qvariant_converter.getString(self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole))) return True else: - return False \ No newline at end of file + return False + + def reloadData(self): + self._clearList() + self._populateToolchainList() \ No newline at end of file