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

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

Revision: 251
          http://openautomation.svn.sourceforge.net/openautomation/?rev=251&view=rev
Author:   mayerch
Date:     2011-01-16 11:51:06 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Correctly handle a scrolled working pane by using the new universal getCoordinate

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

Modified: PyWireGate/trunk/logic_editor/gle/gle.block.js
===================================================================
--- PyWireGate/trunk/logic_editor/gle/gle.block.js	2011-01-15 22:38:32 UTC (rev 250)
+++ PyWireGate/trunk/logic_editor/gle/gle.block.js	2011-01-16 11:51:06 UTC (rev 251)
@@ -335,10 +335,8 @@
   
   function editorConnectionPointMouseMove( event )
   {
-    //console.log( event.data.con );
-    var x = event.pageX - $('#editor')[0].offsetLeft;
-    var y = event.pageY - $('#editor')[0].offsetTop;
-    event.data.con.lastMove( [x, y] );
+    var c = getCoordinate( event );
+    event.data.con.lastMove( [c.x, c.y] );
   }
   
   function editorConnectionPointMouseUp( event )
@@ -364,11 +362,10 @@
         number: event.data.portNumber
       };
     } else {
-      var ex = event.pageX - $('#editor')[0].offsetLeft;
-      var ey = event.pageY - $('#editor')[0].offsetTop;
+      var c = getCoordinate( event );
       var distance = function( pos )
       {
-        return (ex-pos[0])*(ex-pos[0]) + (ey-pos[1])*(ey-pos[1]);
+        return (c.x-pos[0])*(c.x-pos[0]) + (c.y-pos[1])*(c.y-pos[1]);
       }
       if( connectionLookingForInPort )
       {

Modified: PyWireGate/trunk/logic_editor/logicEditor.js
===================================================================
--- PyWireGate/trunk/logic_editor/logicEditor.js	2011-01-15 22:38:32 UTC (rev 250)
+++ PyWireGate/trunk/logic_editor/logicEditor.js	2011-01-16 11:51:06 UTC (rev 251)
@@ -143,11 +143,9 @@
 {
   if( ui.draggable.data('element') )
   {
-    var svg = $('#editor').svg('get');
-    var x = ui.position.left - this.offsetLeft;
-    var y = ui.position.top  - this.offsetTop ;
-    var data = $.extend( true, {x:x, y:y}, ui.draggable.data('element') );
-    drawElement( svg, data );
+    var c = getCoordinate( {pageX: ui.position.left, pageY: ui.position.top} );
+    var data = $.extend( true, c, ui.draggable.data('element') );
+    drawElement( $('#editor').svg('get'), data );
   }
 }
 
@@ -162,10 +160,11 @@
 jQuery(document).ready(function(){
   getCoordinate = (function()
   {
-    var svg = $('#editor svg'); // quasi static variable
+    var editor = $('#editor');  // quasi static variable
     return function( event ) {
-      var o = svg.offset();
-      return {x: event.pageX - o.left, y: event.pageY - o.top};
+      var o = editor.offset();
+      return {x: event.pageX - o.left + editor.scrollLeft(),
+              y: event.pageY - o.top  + editor.scrollTop () };
     };
   })();
 });
\ No newline at end of file


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