X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCpuPage.py;h=a67f98e06216e385c31d91d51ba8bc388b2c302d;hb=fdc88a37b41df85d15b91ff1b5d12474e0d38bf3;hp=e490acab29646e4dca3eb963660cf61601081647;hpb=380e77785336771292d9a9a9d12f3c316694e915;p=bertos.git diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py index e490acab..a67f98e0 100644 --- a/wizard/BCpuPage.py +++ b/wizard/BCpuPage.py @@ -46,7 +46,7 @@ class BCpuPage(BWizardPage): 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["CORE_CPU"]]: + if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["CORE_CPU"], infos["TOOLCHAIN"]]: tag_dict[tag] = "True" else: tag_dict[tag] = "False" @@ -84,9 +84,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: self.selectItem(cpu_name) + if not selected_freq is None: + self.setFrequency(selected_freq) + self.freq_modified = True QApplication.instance().restoreOverrideCursor() self.emit(SIGNAL("completeChanged()")) @@ -143,4 +147,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)) \ No newline at end of file