From 80d5dbe35e6c591376020e6a236daccf295262a7 Mon Sep 17 00:00:00 2001
From: nhydock <n_hydock@comcast.net>
Date: Thu, 9 Jun 2011 15:52:33 -0400
Subject: [PATCH] Fixes rects in ImageLayers and replace, now they update
 properly each call.

---
 src/Rockmeter.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Rockmeter.py b/src/Rockmeter.py
index 0ce664500..5e2a73e55 100644
--- a/src/Rockmeter.py
+++ b/src/Rockmeter.py
@@ -187,7 +187,6 @@ def __init__(self, stage, section, drawing):
     #these are the images that are drawn when the layer is visible
     self.drawing = self.engine.loadImgDrawing(self, None, drawing)
     self.rectexpr = self.getexpr("rect", "(0.0,1.0,0.0,1.0)")
-    self.rect = [float(i) for i in eval(self.rectexpr)]
                                     #how much of the image do you want rendered
                                     # (left, right, top, bottom)
                                     
@@ -197,7 +196,7 @@ def updateLayer(self, playerNum):
 
     super(ImageLayer, self).updateLayer(playerNum)
     
-    rect = self.rect = eval(self.rectexpr)
+    rect = self.rect = [float(i) for i in eval(self.rectexpr)]
     
     #all of this has to be repeated instead of using the base method
     #because now things can be calculated in relation to the image's properties
@@ -594,8 +593,8 @@ def __init__(self, layer, section):
       if not self.get("rect") == None:
         rects = self.getexprs("rect", separator="|")
         for rect in rects:
-          self.rects.append(eval(rect))
-      self.rects.append(eval(layer.rect))
+          self.rects.append(rect)
+      self.rects.append(layer.rectexpr)
       self.type = "image"
     elif isinstance(layer, FontLayer):
       self.font = self.engine.data.fontDict[self.get("font")]
@@ -637,7 +636,7 @@ def update(self):
           if len(self.drawings) > 1:
             self.layer.drawing = self.drawings[i]
           if len(self.rects) > 1:
-            self.layer.rect = self.rects[i]
+            self.layer.rect = [float(i) for i in eval(self.rects[i])]
           self.fixScale()
         return
     if self.type == "font":
@@ -646,7 +645,7 @@ def update(self):
       if len(self.drawings) > 0:
         self.layer.drawing = self.drawings[-1]
       if len(self.rects) > 0:
-        self.layer.rect = self.rects[-1]
+        self.layer.rect = [float(i) for i in eval(self.rects[-1])]
       self.fixScale()
             
 #effect that allows one to set the number of frames and