X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCpuPage.py;h=8ebaf4125fb2a496e574901c40d2d7924b3630c7;hb=83fc7933f968173822ed3f636d75860d4a747e76;hp=4edda121292106631e83a49f842b852e0448b691;hpb=6c79d70ee1d49f136663e5bbdcd3f2e246815203;p=bertos.git diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py index 4edda121..8ebaf412 100644 --- a/wizard/BCpuPage.py +++ b/wizard/BCpuPage.py @@ -1,8 +1,32 @@ #!/usr/bin/env python # encoding: utf-8 # +# This file is part of BeRTOS. +# +# Bertos is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, you may use this file as part of a free software +# library without restriction. Specifically, if other files instantiate +# templates or use macros or inline functions from this file, or you compile +# this file and link it with other files to produce an executable, this +# file does not by itself cause the resulting executable to be covered by +# the GNU General Public License. This exception does not however +# invalidate any other reasons why the executable file might be covered by +# the GNU General Public License. +# # Copyright 2008 Develer S.r.l. (http://www.develer.com/) -# All rights reserved. # # $Id$ # @@ -24,7 +48,7 @@ class BCpuPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, UI_LOCATION + "/cpu_select.ui") self.setTitle(self.tr("Select the CPU")) - self.default_freqs = {} + self.freq_modified = False ## Overloaded QWizardPage methods ## @@ -37,13 +61,25 @@ class BCpuPage(BWizardPage): self.pageContent.frequencySpinBox.setVisible(True) infos = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole)) for key, value in infos.items(): - if type(CPU_DEF[key]) == list: - infos[key] = qvariant_converter.getStringList(value) - if type(CPU_DEF[key]) == str or type(CPU_DEF) == unicode: + if key in CPU_DEF: + if type(CPU_DEF[key]) == list: + infos[key] = qvariant_converter.getStringList(value) + if type(CPU_DEF[key]) == str or type(CPU_DEF) == unicode: + infos[key] = qvariant_converter.getString(value) + elif key.startswith(MK_PARAM_ID): infos[key] = qvariant_converter.getString(value) + else: + del infos[key] self.setProjectInfo("CPU_INFOS", infos) self.setProjectInfo("CPU_NAME", unicode(self.pageContent.cpuList.currentItem().text())) self.setProjectInfo("SELECTED_FREQ", unicode(long(self.pageContent.frequencySpinBox.value()))) + tag_dict = self.projectInfo("ALL_CPU_TAGS") + for tag in tag_dict: + if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["TOOLCHAIN"]]: + tag_dict[tag] = True + else: + tag_dict[tag] = False + self.setProjectInfo("ALL_CPU_TAGS", tag_dict) return True else: return False @@ -67,7 +103,7 @@ class BCpuPage(BWizardPage): Overload of the BWizardPage connectSignals method. """ self.connect(self.pageContent.cpuList, SIGNAL("itemSelectionChanged()"), self.rowChanged) - self.connect(self.pageContent.frequencySpinBox, SIGNAL("valueChanged(double)"), self.freqChanged) + self.connect(self.pageContent.frequencySpinBox, SIGNAL("editingFinished()"), self.freqChanged) def reloadData(self): """ @@ -77,14 +113,13 @@ class BCpuPage(BWizardPage): bertos_utils.loadSourceTree(self.project()) self.populateCpuList() cpu_name = self.projectInfo("CPU_NAME") + selected_freq = self.projectInfo("SELECTED_FREQ") self.setupUi() - if not cpu_name is None: + if cpu_name: self.selectItem(cpu_name) - if self.default_freqs == {}: - for index in range(self.pageContent.cpuList.count()): - default_freq = qvariant_converter.getStringDict(self.pageContent.cpuList.item(index).data(Qt.UserRole))["CPU_DEFAULT_FREQ"] - default_freq = long(default_freq.replace("U", "").replace("L", "")) - self.default_freqs[default_freq] = default_freq + if selected_freq: + self.setFrequency(selected_freq) + self.freq_modified = True QApplication.instance().restoreOverrideCursor() self.emit(SIGNAL("completeChanged()")) @@ -98,24 +133,21 @@ class BCpuPage(BWizardPage): """ description = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))["CPU_DESC"] description = qvariant_converter.getStringList(description) - # Retrieve the default cpu frequency - default_freq = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))["CPU_DEFAULT_FREQ"] - default_freq = qvariant_converter.getString(default_freq) - default_freq = long(default_freq.replace("U", "").replace("L", "")) - current_freq = self.default_freqs[default_freq] + if not self.freq_modified: + # Retrieve the default cpu frequency when the value isn't already modified + current_freq = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))["CPU_DEFAULT_FREQ"] + current_freq = qvariant_converter.getString(current_freq) + current_freq = long(current_freq.replace("U", "").replace("L", "")) + self.pageContent.frequencySpinBox.setValue(long(current_freq)) self.pageContent.descriptionLabel.setText("
".join(description)) self.pageContent.descriptionLabel.setVisible(True) - self.pageContent.frequencySpinBox.setValue(long(current_freq)) self.emit(SIGNAL("completeChanged()")) def freqChanged(self): """ Slot called when the user change the frequency value. """ - default_freq = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))["CPU_DEFAULT_FREQ"] - default_freq = qvariant_converter.getString(default_freq) - default_freq = long(default_freq.replace("U", "").replace("L", "")) - self.default_freqs[default_freq] = long(self.pageContent.frequencySpinBox.value()) + self.freq_modified = True self.emit(SIGNAL("completeChanged()")) #### @@ -127,6 +159,12 @@ class BCpuPage(BWizardPage): self.pageContent.cpuList.clear() self.pageContent.cpuList.setCurrentItem(None) infos = bertos_utils.loadCpuInfos(self.project()) + tag_list = bertos_utils.getTagSet(infos) + # Create, fill and store the dict with the tags + tag_dict = {} + for element in tag_list: + tag_dict[element] = False + self.setProjectInfo("ALL_CPU_TAGS", tag_dict) for cpu in infos: item = QListWidgetItem(cpu["CPU_NAME"]) item.setData(Qt.UserRole, qvariant_converter.convertDict(cpu)) @@ -138,4 +176,7 @@ class BCpuPage(BWizardPage): """ elements = self.pageContent.cpuList.findItems(cpu, Qt.MatchCaseSensitive) if len(elements) == 1: - self.pageContent.cpuList.setCurrentItem(elements[0]) \ No newline at end of file + self.pageContent.cpuList.setCurrentItem(elements[0]) + + def setFrequency(self, frequency): + self.pageContent.frequencySpinBox.setValue(long(frequency))