Changeset 291cb6c73899c30c7149bc6de596cf9db9693298

Timestamp:

06/18/09 20:09:50 (4 years ago)

Author:

Umar Farooq <umar@omniti.com>

git-committer:

Umar Farooq <umar@omniti.com> 1245355790 +0000

git-parent:

[8c5d79c983896af6a81c6b761a4e12258a6765e7]

git-author:

Umar Farooq <umar@omniti.com> 1245355790 +0000

Message:

cleaning up streaming code

Files:

• ui/web/htdocs/graph_panel.inc (modified) (10 diffs)
• ui/web/htdocs/js/recon.js (modified) (11 diffs)

ui/web/htdocs/graph_panel.inc

@@ -4 +4 @@
-var current_graph_id = '';
-var debug_graph_edit = false;
-};
+streaming: false}; //this streaming boolean keeps track of the graphpanel stream button
-var displayinfo = { start : 14*86400, cnt: '', end: '' };
-var color_pool = Array('#33aa33','#4a00dc','#caac00','#3377cc','#00acfa','#cc3333')
-var color_sel = 0;
-var locked = true;
-var gstreaming = false;
-
-function graph_locked(warning) {                
@@ -57 +56 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-function set_current_graph_id(id) {
-  $(".rememberGraph").fadeOut('fast');
@@ -101 +69 @@
-    graphinfo.saved = true;
-    locked = true;
-    gstreaming = false;
-    lock_forms();
-    $(".editGraph").html('Edit Graph').fadeIn('slow');    
-    $('#gstreambox').html('');
-    $(".streamData").html('Stream Data').fadeIn('slow');
-    $(".stream-log").attr("style", "display:none;");
-  }
-  else {        
@@ -112 +76 @@
-    unlock_forms();    
-    $(".editGraph").html('Editing!').fadeIn('slow');
-g
+
-    $(".streamData").html('Stream Data').fadeIn('slow');
-    $(".stream-log").attr("style", "display:none;");
@@ -123 +87 @@
-function update_current_graph(redraw, f) {
-  if(recurse > 0) return;
-
-
-
-
+
-
-  var str = JSON.stringify(graphinfo);
@@ -400 +361 @@
-        var state = false;
-
-
+
+
+
-                if(locked){
-                    locked = false;                 
@@ -410 +373 @@
-                    lock_forms();
-                    $(".editGraph").html('Edit Graph').fadeIn('slow');
-                    if(gstreaming) { 
-                      gstreaming = false;
-                      $('#gstreambox').html('');
-                      $(".streamData").html('Stream Data').fadeIn('slow');
-                      $(".stream-log").attr("style", "display:none;");
-                      update_current_graph(true); 
-                      }
-                }
+            }
-        });
-
@@ -430 +387 @@
-       });                                              
-        
+        //only allow stream toggling if the graph is locked and saved
-        $(".streamData").click(function() {
-
-
-                        g
+
+raphinfo.
+                       graphinfo.
-                        $(this).html('Streaming!').fadeIn('slow');
-                        $(".stream-log").removeAttr("style").html("stream log_");
-               graph_stream_data(
+               stream_data(graphinfo.id, maingraph, $('#streambox')
-                    }
-
-
-
-
-
+
+
-                        update_current_graph(true);
-                    }
-       
+      
-        });
-        $("#graph_datetool .btn-slide").click(function(){
@@ -504 +459 @@
-
-        $("span.blankGraph").click(function() {
+
+          stop_streaming_graph();
+
-          // current graph is saved, so just give a new one.
-          if(graphinfo.saved) set_current_graph_id('');
@@ -553 +511 @@
-        </div>
-</div>
-<div id="gstreambox" style="display:none"></div>
-
-<div>

ui/web/htdocs/js/recon.js

@@ -6 +6 @@
-var stream_dirty;
-var recon_realtime_hostname = '';
+var streaming = false;
-
-//set the global streaming object to the local ReconGraph object to use,
@@ -17 +18 @@
-    $(".stream-log").html(message).fadeIn('slow');
-}
-
-
-//this will copy data only, ignoring other series variables
@@ -510 +510 @@
-              ReconGraphPlotPoints: ReconGraph.PlotPoints
-              });
-
+  
-
-function perform_graph_search_add(params) {
@@ -723 +723 @@
-}
-
+//call this function when you wish to stream a graph
+//graphid: the id, used to retrieve the graph's metric to request
+//stream_graph: the dom element to update with the stream
+//streambox: the hidden element to insert the iframe remote calls
+function stream_data(graph_id, stream_graph, streambox) {
+    if(streaming) {
+        modal_warning("Stream Error!", "You can only stream one thing at a time!");
+        return;
+    }
+    //this should be the only place we set streaming to true
+    streaming = true;
+
+    polltime = 2000;
+    timewindow = 300000;
+    stream_object = stream_graph;
+    stream_dirty = false;
+    stream_graph.ReconGraphPrepareStream(timewindow, polltime);
+
+//setup functionality so that every 2 seconds check if we are streaming and dirty, plot if true
+    stream_graph.everyTime(2000, function() {
+      if(!streaming) {
+       streambox.html('');
+       $(".stream-log").attr("style", "display:none;");
+       stream_graph.stopTime();
+      }
+      else {
+        if(stream_dirty){
+          stream_graph.ReconGraphPlotPoints();
+          stream_dirty=false;
+        }
+      }
+        });
+
+    $.getJSON("json/graph/info/" + graph_id,
+      function(g) {
+
+        sids = "";
+        var sidneed = new Object();
+
+        for(var i=0; i<g.datapoints.length; i++) {
+          if(g.datapoints[i].sid) {
+            sidneed[g.datapoints[i].sid] = polltime;
+          }
+        }
+        for(var sid in sidneed) {
+          sids+= "/"+sid+"@"+sidneed[sid];
+        }
+        //console.log("sids request: http://" +recon_realtime_hostname+"/data"+sids);
+        streambox.html('<iframe src="http://' + recon_realtime_hostname + '/data'+sids+'"></iframe>');
+     });
+  }
+
+
-///////////////////////////
-// Worksheet manipulation
@@ -731 +784 @@
-  var wsinfo = {};
-  var locked = true;
-var streaming = false;
+streaming = false;  //precautionary...should be set to false wherever we use it when weere done
-  var stream_graph;
-
@@ -744 +797 @@
-    }
-    return locked;
-  }
-
-  function stream_data(graph_id) {
-
-    polltime = 2000;
-    timewindow = 300000;
-    stream_object = stream_graph;
-    stream_dirty = false;
-    stream_graph.ReconGraphPrepareStream(timewindow, polltime);
-
-    streaming = true;
-
-//setup functionality so that every 2 seconds check if we are streaming and dirty, plot if true
-    stream_graph.everyTime(2000, function() {
-      if(!streaming) {
-       $('#streambox').html('');
-       $(".stream-log").attr("style", "display:none;");
-       stream_graph.stopTime();
-      }
-      else {
-        if(stream_dirty){
-          stream_graph.ReconGraphPlotPoints();
-          stream_dirty=false;
-        }
-      }
-        });
-
-    $.getJSON("json/graph/info/" + graph_id,
-      function(g) {
-
-        sids = "";
-        var sidneed = new Object();
-
-        for(var i=0; i<g.datapoints.length; i++) {
-          if(g.datapoints[i].sid) {
-            sidneed[g.datapoints[i].sid] = polltime;
-          }
-        }
-        for(var sid in sidneed) {
-          sids+= "/"+sid+"@"+sidneed[sid];
-        }
-        //console.log("sids request: http://" +recon_realtime_hostname+"/data"+sids);
-        $('#streambox').html('<iframe src="http://' + recon_realtime_hostname + '/data'+sids+'"></iframe>');
-     });
-  }
-
@@ -860 +869 @@
-      <br style="clear:left" />\
-      </div>    \
-        <div id="streambox" style="display:none"></div> \
-          <div style="display:none">\
-         <div id="maingraph-template">\
@@ -876 +884 @@
-
-  function render_graph_inpage(divid, id, start, end) {
+      var ginpage_streaming = false;
-
-$.getJSON("json/graph/info/" + id, function (ginfo) {
-
+
-              stream_graph = $('#'+divid);
-              stream_graph.ReconGraph({graphid: ginfo.id, type: ginfo.type});
@@ -904 +913 @@
-
-    $(".streamData").click(function() {
- if(!streaming) 
-
+if(!ginpage_streaming)
+ginpage_
-        $(this).html('Streaming!').fadeIn('slow');
-        $(".stream-log").removeAttr("style").html("stream log_");
-
+, stream_graph, $('#streambox')
-      }
-
+
+
-        streaming = false;
-        $('#streambox').html('');
@@ -931 +941 @@
-  function zoom_modal (id, gtype) {
-
+  var zmodal_streaming = false;
-  if(id) $.getJSON("json/graph/info/" + id, function (ginfo) {
-
@@ -980 +991 @@
-
-    $(".zoomStream").click(function() {
-  if(!streaming) 
-        
+if(!zmodal_streaming)
+       zmodal_
-        $(".zoomStream").html('Streaming!').fadeIn('slow');
-        $(".stream-log").removeAttr("style").html("stream log_");
-
+, stream_graph, $('#streambox')
-      }
-
+
+
-        streaming = false;
-        $('#streambox').html('');