[Avida-cvs] [Avida2-svn] r133 - branches/developers/kaben-organism-scope/source/python/AvidaGui2

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2005-04-09 01:49:12 -0400 (Sat, 09 Apr 2005)
New Revision: 133

Modified:
   branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriDishCtrl.py
   branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPopulationCellItem.py
Log:

* Gave petri dish black grid lines instead of white.



Modified: branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-04-09 01:47:33 UTC (rev 132)
+++ branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-04-09 05:49:12 UTC (rev 133)
@@ -10,8 +10,8 @@
 from AvidaCore import cConfig
 
 from math import exp
-from qt import Qt, QWidget, QSize, QVBoxLayout, QLayout, QColor, QWMatrix, PYSIGNAL
-from qtcanvas import QCanvas
+from qt import PYSIGNAL, QBrush, QColor, QLayout, QPen, QSize, Qt, QVBoxLayout, QWidget, QWMatrix
+from qtcanvas import QCanvas, QCanvasRectangle
 from pyPetriCanvasView import pyPetriCanvasView
 from pyPopulationCellItem import pyPopulationCellItem
 #from pyPetriDishView import pyPetriDishView
@@ -39,6 +39,7 @@
     self.m_changed_cell_items = []
     self.m_indexer = None
     self.m_color_lookup_functor = None
+    self.m_background_rect = None
 
     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"))
@@ -62,7 +63,14 @@
 
     if self.m_canvas: del self.m_canvas
     self.m_canvas = QCanvas(self.m_map_cell_w * world_w, self.m_map_cell_h * world_h)
+    self.m_canvas.setBackgroundColor(Qt.darkGray)
     self.m_canvas_view.setCanvas(self.m_canvas)
+    if self.m_background_rect: del self.m_background_rect
+    self.m_background_rect = QCanvasRectangle(0, 0, self.m_map_cell_w * world_w, self.m_map_cell_h * world_h, self.m_canvas)
+    self.m_background_rect.setBrush(QBrush(Qt.black))
+    self.m_background_rect.setPen(QPen(Qt.black))
+    self.m_background_rect.show()
+    self.m_background_rect.setZ(0.0)
 
     if self.m_cell_info: del self.m_cell_info
     self.m_cell_info = [pyPopulationCellItem(

Modified: branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPopulationCellItem.py
===================================================================
--- branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPopulationCellItem.py	2005-04-09 01:47:33 UTC (rev 132)
+++ branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPopulationCellItem.py	2005-04-09 05:49:12 UTC (rev 133)
@@ -5,6 +5,7 @@
 class pyPopulationCellItem(QCanvasRectangle):
 
   s_empty_color = QColor(Qt.black)
+  s_null_pen = QPen(Qt.NoPen)
 
   def rtti(self):
     return 271828
@@ -14,6 +15,8 @@
     self.m_population_cell = population_cell
     self.m_index = 0
     self.show()
+    self.setZ(1.0 + population_cell.GetID())
+    self.setPen(self.s_null_pen)
 
   def checkNormalizedIndexUsingFunctor(self, functor, min, range):
     index = 1.0
@@ -30,5 +33,4 @@
   def updateColorUsingFunctor(self, functor):
     color = (self.m_population_cell.IsOccupied() and functor) and functor(self.m_index) or self.s_empty_color
     self.setBrush(QBrush(color))
-    self.setPen(QPen(color))