From 22d182db24861239a33806c4869b2d6cc7228d8b Mon Sep 17 00:00:00 2001 From: Nostalghia Date: Thu, 17 Jun 2010 19:46:22 +0000 Subject: clean up before release --- diff --git a/NEWS b/NEWS index 84f8656..5635453 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,14 @@ An introduction to Kandid can be found at sugarlabs.org . http://wiki.sugarlabs.org/go/Activities/Kandid +v7: June 2010 +Removing Glade from Kandid to make it more compatible with the Sugar Platform (SP). +Glade is available in SoaS and Glade could be installed in most cases. + But it is not part of http://wiki.sugarlabs.org/go/0.88/Platform_Components + and there is no guaranty that Glade will exists on sugar box. +Bug fixing the rendering engine. +This release is NOT backward compatible. Some images created with former releases may be rendered different now. + v6: Mai 2010 This release is NOT backward compatible. Some images created with former releases may be rendered different now. Bug fixing the rendering engine. diff --git a/ep_page_ancestors.py b/ep_page_ancestors.py index b28a762..81b7f7a 100644 --- a/ep_page_ancestors.py +++ b/ep_page_ancestors.py @@ -66,8 +66,8 @@ class AncestorsController(object): """Start explaining of a protozoon. pre: protozoon is not None """ - ka_debug.info('AncestorsController.start_calculation %s' % - (protozoon.get_unique_id())) +# ka_debug.info('AncestorsController.start_calculation %s' % +# (protozoon.get_unique_id())) self._protozoon_id = protozoon.get_unique_id() self._drawing_page.show() self._widget_tree.get_widget('kandidNotebook'). \ diff --git a/ep_page_gettingstarted.py b/ep_page_gettingstarted.py index d06b673..1234a16 100644 --- a/ep_page_gettingstarted.py +++ b/ep_page_gettingstarted.py @@ -83,11 +83,11 @@ Kandid uses a simulated evolution without a fitness function. A cybernetic syste def on_readintro(self, args): """Show introduction page. """ - ka_debug.info('on_readintro') +# ka_debug.info('on_readintro') self._controller.on_page_show(2) #Assume into page has position 2. def on_startnew(self, args): """Show population page. """ - ka_debug.info('on_startnew') +# ka_debug.info('on_startnew') self._controller.on_page_show(0) #Assume population page has position 0. diff --git a/ka_importer.py b/ka_importer.py index 86e40c1..a2d217e 100644 --- a/ka_importer.py +++ b/ka_importer.py @@ -77,9 +77,11 @@ def get_import_path(): try: os.makedirs(import_path) except: - print 'failed writing [%s] [%s] [%s]' % \ - (import_path, sys.exc_info()[0], sys.exc_info()[1]) - traceback.print_exc(file=sys.__stderr__) +# print 'failed writing [%s] [%s] [%s]' % \ +# (import_path, sys.exc_info()[0], sys.exc_info()[1]) +# traceback.print_exc(file=sys.__stderr__) + ka_debug.err('failed writing [%s] [%s] [%s]' % \ + (import_path, sys.exc_info()[0], sys.exc_info()[1])) ka_debug.info('import_path ' + import_path) return import_path @@ -1063,8 +1065,10 @@ li.basic_active { #---- write version marker _write_file(import_path, '', 'install.inf', _marker) except: - print 'post install failed [%s] [%s]' % \ - (sys.exc_info()[0], sys.exc_info()[1]) - traceback.print_exc(file=sys.__stderr__) +# print 'post install failed [%s] [%s]' % \ +# (sys.exc_info()[0], sys.exc_info()[1]) +# traceback.print_exc(file=sys.__stderr__) + ka_debug.err('post install failed [%s] [%s]' % \ + (sys.exc_info()[0], sys.exc_info()[1])) _post_install() \ No newline at end of file diff --git a/model_population.py b/model_population.py index 163f8e4..9776c09 100644 --- a/model_population.py +++ b/model_population.py @@ -195,10 +195,10 @@ class KandidModel(object): new_one.mutate() history = ka_history.KandidHistory.instance() history.unlink(self.protozoans[new_at].get_unique_id()) - ka_debug.info('new offspring ' + new_one.get_unique_id() - + ' breeded by ' + good[0].get_unique_id() + ' and ' - + partner.get_unique_id() + ' replaced ' - + self.protozoans[new_at].get_unique_id()) +# ka_debug.info('new offspring ' + new_one.get_unique_id() +# + ' breeded by ' + good[0].get_unique_id() + ' and ' +# + partner.get_unique_id() + ' replaced ' +# + self.protozoans[new_at].get_unique_id()) self.protozoans[new_at] = new_one self.fitness[new_at] = 4.0 history.rember_parents(new_one.get_unique_id(), diff --git a/model_treenode.py b/model_treenode.py index 311d76b..95844e4 100644 --- a/model_treenode.py +++ b/model_treenode.py @@ -114,16 +114,16 @@ class TreeNode(model_allele.Allele): and self.layer == other.layer \ and self.merger == other.merger \ and self.modifier == other.modifier - if not equal and isinstance(other, TreeNode): - print self.__class__ - print self.left_treenode == other.left_treenode - print self.right_treenode == other.right_treenode - print self.left_background == other.left_background - print self.right_background == other.right_background - print self.layer == other.layer - print self.merger == other.merger - print self.modifier == other.modifier - print equal +# if not equal and isinstance(other, TreeNode): +# print self.__class__ +# print self.left_treenode == other.left_treenode +# print self.right_treenode == other.right_treenode +# print self.left_background == other.left_background +# print self.right_background == other.right_background +# print self.layer == other.layer +# print self.merger == other.merger +# print self.modifier == other.modifier +# print equal return equal def randomize(self): diff --git a/po/Kandid.pot b/po/Kandid.pot index 6b0d013..78e2127 100644 --- a/po/Kandid.pot +++ b/po/Kandid.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-17 19:37+0200\n" +"POT-Creation-Date: 2010-06-17 21:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v0.9.1