Changeset fb2f0f75ce45f4bf8e9bf60cb6cf505976bca9ff

Timestamp:

10/06/08 18:51:41 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[646f05152343c6ecf678db40bf4debef24b65815]

git-author:

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

Message:

more progress... worksheet prototyping, no data backend yet, refs #22

Files:

• ui/web/htdocs/.htaccess (modified) (1 diff)
• ui/web/htdocs/css/style.css (modified) (3 diffs)
• ui/web/htdocs/graph_controls.inc (modified) (6 diffs)
• ui/web/htdocs/images/jquery-ajax-loader.gif (added)
• ui/web/htdocs/index.php (modified) (4 diffs)
• ui/web/htdocs/json_graph_flot.php (modified) (2 diffs)
• ui/web/htdocs/search_controls.inc (modified) (1 diff)
• ui/web/htdocs/worksheet_controls.inc (modified) (1 diff)
• ui/web/htdocs/worksheet_info.php (added)
• ui/web/htdocs/worksheet_panel.inc (added)
• ui/web/lib/Reconnoiter_DB.php (modified) (3 diffs)
• ui/web/lib/Reconnoiter_DataContainer.php (modified) (2 diffs)
• ui/web/lib/Reconnoiter_DataSet.php (modified) (1 diff)
• ui/web/lib/Reconnoiter_flot_Driver.php (modified) (2 diffs)

ui/web/htdocs/.htaccess

@@ -3 +3 @@
-RewriteRule ^json/ds/([^/]+)/([^/]+)/([^/]+)/([^/]+)$ datapoint_browse_json.php?l1=$1&l2=$2&l3=$3&l4=$4 [PT,QSA]
-RewriteRule ^json/ds/([^/]+)/([^/]+)/([^/]+)/([^/]+)/([^/]+)$ datapoint_browse_json.php?l1=$1&l2=$2&l3=$3&l4=$4&l5=$5 [PT,QSA]
+RewriteRule ^json/worksheet/info/([^/]*)$ worksheet_info.php?id=$1 [PT,QSA]
-RewriteRule ^json/graph/info/([^/]*)$ graph_info.php?id=$1 [PT,QSA]
-RewriteRule ^json/graph/store$ graph_store.php [PT,QSA]

ui/web/htdocs/css/style.css

@@ -43 +43 @@
-z-index:200;
-} 
-;overflow:auto;width:100%
+px;padding:1em;overflow:auto
-#content {
-background:#FFF;
@@ -248 +248 @@
-#graphlist ul li ul li a em{color:#82787b;padding-left:3px;}
-
+div.plot-area { height: 180px; width: 380px; }
+div.plot-area div.centered{
+  height: 180px; width: 380px;
+  display: table-cell;vertical-align:middle;text-align:center;
+}
+div.plot-area div.centered .loading {
+  background:url(../images/jquery-ajax-loader.gif) top center no-repeat;
+  height:25px;width:380px;
+}
+
+div.plot-legend table { height: 4em; }
+div.plot-legend td.legendLabel { padding: 0 0.5em; }
+
-/* worksheet list */
-#worksheetlist {height:450px;overflow:auto;}
@@ -254 +267 @@
-#worksheetlist ul li a {background:url(../images/icon-worksheet.png) 0 1px no-repeat;padding-left:15px;}
-#worksheetlist ul li.selected {background:#e6e4e5 /*url(../images/icon-worksheet.png) 0 3px no-repeat*/;display:block;}
+
+ul#worksheet-graphs {
+}
+ul#worksheet-graphs li {
+  float:left;
+  list-style:none;
+  margin:1.5em 1em 0 0;
+}
-
-/******* GRAPH CONTROLS *******/

ui/web/htdocs/graph_controls.inc

@@ -12 +12 @@
-}
-var recurse = 0;
-
-"#maingraph
+, domid
+domid + "
-      placeholder.bind("plotselected", function (event, ranges) {
+        alert(ranges.xaxis.from + " -> " + ranges.xaxis.to);
-        plot = $.plot(placeholder, data,
-                    $.extend(true, {}, options, {
@@ -20 +21 @@
-                             }));
-      });
-
+
+
+
+
+
+
-      var plot = $.plot(placeholder, r.data, r.options);
-}
-
+domid
-  if(graphinfo.datapoints.length > 0) {
-"#maingraph"
+domid
-    var url = "flot/graph/settings/" + graphinfo.id;
-plot_id
+function (r) { plot_id(r,domid); }
-  }
-  else {
-"#maingraph"
+domid
-  }
-}
@@ -56 +62 @@
-             });
-           }
-
+"#maingraph"
-           if(f) f(d);
-         }, 'json');
@@ -146 +152 @@
-    gtool_add_datapoint(graphinfo.datapoints[i]);
-  }
-
+"#maingraph"
-}
-function fetch_graph_info(id) {
@@ -189 +195 @@
-                displayinfo.end = '';
-                $(this).addClass("selected");
-
+"#maingraph"
-                return false;
-        });
@@ -207 +213 @@
-                        displayinfo.start = start.toUTCString();
-                        displayinfo.end = end.toUTCString();
-
+"#maingraph"
-                        $('#range a.btn-slide').get(0).innerHTML = formated.join(' - ');
-                }

ui/web/htdocs/index.php

@@ -39 +39 @@
-   $(".accordion span:last").slideDown();
-
+   $("div#container div").eq(1).slideUp();
+   $("div#container div:last").slideDown();
+
-   $(".accordion h3").click(function(){
-       $(this).next("span").slideToggle("normal")
@@ -44 +47 @@
-       $(this).toggleClass("active");
-       $(this).siblings("h3").removeClass("active");
+       $(this).siblings("h3").each(function(e) {
+         $("#" + $(this).attr("id") + "_panel").slideUp("fast");
+       });
+       if($(this).hasClass("active"))
+         $("#" + $(this).attr("id") + "_panel").slideDown("fast");
+       else
+         $("#" + $(this).attr("id") + "_panel").slideUp("fast");
-   });
-
@@ -96 +106 @@
-<!-- alert / Remove this when new script is made -->
-<script type="text/javascript">
-function disp_alert()
-{
-alert("display the correct graph")
-}
-function MM_jumpMenu(targ,selObj,restore){ //v3.0
-  eval(targ+".location='"+selObj.options[selObj.selectedIndex].value+"'");
@@ -124 +130 @@
-<div id="container">
-        <div id="content">
-
-
-
-
-
-
-
-
+
+
+
+
-                <?php include('graph_controls.inc') ?>
-                </div><!-- end main -->

ui/web/htdocs/json_graph_flot.php

@@ -42 +42 @@
-$options = array(
-  'xaxis' => array ( 'mode' => 'time' ),
-
+
+
-  'selection' => array ( 'mode' => 'x' ),
-  'shadowSize' => 0,
@@ -51 +52 @@
-  'options' => $options,
-  'title' => $driver->title() . '',
-  'suffix' => $driver->autounit() . ''
-));
-

ui/web/htdocs/search_controls.inc

@@ -1 @@
->Search Data
+ id="graph_controls">Graph Controls
-                <span class="search">
-                        <div class="tabs">

ui/web/htdocs/worksheet_controls.inc

@@ -1 @@
-
+ id="worksheet_controls"
-                <span class="worksheet">
-                        <div id="searchform" style="margin:1em 0 1em 0;padding-bottom:1em;border-bottom: solid 1px #c4c4c4;">

ui/web/lib/Reconnoiter_DB.php

@@ -101 +101 @@
-                           using (sid,metric_name,metric_type)
-                           where ts_search_all @@ to_tsquery(query)))",
-
+ json,
-              to_char(last_update, 'YYYY/mm/dd') as last_update
-         from prism.saved_graphs,
@@ -242 +242 @@
-    return $rv;
-  }
-
+groupname = 'left', $
-    // This sums the sets and returns the XX percentile bucket.
-    if(!is_array($arr)) return array();
@@ -251 +251 @@
-      $nonnull = 0;
-      foreach ($arr as $sets) {
+        if($sets->groupname() != $groupname) continue;
-        $value = $sets->data($ts, $attr);
-        if($value != "") $nonnull = 1;

ui/web/lib/Reconnoiter_DataContainer.php

@@ -45 +45 @@
-      new Reconnoiter_DataSet($uuid, $name, $derive, $expr,
-                              $this->start(), $this->end(), $this->cnt());
+    $this->sets["$uuid-$name"]->groupname($attrs['axis']);
-    $this->sets_config["$uuid-$name"] = is_array($attrs) ? $attrs : array();
-    if(!isset($this->master_set)) $this->master_set = $this->sets["$uuid-$name"];
@@ -92 +93 @@
-    switch($this->units) {
-      case 0.000000001: return 'n';
+      case '1.0E-6':
-      case 0.000001: return 'u';
-      case 0.001: return 'm';

ui/web/lib/Reconnoiter_DataSet.php

@@ -6 +6 @@
-  public $data;
-  protected $expr;
+  protected $groupname;
-  function __construct($uuid, $name, $derive, $expr, $start, $end, $cnt = 400) {
-    $db = Reconnoiter_DB::getDB();
-    $this->data = $db->get_data_for_window($uuid, $name, $start, $end, $cnt, $derive);
-    $this->expr = $expr;
+  }
+  function groupname($gn = null) {
+    if(isset($gn)) $this->groupname = $gn;
+    return $this->groupname;
-  }
-  function points() {

ui/web/lib/Reconnoiter_flot_Driver.php

@@ -13 +13 @@
-    return parent::defaultChangeSetAttrs($uuid, $name, $derive, $attrs);
-  }
+  function graphcolors() {
+    $c = array();
+    foreach($this->sets as $name => $set) {
+      $c[] = $this->sets_config[$name]['color'];
+    }
+    foreach($this->guides as $name => $value) {
+      $c[] = $this->guides_config[$name]['color'];
+    }
+    return $c;
+  }
-  function graphdata() {
-    $a = array();
@@ -21 +31 @@
-        'data' => $this->graphdataset($set, $this->sets_config[$name]),
-        'yaxis' => ($this->sets_config[$name]['axis'] == 'right') ? 2 : 1,
-8
+3
-      );
-    }