[Avida-SVN] r1074 - branches/developers/avida-edward/source/python/AvidaGui2

[jclune at myxo.css.msu.edu]

Author: jclune
Date: 2006-11-07 14:30:06 -0500 (Tue, 07 Nov 2006)
New Revision: 1074

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
removed None from petri dish pulldown

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py	2006-11-06 17:11:12 UTC (rev 1073)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py	2006-11-07 19:30:06 UTC (rev 1074)
@@ -293,11 +293,11 @@
 
     self.m_entries = (
     #  Mode Name,        Indexer
-      ('None',
-        continuousIndexer(NullIdx),
-        gradualLinScaleUpdater(RangeReport(NullRng, self.m_session_mdl)),
-        None
-        ),
+#      ('None',
+#        continuousIndexer(NullIdx),
+#        gradualLinScaleUpdater(RangeReport(NullRng, self.m_session_mdl)),
+#        None
+#        ),
       ('Metabolic Rate',
         continuousIndexer(MeritIdx),
         gradualLinScaleUpdater(RangeReport(MeritRng, self.m_session_mdl)),

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2006-11-06 17:11:12 UTC (rev 1073)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2006-11-07 19:30:06 UTC (rev 1074)
@@ -116,6 +116,7 @@
       lineage_range = len(self.m_session_mdl.m_ancestors_dict)
       non_normalized_index = int(label) + 1
       normalized_index = float(non_normalized_index) / float(lineage_range)
+      print "self.m_petri_dish_ctrl is: ", self.m_petri_dish_ctrl
       a_sensible_color = self.m_petri_dish_ctrl.m_color_lookup_functor(normalized_index)
 
       #the following ugly code is brought to you by the fact that I can't delete objects
@@ -174,7 +175,7 @@
     self.m_avida and self.m_avida.m_avida_threaded_driver.m_lock.acquire()
     self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("mapModeChangedSig"), (self.m_map_profile.getModeName(index),))
     self.m_mode_index = index
-    if (self.m_mode_index==4):
+    if (self.m_mode_index==3):
       self.m_map_legend_widget_stack.raiseWidget(1)
     else:
       self.m_map_legend_widget_stack.raiseWidget(0)

Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list	2006-11-06 17:11:12 UTC (rev 1073)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list	2006-11-07 19:30:06 UTC (rev 1074)
@@ -76,6 +76,11 @@
 ************Jeff*******************
 
 Priority High
+-When I click on an org the color block, name and stats for that org 
+come up correctly (or at least I assume they are correct).  However, 
+on my version the color block, name and stats stay the same even when 
+the org on the petri dish changes.  If I click on the org in question 
+the stats are updated.
 -work with brian to get delete working on the front of the dish (either by taking it to the can or hitting the delete key)
 -fix the problem where the arrows are pushed off the edge (talk with josh to make it happen)
 -add a None option to the analyze population color list 
@@ -322,3 +327,6 @@
 --make tasks reflect parent tasks (not real time) in org report (pending group decision) (1/26/06)
 -bring the ability to see the org square outlined in gray back (works now)
 -ancestor legend view now works
+
+November:
+-Fixed: A new run will not start from initial conditions if the Petri Dish view is set to "None".