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

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2005-11-07 15:49:59 -0500 (Mon, 07 Nov 2005)
New Revision: 377

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


Modified: branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeView.py
===================================================================
--- branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeView.py	2005-11-07 17:27:01 UTC (rev 376)
+++ branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeView.py	2005-11-07 20:49:59 UTC (rev 377)
@@ -120,53 +120,53 @@
         ellipse.setSize(2*a.r, 2*a.r)
         ellipse.setZ(10.)
 
-    if hasattr(a, "legend_hack_ellipses"):
-      for item in a.legend_hack_ellipses: item.setCanvas(None)
-      del a.legend_hack_ellipses
-    if hasattr(a, "legend_hack_instructions"):
-      for item in a.legend_hack_instructions: item.setCanvas(None)
-      del a.legend_hack_instructions
+    #if hasattr(a, "legend_hack_ellipses"):
+    #  for item in a.legend_hack_ellipses: item.setCanvas(None)
+    #  del a.legend_hack_ellipses
+    #if hasattr(a, "legend_hack_instructions"):
+    #  for item in a.legend_hack_instructions: item.setCanvas(None)
+    #  del a.legend_hack_instructions
 
-    if a.ops_dict is not None:
-      l = len(a.ops_dict)
-      descr(l)
+    #if a.ops_dict is not None:
+    #  l = len(a.ops_dict)
+    #  descr(l)
 
-      a.legend_hack_ellipses = [QCanvasEllipse(a.canvas) for i in xrange(l)]
-      for ellipse in a.legend_hack_ellipses:
-        ellipse.setSize(2*a.r, 2*a.r)
-        ellipse.setZ(10.)
+    #  a.legend_hack_ellipses = [QCanvasEllipse(a.canvas) for i in xrange(l)]
+    #  for ellipse in a.legend_hack_ellipses:
+    #    ellipse.setSize(2*a.r, 2*a.r)
+    #    ellipse.setZ(10.)
 
-      a.legend_hack_instructions = [QCanvasText(a.canvas) for i in xrange(l)]
+    #  a.legend_hack_instructions = [QCanvasText(a.canvas) for i in xrange(l)]
 
-      a.legend_hack_e_x = 20
-      a.legend_hack_i_x = a.legend_hack_e_x + 3*a.r
-      a.legend_hack_y = 20
+    #  a.legend_hack_e_x = 20
+    #  a.legend_hack_i_x = a.legend_hack_e_x + 3*a.r
+    #  a.legend_hack_y = 20
 
-      for key in a.ops_dict.keys():
-        op_id = a.ops_dict[key]
-        instr_name = a.inst_names_dict[key]
-        descr(instr_name, (op_id * 360)/l)
+    #  for key in a.ops_dict.keys():
+    #    op_id = a.ops_dict[key]
+    #    instr_name = a.inst_names_dict[key]
+    #    descr(instr_name, (op_id * 360)/l)
 
-        ellipse = a.legend_hack_ellipses[op_id]
-        a.color.setHsv(
-          (op_id * 360)/l,
-          a.default_color_saturation,
-          a.default_color_value
-        )
-        ellipse.setBrush(QBrush(a.color))
-        ellipse.setX(a.legend_hack_e_x)
-        ellipse.setY(a.legend_hack_y)
-        ellipse.show()
+    #    ellipse = a.legend_hack_ellipses[op_id]
+    #    a.color.setHsv(
+    #      (op_id * 360)/l,
+    #      a.default_color_saturation,
+    #      a.default_color_value
+    #    )
+    #    ellipse.setBrush(QBrush(a.color))
+    #    ellipse.setX(a.legend_hack_e_x)
+    #    ellipse.setY(a.legend_hack_y)
+    #    ellipse.show()
 
-        instruction = a.legend_hack_instructions[op_id]
-        instruction.setTextFlags(Qt.AlignVCenter)
-        instruction.setFont(a.font)
-        instruction.setText(instr_name)
-        instruction.setX(a.legend_hack_i_x)
-        instruction.setY(a.legend_hack_y)
-        instruction.show()
+    #    instruction = a.legend_hack_instructions[op_id]
+    #    instruction.setTextFlags(Qt.AlignVCenter)
+    #    instruction.setFont(a.font)
+    #    instruction.setText(instr_name)
+    #    instruction.setX(a.legend_hack_i_x)
+    #    instruction.setY(a.legend_hack_y)
+    #    instruction.show()
 
-        a.legend_hack_y = a.legend_hack_y + 3*a.r
+    #    a.legend_hack_y = a.legend_hack_y + 3*a.r
 
   def _placeEllipses(self, circle_pts, rng):
     a = self.anim
@@ -312,22 +312,23 @@
   def __init__(self, anim):
     descr()
     self.anim = anim
+    self.buf_anim = bufAnimator(self.anim)
   def size(self):
     descr()
     if not self.anim.show_registers_flag:
       return 0, 0
   def setFrames(self, frames):
     descr()
-    if self.anim.show_hardware_flag and self.anim.show_registers_flag:
-      pass
-    else:
-      pass
+    #if self.anim.show_hardware_flag and self.anim.show_registers_flag:
+    #  pass
+    #else:
+    #  pass
   def showFrame(self, frame_number):
     descr()
-    if self.anim.show_hardware_flag and self.anim.show_registers_flag:
-      pass
-    else:
-      pass
+    #if self.anim.show_hardware_flag and self.anim.show_registers_flag:
+    #  pass
+    #else:
+    #  pass
 
 class stackAnimator:
   def __init__(self, anim):
@@ -383,11 +384,11 @@
 
   def setFrames(self, frames):
     descr()
-    #self.x = self.anim.layout_margin
-    #self.y = self.anim.layout_margin
-    #self.regs_anim.x = self.x
-    #self.regs_anim.y = self.y
-    #self.regs_anim.setFrames(frames)
+    self.x = self.anim.layout_margin
+    self.y = self.anim.layout_margin
+    self.regs_anim.x = self.x
+    self.regs_anim.y = self.y
+    self.regs_anim.setFrames(frames)
 
     #a = self.anim
 
@@ -402,7 +403,7 @@
 
   def showFrame(self, frame_number):
     descr()
-    #self.regs_anim.showFrame(frame_number)
+    self.regs_anim.showFrame(frame_number)
 
 class dataAnimator:
   def __init__(self, anim):