From 5d911efa70e0b43a979599ff7f12db7b235a4333 Mon Sep 17 00:00:00 2001
From: Pablo Luna <lunapablo@gmail.com>
Date: Sun, 17 Apr 2011 10:32:08 +0100
Subject: [PATCH] fixing relationship lines

---
 core-js/src/main/javascript/Utils.js             | 2 +-
 mindplot/src/main/javascript/MindmapDesigner.js  | 2 ++
 mindplot/src/main/javascript/RelationshipLine.js | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core-js/src/main/javascript/Utils.js b/core-js/src/main/javascript/Utils.js
index b102d195..f45c9224 100644
--- a/core-js/src/main/javascript/Utils.js
+++ b/core-js/src/main/javascript/Utils.js
@@ -269,7 +269,7 @@ core.Utils.calculateDefaultControlPoints = function(srcPos, tarPos){
     var x2 = tarPos.x + Math.sqrt(l*l/(1+(m*m)))*fix*-1;
     var y2= m*(x2-tarPos.x)+tarPos.y;
 
-    return [new core.Point(srcPos.x - x1,srcPos.y - y1),new core.Point(tarPos.x - x2,tarPos.y - y2)];
+    return [new core.Point(-srcPos.x + x1,-srcPos.y + y1),new core.Point(-tarPos.x + x2,-tarPos.y + y2)];
 };
 
 core.Utils.setVisibilityAnimated = function(elems, isVisible, doneFn){
diff --git a/mindplot/src/main/javascript/MindmapDesigner.js b/mindplot/src/main/javascript/MindmapDesigner.js
index 0a4b262f..be9b0675 100644
--- a/mindplot/src/main/javascript/MindmapDesigner.js
+++ b/mindplot/src/main/javascript/MindmapDesigner.js
@@ -280,6 +280,7 @@ mindplot.MindmapDesigner.prototype.addRelationShip2SelectedNode = function(event
     var selectedTopics = this.getSelectedNodes();
     if(selectedTopics.length >0 &&
        (!core.Utils.isDefined(this._creatingRelationship) || (core.Utils.isDefined(this._creatingRelationship) && !this._creatingRelationship))){
+        this._workspace.enableWorkspaceEvents(false);
         var fromNodePosition = selectedTopics[0].getPosition();
         this._relationship = new web2d.CurvedLine();
         this._relationship.setStyle(web2d.CurvedLine.SIMPLE_LINE);
@@ -318,6 +319,7 @@ mindplot.MindmapDesigner.prototype._relationshipMouseClick = function (event, fr
     this._workspace.getScreenManager().removeEventListener('mousemove',this._relationshipMouseMoveFunction);
     this._workspace.getScreenManager().removeEventListener('click',this._relationshipMouseClickFunction);
     this._creatingRelationship=false;
+    this._workspace.enableWorkspaceEvents(true);
     event.preventDefault();
     event.stop();
     return false;
diff --git a/mindplot/src/main/javascript/RelationshipLine.js b/mindplot/src/main/javascript/RelationshipLine.js
index 6b7a5697..26df1fc0 100644
--- a/mindplot/src/main/javascript/RelationshipLine.js
+++ b/mindplot/src/main/javascript/RelationshipLine.js
@@ -67,7 +67,7 @@ mindplot.RelationshipLine.prototype.redraw = function()
     var sPos,tPos;
     this._line2d.setStroke(2);
     var ctrlPoints = this._line2d.getControlPoints();
-    if(!core.Utils.isDefined(ctrlPoints[0].x) || !core.Utils.isDefined(ctrlPoints[1].x)){
+    if(!this._line2d.isDestControlPointCustom() && !this._line2d.isSrcControlPointCustom()){
         var defaultPoints = core.Utils.calculateDefaultControlPoints(sourcePosition, targetPosition);
         ctrlPoints[0].x=defaultPoints[0].x;
         ctrlPoints[0].y=defaultPoints[0].y;