Changeset 7f943cbc5a18550279e090f72d6f5ca469787f95 for ui

Timestamp:

10/15/08 22:19:44 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1224109184 +0000

git-parent:

[ee8c14373683efab971cd2c605751c248a378989]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1224109184 +0000

Message:

consolidation... still a bit buggy, refs #22

Files:

• ui/web/htdocs/css/style.css (modified) (1 diff)
• ui/web/htdocs/graph_panel.inc (modified) (8 diffs)
• ui/web/htdocs/js/recon.js (modified) (4 diffs)

ui/web/htdocs/css/style.css

@@ -107 +107 @@
-{
-        left:0;
-auto
+visible
-        padding:1em;
-        position:absolute;      

ui/web/htdocs/graph_panel.inc

@@ -5 +5 @@
-<script type="text/javascript">
-<!--
+var maingraph;
-var current_graph_id = '';
-var debug_graph_edit = false;
-
+= {}
-var displayinfo = { start : 14*86400, cnt: '', end: '' };
-var color_pool = Array('#33aa33','#4a00dc','#caac00','#3377cc','#00acfa','#cc3333')
@@ -17 +18 @@
-}
-var recurse = 0;
-function plot_id(r, domid, redraw) {
-      var placeholder = $(domid + " > div.plot-area");
-      placeholder.bind("plotselected", function (event, ranges) {
-        var start = new Date(Math.floor(ranges.xaxis.from));
-        var end = new Date(Math.floor(ranges.xaxis.to));
-        displayinfo.start = start.toUTCString();
-        displayinfo.end = end.toUTCString();
-        if(redraw) redraw();
-      });
-      if(!r.options.grid) r.options.grid = {};
-      r.options.grid.hoverable = true;
-      $("div.tooltip").remove();
-      placeholder.bind("plothover", function (event, pos, item) {
-        if(item) {
-          if(! $("div.tooltip")[0])
-            $('<div class="tooltip"></div>').appendTo($('body'));
-          $("div.tooltip")
-            .html(item.datapoint[2] ? item.datapoint[2] : item.datapoint[1])
-            .css( { top: item.pageY - 10,
-                    left: item.pageX + 5,
-                    position: 'absolute',
-                    'z-index': 1000 });
-        }
-        else {
-          $("div.tooltip").remove();
-        }
-      });
-      r.options.legend.container = $(domid + " div.plot-legend");
-      if(!r.options.yaxis) r.options.yaxis = {};
-      if(r.options.yaxis.suffix)
-        r.options.yaxis.tickFormatter = function (val, axis) {
-          return val.toFixed(axis.tickDecimals) + r.options.yaxis.suffix;
-        };
-      var plot = $.plot(placeholder, r.data, r.options);
-}
-function redraw_current_graph(domid) {
-  if(graphinfo.datapoints.length > 0) {
-    $(domid).slideDown("normal");
-    var url = "flot/graph/settings/" + graphinfo.id;
-    $(domid + " .plot-area").html('<div class="centered"><div class="loading">&nbsp;</div></div>');
-    $.getJSON(url, {'cnt':displayinfo.cnt, 'start':displayinfo.start, 'end':displayinfo.end}, function (r) { plot_id(r,domid, function() { redraw_current_graph("#maingraph"); }); });
-  }
-  else {
-    $(domid).slideUp("normal");
-  }
-}
-function update_current_graph(redraw, f) {
-  if(recurse > 0) return;
@@ -84 +39 @@
-             });
-           }
-) redraw_current_graph("#maingraph"
+ && maingraph) maingraph.ReconGraphRefresh({graphid: graphinfo.id}
-           if(f) f(d);
-           recurse--;
@@ -224 +179 @@
-    gtool_add_datapoint(graphinfo.datapoints[i]);
-  }
-
+
+
+
+
+
+
-}
-function fetch_graph_info(id) {
-
+
+
+
-  $("span.blankGraph").click(function() {
-    if(graphinfo.saved || confirm("I will forget the current graph.  Are you sure?"))
@@ -267 +229 @@
-                displayinfo.end = '';
-                $(this).addClass("selected");
-redraw_current_graph("#maingraph"
+maingraph.ReconGraphRefresh({graphid: graphinfo.id, start: time_windows[$(this).html()], end: ''}
-                return false;
-        });
@@ -285 +247 @@
-                        displayinfo.start = start.toUTCString();
-                        displayinfo.end = end.toUTCString();
-redraw_current_graph("#maingraph"
+maingraph.ReconGraphRefresh({graphid: graphinfo.id}
-                        $('#graph_datetool .range a.btn-slide').get(0).innerHTML = formated.join(' - ');
-                }
@@ -300 +262 @@
-        });
-        set_current_graph_id('');
+        maingraph = $('<div></div>').attr("id", "maingraph").ReconGraph({graphid: graphinfo.id, width: 780, height: 400});
+        $("#maingraphHolder").append(maingraph);
-});
-</script>
@@ -335 +299 @@
-
-<div>
-
-
-
-
+
-        </div>
-        <form action="#" name="form4" id="form4" style="margin:1em 0;text-align:center;">

ui/web/htdocs/js/recon.js

@@ -7 +7 @@
-          this.graphinfo = $.extend({}, displayinfo, options||{});
-          if(!this.graphinfo.cnt) this.graphinfo.cnt = this.graphinfo.width / 2;
-this.attr("id", this.graphinfo.graphid)
-    
+if(!this.attr("id")) this.attr("id", this.graphinfo.graphid);
+this
-                               .html(this.graphinfo.title))
-              .append($('<div></div>').addClass("plot-area")
@@ -16 +16 @@
-          return this;
-        },
+      reset:
+        function() {
+          this.graphinfo.graphid = '';
+          if(this.flot_plot) {
+            this.find("h3.graphTitle").html('');
+            this.find("div.plot-legend").html('');
+            this.flot_plot.setData({});
+            this.flot_plot.setupGrid();
+            this.flot_plot.draw();
+          }
+          return this;
+        },
-      refresh:
-
+
+
-          var url = "flot/graph/settings/" + this.graphinfo.graphid;
-          this.find(".plot-area")
@@ -50 +63 @@
-              return val.toFixed(axis.tickDecimals) + r.options.yaxis.suffix;
-            };
-
+this.flot_plot = 
-
-          var hovering;
@@ -87 +100 @@
-  $.fn.extend({ ReconGraph: ReconGraph.init,
-                ReconGraphRefresh: ReconGraph.refresh,
-
+
+
-              });
-})(jQuery);