[Avida-cvs] [Avida2-svn] r227 - trunk/source/python/AvidaGui2

[baerb@myxo.css.msu.edu]

Author: baerb
Date: 2005-07-08 14:32:22 -0400 (Fri, 08 Jul 2005)
New Revision: 227

Modified:
   trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py
   trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
   trunk/source/python/AvidaGui2/pyOrganismScopeCtrl.py
   trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py
Log:
Changed the format of the .organism files so that they are one line genome



Modified: trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py	2005-07-06 00:33:47 UTC (rev 226)
+++ trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py	2005-07-08 18:32:22 UTC (rev 227)
@@ -62,7 +62,7 @@
       PYSIGNAL("fromLiveCtrlStartAvidaSig"), ())
 
   def restart(self):
-    print "*** called pyLiveControlsCtrl.py:destruct ***"
+    print "*** called pyLiveControlsCtrl.py:restart ***"
     self.m_avida = None
     self.disconnect(
       self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"),
@@ -81,4 +81,3 @@
       self.clickedPauseAvidaSlot)
     self.m_session_mdl = None
 
-    

Modified: trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2005-07-06 00:33:47 UTC (rev 226)
+++ trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2005-07-08 18:32:22 UTC (rev 227)
@@ -48,7 +48,6 @@
        self.modeActivatedSlot)
     self.connect(self.m_session_mdl.m_session_mdtr, 
       PYSIGNAL("petriDishDroppedInPopViewSig"), self.petriDropped)  
-
     print "*** pyOnePop_PetriDishCtrl.py:consruct about to call m_mode_combobox.clear ***"
     self.m_mode_combobox.clear()
     print "*** pyOnePop_PetriDishCtrl.py:consruct about to call m_mode_combobox.setInsertionPolicy ***"

Modified: trunk/source/python/AvidaGui2/pyOrganismScopeCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOrganismScopeCtrl.py	2005-07-06 00:33:47 UTC (rev 226)
+++ trunk/source/python/AvidaGui2/pyOrganismScopeCtrl.py	2005-07-08 18:32:22 UTC (rev 227)
@@ -78,7 +78,12 @@
     print "pyOrganismScopeCtrl.setDebugOrganismFileSlot"
     if self.m_avida:
       inst_set = self.m_avida.m_environment.GetInstSet()
-      genome = cGenome(cInstUtil.LoadGenome(cString(organism_filename.ascii()), inst_set) )
+      org_file = open(organism_filename.ascii())
+      org_string = org_file.readline()
+      org_string = org_string.rstrip()
+      org_string = org_string.lstrip()
+      org_file.close
+      genome = cGenome(cString(org_string))
       analyze_genotype = cAnalyzeGenotype(genome, inst_set)
       hardware_tracer = pyHardwareTracer()
       hardware_tracer.traceAnalyzeGenotype(analyze_genotype, self.m_avida.m_environment, should_use_resources = False)

Modified: trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py
===================================================================
--- trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py	2005-07-06 00:33:47 UTC (rev 226)
+++ trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py	2005-07-08 18:32:22 UTC (rev 227)
@@ -28,13 +28,21 @@
       if settings_dict.has_key("START_CREATURE"):
         world_x = settings_dict["WORLD-X"]
         world_y = settings_dict["WORLD-Y"]
-        self.start_cell_location = int(((world_y/2) * world_x) +(world_x/2))
+        self.start_cell_location = int(((world_y/2) * world_x) + (world_x/2))
         cells_dict[str(self.start_cell_location)] = str(1)
-        tmp_inst_set = pyInstructionSet.pyInstructionSet(os.path.join(workspace_dir, "inst_set.default"))
-        org_string = tmp_inst_set.OrgFile2LetterString(os.path.join(freeze_dir, settings_dict["START_CREATURE"]))
+
+        # Read the genome from the organism file 
+
+        org_file = open(os.path.join(freeze_dir, settings_dict["START_CREATURE"]))
+        org_string = org_file.readline()
+        org_string = org_string.rstrip()
+        org_string = org_string.lstrip()
+        org_file.close
         organisms_dict[str(1)] = org_string
-    self.modifyEventFile(cells_dict, organisms_dict, os.path.join(tmp_in_dir, "events.cfg"), tmp_out_dir)
+    self.modifyEventFile(cells_dict, organisms_dict, 
+      os.path.join(tmp_in_dir, "events.cfg"), tmp_out_dir)
     
+    shutil.copyfile(os.path.join(workspace_dir, "organism.default"), os.path.join(tmp_in_dir, "organism.default"))
     shutil.copyfile(os.path.join(workspace_dir, "environment.default"), os.path.join(tmp_in_dir, "environment.cfg"))
     shutil.copyfile(os.path.join(workspace_dir, "inst_set.default"), os.path.join(tmp_in_dir, "inst_set.default"))