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

[baerb@myxo.css.msu.edu]

Author: baerb
Date: 2005-07-05 16:05:52 -0400 (Tue, 05 Jul 2005)
New Revision: 224

Modified:
   trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py
   trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
   trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
Log:
Some minor changes on the way to getting session restart to work.

Cosmetic changes to code (delete some blank lines, breaking lines at 
80 characters, etc.)



Modified: trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py	2005-07-01 19:16:44 UTC (rev 223)
+++ trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py	2005-07-05 20:05:52 UTC (rev 224)
@@ -61,7 +61,7 @@
     self.m_session_mdl.m_session_mdtr.emit(
       PYSIGNAL("fromLiveCtrlStartAvidaSig"), ())
 
-  def destruct(self):
+  def restart(self):
     print "*** called pyLiveControlsCtrl.py:destruct ***"
     self.m_avida = None
     self.disconnect(
@@ -81,3 +81,4 @@
       self.clickedPauseAvidaSlot)
     self.m_session_mdl = None
 
+    

Modified: trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2005-07-01 19:16:44 UTC (rev 223)
+++ trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2005-07-05 20:05:52 UTC (rev 224)
@@ -185,7 +185,7 @@
     self.m_avida.destruct()
     self.m_petri_dish_ctrl.destruct()
     self.m_gradient_scale_ctrl.destruct()
-    self.m_live_controls_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"),
@@ -211,5 +211,6 @@
     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/pyPetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-07-01 19:16:44 UTC (rev 223)
+++ trunk/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-07-05 20:05:52 UTC (rev 224)
@@ -56,12 +56,14 @@
     self.m_target_dish_scaling = 5.
     self.m_map_cell_width = 5
 
-    self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"), self.setAvidaSlot)
-    self.connect( self.m_canvas_view, PYSIGNAL("orgClickedOnSig"), self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"))
-    self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"),
-      self.updateOrgClickedOutlineCellNumberSlot)
-    self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"),
-      self.setDragSlot)
+    self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"), 
+      self.setAvidaSlot)
+    self.connect( self.m_canvas_view, PYSIGNAL("orgClickedOnSig"), 
+      self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"))
+    self.connect( self.m_session_mdl.m_session_mdtr, 
+      PYSIGNAL("orgClickedOnSig"), self.updateOrgClickedOutlineCellNumberSlot)
+    self.connect( self.m_session_mdl.m_session_mdtr, 
+      PYSIGNAL("orgClickedOnSig"), self.setDragSlot)
 
   def destruct(self):
     self.m_avida = None
@@ -117,7 +119,8 @@
     self.emit(PYSIGNAL("zoomSig"), (self.m_initial_target_zoom,))
 
     if self.m_canvas: del self.m_canvas
-    self.m_canvas = QCanvas(self.m_map_cell_width * self.m_world_w, self.m_map_cell_width * self.m_world_h)
+    self.m_canvas = QCanvas(self.m_map_cell_width * self.m_world_w, 
+      self.m_map_cell_width * self.m_world_h)
     self.m_canvas.setBackgroundColor(Qt.darkGray)
     self.m_canvas_view.setCanvas(self.m_canvas)
 
@@ -142,8 +145,7 @@
     self.m_changed_cell_items = self.m_cell_info[:]
     self.updateCellItems(True)
 
-  def setDragSlot(self, org_clicked_on_item):
-    print "here"
+  def setDragSlot(self, org_clicked_on_item = None):
     if org_clicked_on_item:
       clicked_cell_num = org_clicked_on_item.m_population_cell.GetID()
       clicked_cell = self.m_avida.m_population.GetCell(int(clicked_cell_num))
@@ -153,9 +155,6 @@
       dragHolder = self.itemDrag( ('organism.' + str(organism.GetGenome().AsString())), self )
       dragHolder.dragCopy()
 
-
-
-
   def setRange(self, min, max):
     self.m_cs_min_value = min
     self.m_cs_value_range = max - min