[Openautomation-svn] SF.net SVN: openautomation:[272] PyWireGate/trunk/logic_editor

[<ma...@us...>]

Revision: 272
          http://openautomation.svn.sourceforge.net/openautomation/?rev=272&view=rev
Author:   mayerch
Date:     2011-01-30 15:19:36 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
* Bug fix: resize of masked blockes that were using an arc
* resized gain and sum block

Modified Paths:
--------------
    PyWireGate/trunk/logic_editor/backendCommunication.js
    PyWireGate/trunk/logic_editor/gle/gle.block.js

Modified: PyWireGate/trunk/logic_editor/backendCommunication.js
===================================================================
--- PyWireGate/trunk/logic_editor/backendCommunication.js	2011-01-23 21:17:35 UTC (rev 271)
+++ PyWireGate/trunk/logic_editor/backendCommunication.js	2011-01-30 15:19:36 UTC (rev 272)
@@ -86,8 +86,8 @@
   },
   'mathLib': {
     'gain': {
-      'width': 100,
-      'height': 100,
+      'width': 75,
+      'height': 75,
       'rotation': 0,
       'flip': false,
       'color': [0.0, 0.0, 0.0],
@@ -121,8 +121,8 @@
       ]
     },
     'sum': {
-      'width': 100,
-      'height': 100,
+      'width': 50,
+      'height': 50,
       'rotation': 0,
       'flip': false,
       'color': [0.0, 0.0, 0.0],
@@ -130,7 +130,7 @@
       'mask': [
       { 'type': 'move', 'x': 0    , 'y': 0.495  }, 
       { 'type': 'arc' , 'x': 0    , 'y': 0.01   , 
-        'rx': 50, 'ry': 50, 'xRotate':0, 'large':true, 'clockwise': true,
+        'rx': 0.5, 'ry': 0.5, 'xRotate':0, 'large':true, 'clockwise': true,
         'relative': true
       },
       { 'type': 'close' }

Modified: PyWireGate/trunk/logic_editor/gle/gle.block.js
===================================================================
--- PyWireGate/trunk/logic_editor/gle/gle.block.js	2011-01-23 21:17:35 UTC (rev 271)
+++ PyWireGate/trunk/logic_editor/gle/gle.block.js	2011-01-30 15:19:36 UTC (rev 272)
@@ -101,7 +101,9 @@
             break;
             
           case 'arc':
-            path.arc( obj.rx, obj.ry, obj.xRotate, obj.large, obj.clockwise, sx, sy, obj.relative );
+            var rx = scaleRelPos( obj.rx, width  ); 
+            var ry = scaleRelPos( obj.ry, height ); 
+            path.arc( rx, ry, obj.xRotate, obj.large, obj.clockwise, sx, sy, obj.relative );
             break;
             
           case 'close':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.