filtering not working at the moment

Jakefile.js

@@ -102,6 +102,8 @@ task('build', {async: true}, function () {
       './src/graph/graphMixins/MixinLoader.js',
       './src/graph/Graph.js',
 
+      './src/graph3d/graph3d.js',
+
       './src/module/exports.js'
     ],
 

src/3dgraph/examples/example01_basis.html → examples/graph3d/example01_basis.html

@@ -7,18 +7,12 @@
         body {font: 10pt arial;}
     </style>
 
-    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
-    <script type="text/javascript" src="../graph3d.js"></script>
+    <script type="text/javascript" src="../../dist/vis.js"></script>
 
     <script type="text/javascript">
         var data = null;
         var graph = null;
 
-        google.load("visualization", "1");
-
-        // Set callback to run when API is loaded
-        google.setOnLoadCallback(drawVisualization);
-
         function custom(x, y) {
             return (Math.sin(x/50) * Math.cos(y/50) * 50 + 50);
         }
@@ -26,11 +20,7 @@
         // Called when the Visualization API is loaded.
         function drawVisualization() {
             // Create and populate a data table.
-            data = new google.visualization.DataTable();
-            data.addColumn('number', 'x');
-            data.addColumn('number', 'y');
-            data.addColumn('number', 'z');
-
+            var data = new vis.DataSet({});
             // create some nice looking data with sin/cos
             var steps = 50;  // number of datapoints will be steps*steps
             var axisMax = 314;
@@ -38,7 +28,9 @@
             for (var x = 0; x < axisMax; x+=axisStep) {
                 for (var y = 0; y < axisMax; y+=axisStep) {
                     var value = custom(x,y);
-                    data.addRow([x, y, value]);
+                    data.add([
+                        {x:x,y:y,z:value,t:0,style:value}
+                    ]);
                 }
             }
 

src/3dgraph/examples/example02_camera.html → examples/graph3d/example02_camera.html

@@ -8,18 +8,12 @@
         td {font: 10pt arial}
     </style>
 
-    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
-    <script type="text/javascript" src="../graph3d.js"></script>
+    <script type="text/javascript" src="../../dist/vis.js"></script>
 
     <script type="text/javascript">
         var data = null;
         var graph = null;
 
-        google.load("visualization", "1");
-
-        // Set callback to run when API is loaded
-        google.setOnLoadCallback(drawVisualization);
-
         function custom(x, y) {
             return (Math.sin(x/50) * Math.cos(y/50) * 50 + 50);
         }
@@ -51,31 +45,20 @@
         // Called when the Visualization API is loaded.
         function drawVisualization() {
             // Create and populate a data table.
-            data = new google.visualization.DataTable();
-            data.addColumn('number', 'x');
-            data.addColumn('number', 'y');
-            data.addColumn('number', 'value');
-
-            var JSONdata = [];
-
+            var data = new vis.DataSet({});
             // create some nice looking data with sin/cos
             var steps = 50;  // number of datapoints will be steps*steps
             var axisMax = 314;
             var axisStep = axisMax / steps;
             for (var x = 0; x < axisMax; x+=axisStep) {
-                JSONdata.push([]);
                 for (var y = 0; y < axisMax; y+=axisStep) {
                     var value = custom(x,y);
-                    JSONdata[x].push(value);
+                    data.add([
+                        {x:x,y:y,z:value,t:0,style:value}
+                    ]);
                 }
             }
 
-            for (var x = 0; x < axisMax; x+=axisStep) {
-                for (var y = 0; y < axisMax; y+=axisStep) {
-                    var value = custom(x,y);
-                    data.addRow([x, y, value]);
-                }
-            }
 
             // specify options
             var options = {
@@ -92,10 +75,6 @@
             // Instantiate our graph object.
             graph = new links.Graph3d(document.getElementById('mygraph'));
 
-            // Add event listeners
-            google.visualization.events.addListener(graph, 'camerapositionchange',
-                    oncamerapositionchange);
-
             // Draw our graph with the created data and options
             graph.draw(data, options);
             //graph.redraw();
@@ -103,7 +82,7 @@
     </script>
 </head>
 
-<body>
+<body onload="drawVisualization()">
 <h1>Graph 3d camera position</h1>
 <table>
     <tr>

src/3dgraph/examples/example03_filter.html → examples/graph3d/example03_filter.html

@@ -7,18 +7,12 @@
         body {font: 10pt arial;}
     </style>
 
-    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
-    <script type="text/javascript" src="../graph3d.js"></script>
+    <script type="text/javascript" src="../../dist/vis.js"></script>
 
     <script type="text/javascript">
         var data = null;
         var graph = null;
 
-        google.load("visualization", "1");
-
-        // Set callback to run when API is loaded
-        google.setOnLoadCallback(drawVisualization);
-
         function custom(x, y) {
             return Math.sin(x/50) * Math.cos(y/50) * 50 + 50;
         }
@@ -26,23 +20,20 @@
         // Called when the Visualization API is loaded.
         function drawVisualization() {
             // Create and populate a data table.
-            data = new google.visualization.DataTable();
-            data.addColumn('number', 'x');
-            data.addColumn('number', 'y');
-            data.addColumn('number', 'value');
-            data.addColumn('string', 'Value range');
-
+            var data = new vis.DataSet({});
             // create some nice looking data with sin/cos
-            var steps = 50;  // number of datapoints will be steps^2
+            var steps = 50;  // number of datapoints will be steps*steps
             var axisMax = 314;
-            axisStep = axisMax / steps;
+            var axisStep = axisMax / steps;
             for (var x = 0; x < axisMax; x+=axisStep) {
                 for (var y = 0; y < axisMax; y+=axisStep) {
                     var value = custom(x,y);
                     var valueRange = (value > 67) ? "67-100" :
-                            (value < 33) ? "0-33" :
-                                    "33-67";
-                    data.addRow([x, y, value, valueRange]);
+                                     (value < 33) ? "0-33" :
+                                     "33-67";
+                    data.add([
+                        {x:x,y:y,z:value,filter:valueRange,style:value}
+                    ]);
                 }
             }
 
@@ -67,7 +58,7 @@
     </script>
 </head>
 
-<body>
+<body onload="drawVisualization()">
 <div id="mygraph"></div>
 
 <div id="info"></div>