projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show wizard version.
[bertos.git]
/
wizard
/
BCpuPage.py
diff --git
a/wizard/BCpuPage.py
b/wizard/BCpuPage.py
index e490acab29646e4dca3eb963660cf61601081647..f38ab35c5069b5ec5b037d219cb991850f6683d6 100644
(file)
--- a/
wizard/BCpuPage.py
+++ b/
wizard/BCpuPage.py
@@
-46,10
+46,10
@@
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:
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"]]:
- tag_dict[tag] =
"True"
+ if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["CORE_CPU"]
, infos["TOOLCHAIN"]
]:
+ tag_dict[tag] =
True
else:
else:
- tag_dict[tag] =
"False"
+ tag_dict[tag] =
False
self.setProjectInfo("ALL_CPU_TAGS", tag_dict)
return True
else:
self.setProjectInfo("ALL_CPU_TAGS", tag_dict)
return True
else:
@@
-84,9
+84,13
@@
class BCpuPage(BWizardPage):
bertos_utils.loadSourceTree(self.project())
self.populateCpuList()
cpu_name = self.projectInfo("CPU_NAME")
bertos_utils.loadSourceTree(self.project())
self.populateCpuList()
cpu_name = self.projectInfo("CPU_NAME")
+ selected_freq = self.projectInfo("SELECTED_FREQ")
self.setupUi()
self.setupUi()
- if
not cpu_name is Non
e:
+ if
cpu_nam
e:
self.selectItem(cpu_name)
self.selectItem(cpu_name)
+ if selected_freq:
+ self.setFrequency(selected_freq)
+ self.freq_modified = True
QApplication.instance().restoreOverrideCursor()
self.emit(SIGNAL("completeChanged()"))
QApplication.instance().restoreOverrideCursor()
self.emit(SIGNAL("completeChanged()"))
@@
-130,7
+134,7
@@
class BCpuPage(BWizardPage):
# Create, fill and store the dict with the tags
tag_dict = {}
for element in tag_list:
# Create, fill and store the dict with the tags
tag_dict = {}
for element in tag_list:
- tag_dict[element] =
"False"
+ tag_dict[element] =
False
self.setProjectInfo("ALL_CPU_TAGS", tag_dict)
for cpu in infos:
item = QListWidgetItem(cpu["CPU_NAME"])
self.setProjectInfo("ALL_CPU_TAGS", tag_dict)
for cpu in infos:
item = QListWidgetItem(cpu["CPU_NAME"])
@@
-143,4
+147,7
@@
class BCpuPage(BWizardPage):
"""
elements = self.pageContent.cpuList.findItems(cpu, Qt.MatchCaseSensitive)
if len(elements) == 1:
"""
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