Changeset 214 for js/viewer-f0/js/NeuronDrawer.js

Timestamp:

04/06/14 12:18:53 (10 years ago)

Author:

mmichalski

Message:

Draw U-Shapes connections

File:

• js/viewer-f0/js/NeuronDrawer.js (modified) (4 diffs)

js/viewer-f0/js/NeuronDrawer.js

@@ -11 +11 @@
     this._scale = 1;
     this._min_scale = 0.1;
+    this._lineDebug = false;
     //Kinetic.js
     this._stage = undefined;
@@ -17 +18 @@
 
 NeuronDrawer.prototype.initializeNewCanvas = function () {
+
+    if(typeof (this._canvasWidth) == "undefined" && typeof (this._canvasHeight) == "undefined")
+        {
+        var div = $("#" + this._containerContextName);
+        this._canvasWidth = div.width();
+        this._canvasHeight = div.height();
+    }
 
     this._stage = new Kinetic.Stage({
@@ -150 +158 @@
         yw += this._neurons[neuroId].y;//add position of object to y
 
+        //Inputs
         points.push(this._neurons[neuroId].x);//x
         points.push(yw);//y
@@ -156 +165 @@
         points.push(yw);//y
 
-        points.push(n2.x+n2.sizeX);
-        points.push(n2.y + n2.sizeY/2);
-
-        /*if(diagram?)
+        //straight line to second neuron
+        if(this._lineDebug || (this._neurons[neuroId].x > n2.x))
         {
-            //straight forward
+            points.push(n2.x+n2.sizeX);
+            points.push(n2.y + n2.sizeY/2);
         }
         else
         {
-            //U-shape
-        }*/
+            //U - shape
+            //Vertical
+            points.push(this._neurons[neuroId].x - xw);//x
+            points.push(n2.y + n2.sizeY + (input+1)*5);//y
+
+            //Horizontal
+            points.push(n2.x + n2.sizeX);//x
+            points.push(n2.y + n2.sizeY + (input+1)*5);//y
+
+            //Vertical
+            points.push(n2.x + n2.sizeX);//x
+            points.push(n2.y + n2.sizeY/2);//y
+        }
 
         var line = new Kinetic.Line({