Changeset 214

Timestamp:

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

Author:

mmichalski

Message:

Draw U-Shapes connections

Location:

js/viewer-f0

Files:

• css/styles.css (modified) (1 diff)
• js/NeuronDrawer.js (modified) (4 diffs)
• js/Viewer.js (modified) (3 diffs)

js/viewer-f0/css/styles.css

@@ -7 +7 @@
     height: 500px;
     width: 500px;
-    display: inline;
+    display: inline-block;
+    border-style: solid;
 }
 

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({

js/viewer-f0/js/Viewer.js

@@ -7 +7 @@
     };
 
-    this._showNeurons = true;
-    this._showVisualization = true;
-    this._visualizationContext = undefined;
-    this._neuronsContext = undefined;
     this._context = undefined;
-    this._urlToXML = "http://www.framsticks.com/files/apps/config/f0def.xml";
+    this._urlToXML = 'f0def.xml';//"http://www.framsticks.com/files/apps/config/f0def.xml";
     this._xml = undefined;
     this._model = new Model();
@@ -24 +20 @@
     this._neuroConns = [];
     this._neuroClasses = {};
-    this._modelOne = undefined;
     this._graphicsEngine = undefined;
     this._neuronDrawer = undefined;
@@ -302 +297 @@
     //var debugCreatureName = "example4";
     //var debugCreatureName = "caterpillar";
-    var debugCreatureName = "Quadro";
+    //var debugCreatureName = "Quadro";
+    var debugCreatureName = "spider";
     //viewer.VisualizationSettings.context = $("#container3");
     //viewer.VisualizationSettings.width = 400;
     //viewer.VisualizationSettings.height = 400;
     viewer.NetworkSettings.context =  "containerNeuron3";
-    viewer.NetworkSettings.width = 400;
-    viewer.NetworkSettings.height = 400;
+    //viewer.NetworkSettings.width = 400;
+    //viewer.NetworkSettings.height = 400;
     viewer.run(viewer.Mode.LINK, "http://localhost:63343/FramestickFavi/creatures/" + debugCreatureName + ".txt");
 }