[Avida-cvs] [avida-svn] r800 - branches/developers/avida-edward/source/python/AvidaGui2

[jclune@myxo.css.msu.edu]

Author: jclune
Date: 2006-07-05 11:10:46 -0400 (Wed, 05 Jul 2006)
New Revision: 800

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py
Log:
UPDATE 800ck  Lineage label map mode works (kind of), but there are some bugs.

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py	2006-07-05 14:40:31 UTC (rev 799)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py	2006-07-05 15:10:46 UTC (rev 800)
@@ -203,7 +203,7 @@
     lines = lines + ["genesis.default", "LOG_SPECIES 0		# 0/1 (off/on) toggle to print file."]
     lines = lines + ["genesis.default", "LOG_LANDSCAPE 0		# 0/1 (off/on) toggle to print file."]
     lines = lines + ["genesis.default", ""]
-    lines = lines + ["genesis.default", "LOG_LINEAGES 0          # 0/1 (off/on) to log advantageous mutations"]
+    lines = lines + ["genesis.default", "LOG_LINEAGES 1          # 0/1 (off/on) to log advantageous mutations"]
     lines = lines + ["genesis.default", "# This one can slow down avida a lot. It is used to get an idea of how"]
     lines = lines + ["genesis.default", "# often an advantageous mutation arises, and where it goes afterwards."]
     lines = lines + ["genesis.default", "# See also LINEAGE_CREATION_METHOD."]

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py	2006-07-05 14:40:31 UTC (rev 799)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py	2006-07-05 15:10:46 UTC (rev 800)
@@ -40,6 +40,7 @@
 
   def setMapModeSlot(self,index):
     self.m_current_map_mode_name = index
+    print "Map mode changed"
 
   def avidaUpdatedSlot(self):
     pass

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py	2006-07-05 14:40:31 UTC (rev 799)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py	2006-07-05 15:10:46 UTC (rev 800)
@@ -29,9 +29,8 @@
     GestationTimeIdx = lambda c: c.GetOrganism().GetPhenotype().GetGestationTime()
     SizeIdx = lambda c: c.GetOrganism().GetPhenotype().GetGenomeLength()
     #GenotypeIdx = lambda c: c.GetOrganism().GetGenotype()
-    LineageIdx = lambda c: c.GetOrganism().GetLineageLabel()
+    LineageIdx = lambda c: c.GetOrganism().GetLineageLabel()+1
 
-
     class gradualLinScaleUpdater:
       def __init__(self, range):
         self.m_range = range
@@ -201,11 +200,11 @@
         gradualLinScaleUpdater(RangeReport(SizeRng, self.m_session_mdl)),
         sigmoidColorLookup
         ),
-      # ('Ancestor Organism',
-      #   continuousIndexer(LineageIdx),
-      #   gradualLinScaleUpdater(RangeReport(LineageRng, self.m_session_mdl)),
-      #   sigmoidColorLookup
-      #   ),
+       ('Ancestor Organism',
+         continuousIndexer(LineageIdx),
+         gradualLinScaleUpdater(RangeReport(LineageRng, self.m_session_mdl)),
+         sigmoidColorLookup
+         ),
       #('Genotype',       GenotypeIdx,),
       #('Lineage',        LineageIdx,),
     )