Changeset 143 for js/viewer-f0/js/main.js

Timestamp:

02/26/14 11:19:05 (11 years ago)

Author:

mmichalski

Message:

Load NeuroClass? from f0def.xml and load correct xml from server

File:

• js/viewer-f0/js/main.js (modified) (7 diffs)

js/viewer-f0/js/main.js

@@ -14 +14 @@
     neurons: [],
     neuroConns: [],
+    neuroClasses: [],
     modelOne: undefined,
     _graphicsEngine: new GraphicsEngine(),
+    _neuronDrawer: new NeuronDrawer(),
     downloadXML: function () {
         var local = this;
         $.ajax({
-            url: "http://localhost:63342/FramestickFavi/f0def.xml",
+            url: "http://www.framsticks.com/files/dev/files/f0def.xml",
             dataType: "xml",
             async: false,
@@ -31 +33 @@
             }
         })
-
     },
     parseGeneXml: function () {
-        var nodes = $(this.xml.find("CLASS"));
+        this._parseClass($(this.xml.find("CLASS")));
+        this._parseNeuroClass($(this.xml.find("NEUROCLASS")))
+    },
+    _parseClass: function(nodes){
         var local = this;
 
@@ -56 +60 @@
 
         });
+    },
+    _parseNeuroClass: function(data){
+
+        for(var i = 0; i < data.length; i++)
+        {
+            var neuroClass = new NeuroClass();
+            neuroClass.setModel(data);
+            this.neuroClasses.push(neuroClass);
+        }
     },
     analyseLine: function (line) {
@@ -108 +121 @@
     downloadCreature: function () {
         var lines;
-        /*$.ajax({
-            url: "http://localhost:63342/FramestickFavi/creatures/" + this.debugCreatureName + ".txt",
+        $.ajax({
+            url: "http://localhost:63343/FramestickFavi/creatures/" + this.debugCreatureName + ".txt",
             async: false,
             dataType: "text",
@@ -120 +133 @@
             }
 
-        });*/
+        });
 
-        lines = $("#geno").val();
-        lines = lines.split("\n");
+        //lines = $("#geno").val();
+        //lines = lines.split("\n");
 
         return lines;
@@ -153 +166 @@
         //this._graphicsEngine.debugTest();
         this._graphicsEngine.renderScene();
+
+        this._neuronDrawer.initializeScene();
+        new SmartLayout(this.neurons, this.neuroConns);
+        this._neuronDrawer.drawNetwork(this.neurons, this.neuroConns, einfos);
+        this._neuronDrawer.renderScene();
+
     }
 
@@ -162 +181 @@
     geneWindow.parseCreature();
     geneWindow.mainLoop();
-    //geneWindow.context = window.open("window.html", "Window", "width=200,height=100");
 
 }