X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBCpuPage.py;h=8ebaf4125fb2a496e574901c40d2d7924b3630c7;hb=83fc7933f968173822ed3f636d75860d4a747e76;hp=c105543c2680f3e304292f8fd819b2b3b1d3921d;hpb=2523526e79b094727d83f791c2ff3a5b9e5c6cd3;p=bertos.git

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index c105543c..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$
 #
@@ -37,16 +61,21 @@ 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["CORE_CPU"], infos["TOOLCHAIN"]]:
+                if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["TOOLCHAIN"]]:
                     tag_dict[tag] = True
                 else:
                     tag_dict[tag] = False
@@ -86,9 +115,9 @@ class BCpuPage(BWizardPage):
         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 not selected_freq is None:
+            if selected_freq:
                 self.setFrequency(selected_freq)
                 self.freq_modified = True
         QApplication.instance().restoreOverrideCursor()
@@ -150,4 +179,4 @@ class BCpuPage(BWizardPage):
             self.pageContent.cpuList.setCurrentItem(elements[0])
     
     def setFrequency(self, frequency):
-        self.pageContent.frequencySpinBox.setValue(long(frequency))
\ No newline at end of file
+        self.pageContent.frequencySpinBox.setValue(long(frequency))