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

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2005-07-12 13:28:43 -0400 (Tue, 12 Jul 2005)
New Revision: 231

Modified:
   trunk/source/python/AvidaGui2/pyOrganismScopeView.py
Log:

Bug fix to organism view:
- viewer now displays instruction head jumps going to absurd places (as
  though they are really jumps to organism's end)



Modified: trunk/source/python/AvidaGui2/pyOrganismScopeView.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOrganismScopeView.py	2005-07-12 17:00:12 UTC (rev 230)
+++ trunk/source/python/AvidaGui2/pyOrganismScopeView.py	2005-07-12 17:28:43 UTC (rev 231)
@@ -281,8 +281,16 @@
             control_radii_ratio = 0.4 + 0.5 * pow(2., -float(self.m_frames.m_ihead_moves[i][2])/25)
             #control_radii_ratio = 0.4 + 0.5 * pow(2., -float((1 + self.m_frames.m_ihead_moves[i][2]))/8)
             point_array = QPointArray(3)
-            from_circle_pt = circle_pts[self.m_frames.m_ihead_moves[ihead_move_item][0]]
-            to_circle_pt = circle_pts[self.m_frames.m_ihead_moves[ihead_move_item][1]]
+            #from_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][0]]
+            #to_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][1]]
+            if len(circle_pts) > self.m_frames.m_ihead_moves[i][0]:
+              from_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][0]]
+            else:
+              from_circle_pt = circle_pts[-1]
+            if len(circle_pts) > self.m_frames.m_ihead_moves[i][1]:
+              to_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][1]]
+            else:
+              to_circle_pt = circle_pts[-1]
             point_array[0] = QPoint(
               self.m_circle_center_x + anchor_radii_ratio * (from_circle_pt[0] - self.m_circle_center_x),
               self.m_circle_center_y + anchor_radii_ratio * (from_circle_pt[1] - self.m_circle_center_y)
@@ -310,8 +318,16 @@
             control_radii_ratio = 0.4 + 0.5 * pow(2., -float(self.m_frames.m_ihead_moves[i][2])/25)
             #control_radii_ratio = 0.4 + 0.5 * pow(2., -float((1 + self.m_frames.m_ihead_moves[i][2]))/8)
             point_array = QPointArray(3)
-            from_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][0]]
-            to_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][1]]
+            #from_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][0]]
+            #to_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][1]]
+            if len(circle_pts) > self.m_frames.m_ihead_moves[i][0]:
+              from_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][0]]
+            else:
+              from_circle_pt = circle_pts[-1]
+            if len(circle_pts) > self.m_frames.m_ihead_moves[i][1]:
+              to_circle_pt = circle_pts[self.m_frames.m_ihead_moves[i][1]]
+            else:
+              to_circle_pt = circle_pts[-1]
             point_array.setPoint(0, QPoint(
               self.m_circle_center_x + anchor_radii_ratio * (from_circle_pt[0] - self.m_circle_center_x),
               self.m_circle_center_y + anchor_radii_ratio * (from_circle_pt[1] - self.m_circle_center_y)