[Avida-cvs] [avida-svn] r1005 - branches/developers/avida-edward/source/python/AvidaGui2

[avidaedward at myxo.css.msu.edu]

Author: avidaedward
Date: 2006-09-27 14:37:48 -0400 (Wed, 27 Sep 2006)
New Revision: 1005

Added:
   branches/developers/avida-edward/source/python/AvidaGui2/pyStdTaskDescriptionCtrl.py
Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeView2.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyTaskDescriptionCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py
Log:

Updated task descriptions in organism viewer to 3-letter capitalized
form.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py	2006-09-27 16:39:56 UTC (rev 1004)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py	2006-09-27 18:37:48 UTC (rev 1005)
@@ -1,7 +1,7 @@
 from pyBufferCtrl import pyBufferCtrl
 from pyInstructionDescriptionCtrl import pyInstructionDescriptionCtrl
 from pyTaskDataCtrl import pyTaskDataCtrl
-from pyTaskDescriptionCtrl import pyTaskDescriptionCtrl
+from pyStdTaskDescriptionCtrl import pyStdTaskDescriptionCtrl
 from pyHideShowCtrl import pyHideShowCtrl
 from descr import descr
 from qt import *
@@ -40,7 +40,7 @@
   parent.updateMinWidth(inst_descr.maximumWidth())
   return inst_descr
 def taskDescrSetup(parent, layout, name):
-  task_descr = pyTaskDescriptionCtrl(parent.getSubwidget(), name)
+  task_descr = pyStdTaskDescriptionCtrl(parent.getSubwidget(), name)
   layout.addWidget(task_descr)
   parent.updateMinWidth(task_descr.maximumWidth())
   return task_descr

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeView2.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeView2.py	2006-09-27 16:39:56 UTC (rev 1004)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeView2.py	2006-09-27 18:37:48 UTC (rev 1005)
@@ -494,6 +494,7 @@
 
       if self.m_current_frame_number >= (self.m_frames.m_gestation_time - 1) and self.m_frames.m_is_viable:
         self.m_child_circle.setCenterX(self.m_child_circle.centerX() + 2 * self.m_instruction_spot_radius)
+        self.m_child_circle.setOTheta(self.m_child_circle.oTheta() + math.pi)
 
       ###
       muts_item_idx = 0

Added: branches/developers/avida-edward/source/python/AvidaGui2/pyStdTaskDescriptionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyStdTaskDescriptionCtrl.py	2006-09-27 16:39:56 UTC (rev 1004)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyStdTaskDescriptionCtrl.py	2006-09-27 18:37:48 UTC (rev 1005)
@@ -0,0 +1,20 @@
+from descr import descr
+
+from pyTaskDescriptionCtrl import pyTaskDescriptionCtrl
+
+class pyStdTaskDescriptionCtrl(pyTaskDescriptionCtrl):
+  def __init__(self,parent = None,name = None,fl = 0):
+    pyTaskDescriptionCtrl.__init__(self,parent,name,fl)
+
+    self.m_task_renamings = {
+      'not':'Not',
+      'nand':'Nan',
+      'and':'And',
+      'orn':'Orn',
+      'or':'Oro',
+      'andn':'Ant',
+      'nor':'Nor',
+      'xor':'Xor',
+      'equ':'Equ',
+    }
+

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyTaskDescriptionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyTaskDescriptionCtrl.py	2006-09-27 16:39:56 UTC (rev 1004)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyTaskDescriptionCtrl.py	2006-09-27 18:37:48 UTC (rev 1005)
@@ -35,6 +35,10 @@
       task_num = self.read_fn(frames, frame_no)
       task_name = frames.m_task_names[task_num]
       task_text = '%s' % task_name
+
+      if hasattr(self, 'm_task_renamings'):
+        task_text = self.m_task_renamings[task_text]
+
       tasks_frame = frames.m_tasks_info[frame_no]
       task_count = tasks_frame[task_num]
       self.setFont(task_count > 0 and self.bold_font or self.normal_font)

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py	2006-09-27 16:39:56 UTC (rev 1004)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py	2006-09-27 18:37:48 UTC (rev 1005)
@@ -49,6 +49,8 @@
   "AvidaGui2.pyQuitDialogCtrl",
   "AvidaGui2.pyRightClickDialogView",
   "AvidaGui2.pyRightClickDialogCtrl",
+  "AvidaGui2.pyStdTaskDescriptionCtrl",
+  "AvidaGui2.pyTaskDescriptionCtrl",
 
   "AvidaGui2.pyAnalyzeControlsView",
   "AvidaGui2.pyAnalyzeControlsCtrl",
@@ -98,7 +100,6 @@
   "AvidaGui2.pyPetriDishCtrl",
   "AvidaGui2.pyPopulationCellItem",
   "AvidaGui2.pyReadFreezer",
-  "AvidaGui2.pyTaskDescriptionCtrl",
   "AvidaGui2.pyTimeline",
   "AvidaGui2.pyTimelineView",
   "AvidaGui2.pyTimelineCtrl",