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

[baerb@myxo.css.msu.edu]

Author: baerb
Date: 2006-05-30 11:48:19 -0400 (Tue, 30 May 2006)
New Revision: 721

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
Log:

Code to support having *default.empty and *ancestor.organism instead
of default.empty and default.organism.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py	2006-05-30 15:46:07 UTC (rev 720)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py	2006-05-30 15:48:19 UTC (rev 721)
@@ -90,7 +90,7 @@
     lines = lines + ["genesis.default", "EVENT_FILE events.cfg             # File containing list of events during run"]
     lines = lines + ["genesis.default", "ANALYZE_FILE analyze.cfg          # File used for analysis mode"]
     lines = lines + ["genesis.default", "ENVIRONMENT_FILE environment.cfg  # File that describes the environment"]
-    lines = lines + ["genesis.default", "# START_CREATURE default.organism   # Organism to seed the soup"]
+    lines = lines + ["genesis.default", "# START_CREATURE *ancestor.organism   # Organism to seed the soup"]
     lines = lines + ["genesis.default", ""]
     lines = lines + ["genesis.default", "### Reproduction ###"]
     lines = lines + ["genesis.default", "BIRTH_METHOD 4    # 0 = Replace random organism in neighborhood"]
@@ -280,17 +280,17 @@
     lines = lines + ["inst_set.default", ""]
     lines = lines + ["inst_set.default", "# Search with no template returns current position (abs line number) in"]
     lines = lines + ["inst_set.default", "# genome."]
-    lines = lines + ["freezer/default.empty", "*SETTINGS"]
-    lines = lines + ["freezer/default.empty", "RANDOM_SEED 0"]
-    lines = lines + ["freezer/default.empty", "DEATH_METHOD 2"]
-    lines = lines + ["freezer/default.empty", "COPY_MUT_PROB 0.03"]
-    lines = lines + ["freezer/default.empty", "WORLD-X 30"]
-    lines = lines + ["freezer/default.empty", "WORLD-Y 30"]
-    lines = lines + ["freezer/default.empty", "BIRTH_METHOD 0"]
-    lines = lines + ["freezer/default.empty", "START_CREATURE0 default"]
-    lines = lines + ["freezer/default.empty", "AGE_LIMIT 100"]
-    lines = lines + ["freezer/default.empty", "MAX_UPDATES -1"]
-    lines = lines + ["freezer/default.organism", "rucavcqgfcqapqcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccutycasvab"]
+    lines = lines + ["freezer/*default.empty", "*SETTINGS"]
+    lines = lines + ["freezer/*default.empty", "RANDOM_SEED 0"]
+    lines = lines + ["freezer/*default.empty", "DEATH_METHOD 2"]
+    lines = lines + ["freezer/*default.empty", "COPY_MUT_PROB 0.03"]
+    lines = lines + ["freezer/*default.empty", "WORLD-X 30"]
+    lines = lines + ["freezer/*default.empty", "WORLD-Y 30"]
+    lines = lines + ["freezer/*default.empty", "BIRTH_METHOD 0"]
+    lines = lines + ["freezer/*default.empty", "START_CREATURE0 default"]
+    lines = lines + ["freezer/*default.empty", "AGE_LIMIT 100"]
+    lines = lines + ["freezer/*default.empty", "MAX_UPDATES -1"]
+    lines = lines + ["freezer/*ancestor.organism", "rucavcqgfcqapqcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccutycasvab"]
     out_lines = []
     num_lines = len(lines)/2
     for line_num in range(num_lines):

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui	2006-05-30 15:46:07 UTC (rev 720)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui	2006-05-30 15:48:19 UTC (rev 721)
@@ -313,7 +313,7 @@
                 <widget class="QComboBox">
                     <item>
                         <property name="text">
-                            <string>default</string>
+                            <string>*ancestor</string>
                         </property>
                     </item>
                     <property name="name">
@@ -333,7 +333,7 @@
                         <number>0</number>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>The name of the organism(s) that will start the population on an empty petri dish (normally dragged in)</string>
+                        <string>&lt;P&gt;The name of the organism(s) that will start the population on an empty petri dish (normally dragged in)&lt;/p&gt;</string>
                     </property>
                 </widget>
             </vbox>