From 6e3c0e50843bafb735016889a5ea7f9d92bcaacb Mon Sep 17 00:00:00 2001 From: duplo Date: Mon, 19 Apr 2010 13:14:38 +0000 Subject: [PATCH] Add stub of preset load method. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3458 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BBoardPage.py | 2 +- wizard/BProject.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/wizard/BBoardPage.py b/wizard/BBoardPage.py index 848b0eeb..c2b41f38 100644 --- a/wizard/BBoardPage.py +++ b/wizard/BBoardPage.py @@ -91,7 +91,7 @@ class BBoardPage(BWizardPage): """ Overload of the BWizardPage reloadData method. """ - pass + self.project.loadPresets() #### diff --git a/wizard/BProject.py b/wizard/BProject.py index 5ecf7f22..60ebb4ab 100644 --- a/wizard/BProject.py +++ b/wizard/BProject.py @@ -117,8 +117,11 @@ class BProject(object): setEnabledModules(self, project_data["ENABLED_MODULES"]) def loadProjectPresets(self, preset_directory): - preset_prj_file = os.path.join(preset_directory, 'project.bertos') - preset_data = pickle.loads(open(preset_prj_file, "r").read()) + """ + Load the default presets (into the const.PREDEFINED_BOARDS_DIR). + """ + # NOTE: this method does nothing (for now). + preset_path = os.path.join(self.infos["SOURCES_PATH"], const.PREDEFINED_BOARDS_DIR) def loadModuleData(self, edit=False): module_info_dict = {} @@ -161,9 +164,11 @@ class BProject(object): list_info_dict.update(list_dict) except ParseError, err: raise DefineException.EnumDefineException(path, err.line_number, err.line) + # NOTE: These lines probably should be removed for filename, path in self.findDefinitions("*_" + self.infos["CPU_INFOS"]["TOOLCHAIN"] + ".h"): comment_list = getCommentList(open(path + "/" + filename, "r").read()) list_info_dict.update(loadDefineLists(comment_list)) + # end of lines to be removed for tag in self.infos["CPU_INFOS"]["CPU_TAGS"]: for filename, path in self.findDefinitions("*_" + tag + ".h"): comment_list = getCommentList(open(path + "/" + filename, "r").read()) @@ -232,4 +237,4 @@ class BProject(object): return definitions def __repr__(self): - return repr(self.infos) \ No newline at end of file + return repr(self.infos) -- 2.25.1