Changeset 277

Timestamp:

02/21/12 15:06:09 (13 years ago)

Author:

tjcschipper

Message:

 

Location:

Dev/branches/Cartis

Files:

• css/visualeditors.css (modified) (1 diff)
• dashboardDataSelection.php (modified) (1 diff)
• dashboardOverview.php (modified) (4 diffs)
• js/dashboardScripts.js (modified) (2 diffs)

Dev/branches/Cartis/css/visualeditors.css

@@ -524 +524 @@
     text-decoration: underline;
 }
+
+
+.floatClearer {
+    float: left;
+    clear: both;
+}

Dev/branches/Cartis/dashboardDataSelection.php

@@ -34 +34 @@
 
             <div id="breadcrumbs" class="largeFrame">
-                <a href="#">Login</a> > 
+                <a href="index.php">Login</a> > 
                 <a href="dashboardDataSelection.php" class="selected">Select data</a>
             </div>

Dev/branches/Cartis/dashboardOverview.php

@@ -24 +24 @@
         <script src="rGraph/libraries/RGraph.rose.js"></script>
 
-        <script>
-            myGraph.Set('chart.contextmenu', [
-                ['Get PNG', RGraph.showPNG],
-                null,
-                ['Cancel', function () {}]
-            ]);
-        </script>
 
         <script>
@@ -39 +32 @@
                 var inputData = JSON.parse(dataIn);
                 
+                window.charts = [];
                 
                 for (var n = 0; n < inputData.count; n++) {
-                    drawGraph(inputData.graphs[n][0], inputData.graphs[n][1], inputData.graphs[n][2], inputData.graphs[n][3], inputData.graphs[n][4])
+                    var name = inputData.graphs[n][0];
+                    var chart = drawGraph(name, inputData.graphs[n][1], inputData.graphs[n][2], inputData.graphs[n][3], inputData.graphs[n][4]);
+                    charts.push(chart);
                 }
+                
+                var el = ce("div");
+                el.className = "floatClearer";
+                ge("graphDisplay").appendChild(el);
+                /*
+                for (var n = 0; n < window.charts.length; n++) {
+                    // set context menu
+                    charts[n].Set('chart.contextmenu', [
+                        ['View graph fullscreen', RGraph.showPNG],
+                        null,
+                        ['Cancel', function() {}]
+                    ]);
+                }
+                 */
+               debugger;
+                var canvases = document.getElementsByTagName("canvas");
+                for (var n = 0; n < canvases.length; n++) {
+                    canvases[n].addEventListener("click", function(event) {
+                        debugger;
+                        RGraph.showPNG(event.target, event);
+                        //var div = ge("__rgraph_image_div__");
+                        //div.style.width = "800px";
+                        //div.style.height = "600px";
+                        //var img = ge("__rgraph_image_img__");
+                        //img.style.width = "800px";
+                        //img.style.height = "600px";
+                    }, true);
+                }
+                
             }
         </script> 
@@ -66 +91 @@
                 <div id="leftColumn">
 
-                    <div class="largeFrame C" id="dbDataSelector">
+                    <div class="largeFrame C" style="height: auto; max-height: none;">
 
                         <div class="largeTitle">Dashboard Overview</div>                         
@@ -85 +110 @@
         </div>
     </div>
-    <a href="dashboardDataSelection.php">Naar dataselection</a>"
 
 </body>

Dev/branches/Cartis/js/dashboardScripts.js

@@ -61 +61 @@
             }
             if (type == null || type == undefined) //error?!?!?!
-            break;
+                break;
     }
     currentlySelected.uids = values;
@@ -334 +334 @@
     chart1.Draw();
     
+    return chart1;
+    
 }