Changeset 16682

Timestamp:

06/04/13 15:05:28 (11 years ago)

Author:

tose

Message:

 

File:

• schedule/js/chart.js (modified) (5 diffs)

schedule/js/chart.js

@@ -26 +26 @@
                         //alert("request ok");
                         line=XML.responseText.split('\n');
-                        dataSource.push(line);
+                        dataSource.push(new Array());
+            n = dataSource.length-1;
+                for(row=0;row<line.length;row++)
+                                {
+                        rows=line[row].split(',');
+                                dataSource[n].push(parseFloat(rows[4])||parseFloat('0'));
+                                }
                         if (dataSource.length == source.length)
                                 {
@@ -82 +88 @@
         };
         //This function splits the lines of data per data source
-        var dataGraph = new Array(source.length);
+        //var dataGraph = new Array(source.length);
         var Time = new Array(source.length);
         var Temp = new Array();
@@ -91 +97 @@
         for (i=0; i<source.length; i++) 
         {
-                dataGraph[i] = new Array(); //dataGraph contains the individual points for each source i
+                //dataGraph[i] = new Array(); //dataGraph contains the individual points for each source i
                 Time[i] = new Array(); // Time contains the individual time for each sources.
                 chart.addSeries({name:source[i], data:[]}); // created a series of data and add name of displayed source        
@@ -98 +104 @@
                         rows=line[row].split(',');
                         Temp[row]=rows[0];
-                        dataGraph[i].push(parseFloat(rows[4])||parseFloat('0'));
+                        //dataGraph[i].push(parseFloat(rows[4])||parseFloat('0'));
                         for(T=0;T<Temp.length;T++)
                         {
@@ -169 +175 @@
                         
                 }
-                for(Graph=0;Graph<dataGraph[i].length;Graph++)
+                for(Graph=0;Graph<dataSource[i].length;Graph++)
                 {                                               
                                 chart.series[i].addPoint({ // series[0] means index of zero in data;
                                 x:Time[i][Graph], // Time
-                                y:dataGraph[i][Graph] // Value
+                                y:dataSource[i][Graph] // Value
                                 })
                 }