Changeset 216 for js/viewer-f0/js/Viewer.js

Timestamp:

04/06/14 14:43:29 (10 years ago)

Author:

mmichalski

Message:

Fix bug with many SmartLayouts? on the same page

File:

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

js/viewer-f0/js/Viewer.js

@@ -245 +245 @@
         this._neuronDrawer = new NeuronDrawer(this.NetworkSettings.context, this.NetworkSettings.width, this.NetworkSettings.height );
         this._neuronDrawer.initializeNewCanvas();
-        new SmartLayout(this._neurons, this._neuroConns);
-        this._neuronDrawer.drawNeuralNetwork(this._neurons, this._neuroConns, einfos, this._neuroClasses);
+        var layout = new SmartLayout(this._neurons, this._neuroConns);
+        layout.create();
+        this._neuronDrawer.drawNeuralNetwork(this._neurons, this._neuroConns, layout.einfos, this._neuroClasses);
         this._neuronDrawer.finalize();
-
-        /*this._neuronDrawer = new NeuronDrawer(this._neuronsContext);
-        this._neuronDrawer.initializeScene();
-        new SmartLayout(this._neurons, this._neuroConns);
-        this._neuronDrawer.drawNeuralNetwork(this._neurons, this._neuroConns, einfos, this._neuroClasses);
-        this._neuronDrawer.renderScene();*/
     }
 }
@@ -265 +260 @@
 
     viewer.NetworkSettings.context =  "containerNeuron";
-    viewer.NetworkSettings.width = 400;
-    viewer.NetworkSettings.height = 400;
     viewer.run(viewer.Mode.TEXTAREA, $("#geno"));
 }
@@ -275 +268 @@
     viewer.VisualizationSettings.width = 400;
     viewer.VisualizationSettings.height = 400;
-
     viewer.NetworkSettings.context =  "containerNeuron1";
     viewer.NetworkSettings.width = 400;
@@ -299 +291 @@
     //var debugCreatureName = "Quadro";
     var debugCreatureName = "spider";
-    //viewer.VisualizationSettings.context = $("#container3");
-    //viewer.VisualizationSettings.width = 400;
-    //viewer.VisualizationSettings.height = 400;
+    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");
 }