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

[baerb at myxo.css.msu.edu]

Author: baerb
Date: 2005-04-07 16:16:21 -0400 (Thu, 07 Apr 2005)
New Revision: 125

Modified:
   trunk/source/python/AvidaGui2/pyEduMainCtrl.py
   trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
   trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py
   trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
Log:
Minor Code Cleanup



Modified: trunk/source/python/AvidaGui2/pyEduMainCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyEduMainCtrl.py	2005-04-06 20:07:35 UTC (rev 124)
+++ trunk/source/python/AvidaGui2/pyEduMainCtrl.py	2005-04-07 20:16:21 UTC (rev 125)
@@ -40,14 +40,6 @@
 
     self.m_main_mdl.m_main_mdtr.m_main_controller_factory_mdtr.emit(
       qt.PYSIGNAL("newMainControllerSig"), ("pyEduMainMenuBarHdlr",))
-      
-    # Very crude fix get graphs to show correctly
-    
-    if os.path.exists("./average.dat"):
-      os.remove("./average.dat")
-    if os.path.exists("./count.dat"):
-      os.remove("./count.dat")
-    
     return self
     
   def unitTest(self, recurse = False):

Modified: trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2005-04-06 20:07:35 UTC (rev 124)
+++ trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2005-04-07 20:16:21 UTC (rev 125)
@@ -276,4 +276,6 @@
     quit_return = m_quit_avida_ed.showDialog()
     if quit_return == m_quit_avida_ed.QuitFlag:
       self.emit(PYSIGNAL("quitAvidaPhaseIISig"), ())
+    elif quit_return == m_quit_avida_ed.FreezeQuitFlag:
+      self.emit(PYSIGNAL("FreezeDishPhaseISig"), ())
 

Modified: trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py	2005-04-06 20:07:35 UTC (rev 124)
+++ trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py	2005-04-07 20:16:21 UTC (rev 125)
@@ -215,7 +215,7 @@
       settings_dict["DEATH_METHOD"] = 2
     return settings_dict
     
-  def FreezePetriSlot(self, freeze_dir = None, population_dict = None, 
+  def FreezePetriSlot(self, population_dict = None, 
       send_reset_signal = False, send_quit_signal = False):
     tmp_dict = {}
     tmp_dict["SETTINGS"] = self.Form2Dictionary()
@@ -229,5 +229,10 @@
     freezer_file = pyWriteToFreezer(tmp_dict, is_empty_dish, file_name)
     self.m_session_mdl.m_session_mdtr.emit(
       PYSIGNAL("doRefreshFreezerInventory"), ())
+    if send_reset_signal:
+      pass
+    if send_quit_signal:
+      pass
+      
 
     
\ No newline at end of file

Modified: trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-04-06 20:07:35 UTC (rev 124)
+++ trunk/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-04-07 20:16:21 UTC (rev 125)
@@ -235,7 +235,7 @@
             organism = cell.GetOrganism()
             genome = organism.GetGenome()
             population_dict[cell.GetID()] = str(genome.AsString())
-    self.emit(PYSIGNAL("freezeDishPhaseIISig"), ("/freezer", population_dict, ))
+    self.emit(PYSIGNAL("freezeDishPhaseIISig"), (population_dict, ))
 
   def zoomSlot(self, zoom_factor):
     #print "pyPetriDishCtrl.zoomSlot zoom_factor", zoom_factor