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

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2005-04-15 04:11:20 -0400 (Fri, 15 Apr 2005)
New Revision: 148

Modified:
   trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
   trunk/source/python/AvidaGui2/pyPetriCanvasView.py
Log:

* Bugfix : "Org. Clicked on Report" had stopped reporting empty cells.



Modified: trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py	2005-04-15 07:38:43 UTC (rev 147)
+++ trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py	2005-04-15 08:11:20 UTC (rev 148)
@@ -18,7 +18,7 @@
     self.connect(
       self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"),
       self.updateOrgReportSlot)
-    self.clickedCellNumber = -99
+    self.m_clicked_cell_number = -99
 
   def setAvidaSlot(self, avida):
     old_avida = self.m_avida
@@ -137,21 +137,15 @@
 #      self.m_num_equals.setText(QString("no"))
     self.m_num_equals.setText(num_equals)
     
-    if self.clickedCellNumber>= 0: 
-      self.updateOrgReportSlot(self.clickedCellNumber)
+    if self.m_clicked_cell_number>= 0: 
+      self.updateOrgReportSlot(self.m_clicked_cell_number)
 
 
 
-  def updateOrgReportSlot(self, clickedCellNum):
-  
-    self.clickedCellNumber = clickedCellNum
-    
-    clickedCell = self.m_avida.m_population.GetCell(int(clickedCellNum))
+  def updateOrgReportSlot(self, clicked_cell_num):
 
-#    print "clickedCell.IsOccupied() returns " 
-#    print clickedCell.IsOccupied()
-
-    if not clickedCell.IsOccupied():
+    self.m_clicked_cell_number = clicked_cell_num
+    if clicked_cell_num is None or not self.m_avida.m_population.GetCell(int(clicked_cell_num)).IsOccupied():
       #PAINT the stats fields empty
       self.m_org_name.setText('empty cell')
       self.m_org_fitness.setText('-')
@@ -160,8 +154,14 @@
       self.m_org_gestation_time.setText('-')
       self.m_org_age.setText('-')
       return
+
+    clicked_cell = self.m_avida.m_population.GetCell(int(clicked_cell_num))
+
+#    print "clicked_cell.IsOccupied() returns " 
+#    print clicked_cell.IsOccupied()
+
  
-    organism = clickedCell.GetOrganism()
+    organism = clicked_cell.GetOrganism()
     phenotype = organism.GetPhenotype()
     genotype = organism.GetGenotype()
 

Modified: trunk/source/python/AvidaGui2/pyPetriCanvasView.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriCanvasView.py	2005-04-15 07:38:43 UTC (rev 147)
+++ trunk/source/python/AvidaGui2/pyPetriCanvasView.py	2005-04-15 08:11:20 UTC (rev 148)
@@ -7,10 +7,12 @@
     QCanvasView.__init__(self,parent,name,f)
   def contentsMousePressEvent(self,e): # QMouseEvent e
     if e.button() != Qt.LeftButton: return
+    cell_id = None
     point = self.inverseWorldMatrix().map(e.pos())
     if self.canvas():
       ilist = self.canvas().collisions(point) #QCanvasItemList ilist
       for item in ilist:
         if item.rtti()==271828:
-          self.emit(PYSIGNAL("orgClickedOnSig"), (item.m_population_cell.GetID(),))
+          cell_id = item.m_population_cell.GetID()
+      self.emit(PYSIGNAL("orgClickedOnSig"), (cell_id,))