Changeset 143

Timestamp:

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

Author:

mmichalski

Message:

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

Location:

js/viewer-f0

Files:

• css/styles.css (modified) (1 diff)
• index.html (modified) (1 diff)
• js/Block.js (added)
• js/NeuronDrawer.js (added)
• js/Structures/Neuro.js (modified) (1 diff)
• js/Structures/NeuroClass.js (added)
• js/Structures/NeuroConn.js (modified) (1 diff)
• js/graphicsEngine.js (modified) (1 diff)
• js/main.js (modified) (7 diffs)

js/viewer-f0/css/styles.css

@@ -2 +2 @@
     display: inline;
     position: fixed;
-    left: 560px;
+    left: 1050px;
 }
 
 
-#container{
+.cont{
     height: 500px;
     width: 500px;

js/viewer-f0/index.html

@@ -15 +15 @@
 <script src="js/Structures/NeuroConn.js"></script>
 <script src="js/graphicsEngine.js"></script>
+<script src="js/NeuronDrawer.js"></script>
+<script src="js/SmartLayout.js"></script>
+<script src="js/Structures/NeuroClass.js"></script>
 <script src="js/main.js"></script>
 
 
+<div class="cont" id="container"></div>
+<div class="cont" id="containerNeuron"></div>
 
-
-<div id="container"></div>
 <div id="menu">
     <textarea id="geno">//0&#13;&#10;p:</textarea>

js/viewer-f0/js/Structures/Neuro.js

@@ -5 +5 @@
 
 Neuro.prototype = new Model();
-
-Neuro.prototype.getXPos = function()
-{
-
-}

js/viewer-f0/js/Structures/NeuroConn.js

@@ -5 +5 @@
 
 NeuroConn.prototype.getDestination = function(){
+    return parseInt(this._properties["n1"]["VALUE"]);
+}
+
+NeuroConn.prototype.getSource = function(){
     return parseInt(this._properties["n2"]["VALUE"]);
 }

js/viewer-f0/js/graphicsEngine.js

@@ -253 +253 @@
 }
 
-GraphicsEngine.prototype.drawNeuron = function(){
-    var scheme = [4,4,26,27,26,73,73,73,73,27,26,27,1,73,50,100,50,1,56,68,46,68,2,41,47,51,32,51,68];
-    //pobieranie schematu
-    //inne określenie położeń
-
-
-    var obj = new THREE.Object3D();
-
-    var material = new THREE.LineBasicMaterial({
-        color: 0x0000ff
-    });
-    var position = 0;
-    var noOfBlocks = 0;//number of "blocks" to draw
-    var noOfLines = 0;//number of line to draw
-    noOfBlocks = scheme[position++];
-    for (var i = 0; i < noOfBlocks; i++)
-    {
-        noOfLines = scheme[position++];
-
-        for (var j = 0; j < noOfLines; j++)
-        {
-            var geometry = new THREE.Geometry();
-            geometry.vertices.push(new THREE.Vector3(scheme[position++], scheme[position++], 0));
-            geometry.vertices.push(new THREE.Vector3(scheme[position++], scheme[position++], 0));
-            position = position - 2; //get to last point in list
-            var line = new THREE.Line(geometry, material);
-            obj.add(line);
-        }
-        position = position + 2;//move to value which define number of lines to draw
-    }
-
-    obj.scale.set(0.1,0.1,0.1)
-    this._scene.add(obj)
-}
-
-GraphicsEngine.prototype.drawConnection = function(connection, id, connestions, neurons){
-
-    var destination = connection.getDestination();
-    var numberOfConnToDest = 0;
-    var numberOfDrawenCon = 0;
-
-    //check how many conenctions have the same destination
-    for(var i = 0; i < connestions.length; i++){
-        if(connestions[i].getDestination() == destination)
-            numberOfConnToDest++;
-    }
-
-    //check how many connections had been drawen
-    for(var i = 0; i < id; i++){
-        if(connestions[i].getDestination() == destination)
-            numberOfDrawenCon++;
-    }
-
-    var positionY = (numberOfDrawenCon + 1) * 100 / (numberOfConnToDest + 1);
-    var positionX = (numberOfDrawenCon + 1) * 10 / (numberOfConnToDest + 1);
-
-    /*var x1 =
-    var x2
-    var y1
-    var y2*/
-
-}
-
 GraphicsEngine.prototype.debugTest = function()
 {
-    this.drawNeuron();
-
-
-}
-
+
+}
+

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");
 
 }