[Avida-cvs] [Avida2-svn] r228 - trunk/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Tue Jul 12 07:59:19 PDT 2005
Author: baerb
Date: 2005-07-12 10:59:19 -0400 (Tue, 12 Jul 2005)
New Revision: 228
Modified:
trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py
trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
trunk/source/python/AvidaGui2/pyReadFreezer.py
trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py
Log:
Restart "works". If you drag or double click a new population the program will
start running the original run from the beginning.
Corrected a small problem in pyWriteGenesisEvent introduced when fixing the
file formats.
Modified: trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2005-07-08 18:32:22 UTC (rev 227)
+++ trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2005-07-12 14:59:19 UTC (rev 228)
@@ -181,35 +181,34 @@
print "pyOnePop_PetriDishCtrl.py:restart called"
self.dishDisabled = False
- self.m_avida.destruct()
- self.m_petri_dish_ctrl.destruct()
- self.m_gradient_scale_ctrl.destruct()
- self.m_live_controls_ctrl.restart()
- self.m_petri_configure_ctrl.destruct()
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("freezeDishPhaseISig"),
- self.m_petri_dish_ctrl.extractPopulationSlot)
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("freezeDishPhaseISig"), self.freezeDishPhaseISlot)
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("setAvidaSig"), self.setAvidaSlot)
- self.disconnect(self.m_petri_dish_toggle, SIGNAL("clicked()"),
- self.ToggleDishSlot)
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("doDefrostDishSig"), self.shouldIDefrost)
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("doDisablePetriDishSig"), self.SetDishDisabledSlot)
- self.disconnect(self.m_zoom_spinbox, SIGNAL("valueChanged(int)"),
- self.m_petri_dish_ctrl.zoomSlot)
- self.disconnect(self.m_petri_dish_ctrl, PYSIGNAL("zoomSig"),
- self.m_zoom_spinbox.setValue)
- self.disconnect(self.m_mode_combobox, SIGNAL("activated(int)"),
- self.modeActivatedSlot)
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("petriDishDroppedInPopViewSig"), self.petriDropped)
- self.m_mode_index = None
- self.m_session_mdl = None
- self.m_avida = None
- self.m_update_label.setText(" ")
- print "*** pyOnePop_PetriDishCtrl.py:restartPopulationSlot about to call se.f.construct ***"
- self.construct(session_mdl)
+ # self.m_petri_dish_ctrl.restart()
+ # self.m_gradient_scale_ctrl.destruct()
+ # self.m_live_controls_ctrl.restart()
+ # self.m_petri_configure_ctrl.destruct()
+ # self.disconnect(self.m_session_mdl.m_session_mdtr,
+ # PYSIGNAL("freezeDishPhaseISig"),
+ # self.m_petri_dish_ctrl.extractPopulationSlot)
+ # self.disconnect(self.m_session_mdl.m_session_mdtr,
+ # PYSIGNAL("freezeDishPhaseISig"), self.freezeDishPhaseISlot)
+ # self.disconnect(self.m_session_mdl.m_session_mdtr,
+ # PYSIGNAL("setAvidaSig"), self.setAvidaSlot)
+ # self.disconnect(self.m_petri_dish_toggle, SIGNAL("clicked()"),
+ # self.ToggleDishSlot)
+ # self.disconnect(self.m_session_mdl.m_session_mdtr,
+ # PYSIGNAL("doDefrostDishSig"), self.shouldIDefrost)
+ # self.disconnect(self.m_session_mdl.m_session_mdtr,
+ # PYSIGNAL("doDisablePetriDishSig"), self.SetDishDisabledSlot)
+ # self.disconnect(self.m_zoom_spinbox, SIGNAL("valueChanged(int)"),
+ # self.m_petri_dish_ctrl.zoomSlot)
+ # self.disconnect(self.m_petri_dish_ctrl, PYSIGNAL("zoomSig"),
+ # self.m_zoom_spinbox.setValue)
+ # self.disconnect(self.m_mode_combobox, SIGNAL("activated(int)"),
+ # self.modeActivatedSlot)
+ # self.disconnect(self.m_session_mdl.m_session_mdtr,
+ # PYSIGNAL("petriDishDroppedInPopViewSig"), self.petriDropped)
+ # self.m_mode_index = None
+ # self.m_session_mdl = None
+ # self.m_avida = None
+ self.m_update_label.setText("-")
+ # print "*** pyOnePop_PetriDishCtrl.py:restartPopulationSlot about to call se.f.construct ***"
+ # self.construct(session_mdl)
Modified: trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py 2005-07-08 18:32:22 UTC (rev 227)
+++ trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py 2005-07-12 14:59:19 UTC (rev 228)
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
+from pyAvida import pyAvida
from qt import *
from pyOnePopulationView import pyOnePopulationView
import os.path
@@ -47,7 +48,9 @@
self.m_one_pop_petri_dish_ctrl.restart(self.m_session_mdl)
self.m_one_pop_graph_ctrl.restart()
self.m_one_pop_stats_ctrl.restart()
- session_mdl.m_session_mdtr.emit(PYSIGNAL("doStartAvidaSig"), ())
+ self.m_session_mdl.m_session_mdtr.emit(
+ PYSIGNAL("doInitializeAvidaPhaseIISig"), (os.path.join(self.m_session_mdl.m_tempdir, "genesis.avida"),))
+ # session_mdl.m_session_mdtr.emit(PYSIGNAL("doStartAvidaSig"), ())
Modified: trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriDishCtrl.py 2005-07-08 18:32:22 UTC (rev 227)
+++ trunk/source/python/AvidaGui2/pyPetriDishCtrl.py 2005-07-12 14:59:19 UTC (rev 228)
@@ -65,26 +65,14 @@
self.connect( self.m_session_mdl.m_session_mdtr,
PYSIGNAL("orgClickedOnSig"), self.setDragSlot)
- def destruct(self):
- self.m_avida = None
- self.m_canvas = None
+ def restart(self):
self.m_cell_info = None
self.m_changed_cell_items = []
- self.m_indexer = None
self.m_color_lookup_functor = None
self.m_background_rect = None
self.m_change_list = None
self.m_org_clicked_on_item = None
self.m_occupied_cells_ids = []
- self.m_petri_dish_layout = None
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("setAvidaSig"), self.setAvidaSlot)
- self.disconnect(self.m_canvas_view, PYSIGNAL("orgClickedOnSig"),
- self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"))
- self.disconnect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("orgClickedOnSig"), self.updateOrgClickedOutlineCellNumberSlot)
- self.m_canvas_view = None
- self.m_session_mdl = None
def setColorLookupFunctor(self, color_lookup_functor):
self.m_color_lookup_functor = color_lookup_functor
Modified: trunk/source/python/AvidaGui2/pyReadFreezer.py
===================================================================
--- trunk/source/python/AvidaGui2/pyReadFreezer.py 2005-07-08 18:32:22 UTC (rev 227)
+++ trunk/source/python/AvidaGui2/pyReadFreezer.py 2005-07-12 14:59:19 UTC (rev 228)
@@ -10,6 +10,11 @@
freezefile = open(self.file_name)
lines = freezefile.readlines()
freezefile.close
+
+ # treat organism file differently (just one bare line)
+
+ if (in_file_name.endswith(".organism")):
+ pass
for line in lines:
comment_start = line.find("#")
if comment_start > -1:
Modified: trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py
===================================================================
--- trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py 2005-07-08 18:32:22 UTC (rev 227)
+++ trunk/source/python/AvidaGui2/pyWriteGenesisEvent.py 2005-07-12 14:59:19 UTC (rev 228)
@@ -42,7 +42,6 @@
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"))
More information about the Avida-cvs
mailing list