omf_web 0.9.6 → 0.9.7

data/share/htdocs/graph/js/line_chart3.js

@@ -44,6 +44,8 @@ L.provide('OML.line_chart3', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_ch
         // .showValues(opts.show_values)
         // .margin(opts.margin)
         // ;
+        
+      this.opts.transition_duration = 0; // force no smooth transition
       this._configure_xy_axis(opts, chart)
     },
         

data/share/htdocs/graph/js/map2.js

@@ -51,8 +51,8 @@ function onMapLoaded() {
                           .attr('id', map_el)
                           ;
         var node = map_layer.node();
-        var center = opts.map_center || [151.197189, -33.895508];
-        var zoom = opts.zoom;
+        var center = opts.map.center || [151.197189, -33.895508];
+        var zoom = opts.map.zoom;
         if (zoom == undefined) zoom = 17;
         var map = this.map = new google.maps.Map(node, {
           zoom: zoom,
@@ -133,7 +133,7 @@ function onMapLoaded() {
           return (typeof m === "function") ? m(d.value) : m;
         }
         
-        var data = d3.entries(this.data_source.events);
+        var data = d3.entries(this.data_source.rows());
         this.draw_layer.selectAll('.marker')
           .data(data)
             .attr("cx", x_f) 

data/share/htdocs/graph/js/network2.js

@@ -10,7 +10,12 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
                ['stroke_width', 'int', 1], 
                ['stroke_color', 'color', 'black'], 
                ['x', 'int', 10],
-               ['y', 'int', 10]
+               ['y', 'int', 10],
+               ['label_text', 'key', {property: 'name'}], 
+               ['label_font', 'string', null], 
+               ['label_size', 'int', 16],                
+               ['label_color', 'color', 'white'], 
+               
               ],
       links:  [['key', 'key', {property: 'id'}], 
                ['stroke_width', 'int', 2], 
@@ -59,8 +64,8 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
             ss = { name: ss };
           }
           var prefix = ss.name;
-          var sn = {}; for (var p in ss) { sn[p] = ss[p]; }; sn.name = prefix + '_nodes';
-          var sl = {}; for (var p in ss) { sl[p] = ss[p]; }; sl.name = prefix + '_links';
+          var sn = {}; for (var p in ss) { sn[p] = ss[p]; }; sn.name = prefix + '/nodes';
+          var sl = {}; for (var p in ss) { sl[p] = ss[p]; }; sl.name = prefix + '/links';
           sources = [
             {name: 'nodes', stream: sn},
             {name: 'links', stream: sl},
@@ -204,20 +209,29 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
           ;
 
       
+      function node_f(sel) {
+        sel.attr("cx", function(d) { return x(nmapping.x(d)) }) 
+          .attr("cy", function(d) { return y(nmapping.y(d)) })
+          .attr("r", nmapping.radius)
+          .style("fill", nmapping.fill_color)
+          .style("stroke", nmapping.stroke_color)
+          .style("stroke-width", nmapping.stroke_width)
+          ; 
+      }
       var node = this.graph_layer.selectAll("circle.node")
                         .data(ndata, function(d) {
                             return nmapping.key(d);
                             });
                         //.data(d3.values(ndata));
                         //function(d) { return d.time; }
-      node
-        .attr("cx", function(d) { return x(nmapping.x(d)) }) 
-        .attr("cy", function(d) { return y(nmapping.y(d)) })
-        .attr("r", nmapping.radius)
-        .style("fill", nmapping.fill_color)
-        .style("stroke", nmapping.stroke_color)
-        .style("stroke-width", nmapping.stroke_width)
-        ;
+      var enx = node.call(node_f);
+      // node.enter().append("svg:circle")
+        // .call(node_f)
+        // .attr("fixed", true)
+        // .transition()
+          // .attr("r", nmapping.radius)
+          // .delay(0)
+        // ;
       var en = node.enter().append("svg:circle");
       en.attr("class", "node")
         .attr("cx", function(d) { return x(nmapping.x(d)) }) 
@@ -231,7 +245,25 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
           .attr("r", nmapping.radius)
           .delay(0)
         ;
-      this._set_node_interaction_mode(en);
+      this._set_node_interaction_mode(node);
+        
+      function label_f(sel) {
+        sel.attr("class", "node_label")
+          .attr('dy', '0.4em')
+          .attr("x", function(d) { return x(nmapping.x(d)) }) 
+          .attr("y", function(d) { return y(nmapping.y(d)) })
+          .attr('text-anchor', 'middle')
+          .style("fill", nmapping.label_color)
+          .style("font-size", nmapping.label_size)        
+          .text(function(d) { return nmapping.label_text(d); });
+      }    
+      var label = this.graph_layer.selectAll("text.node_label")
+                        .data(ndata, function(d) {
+                            return nmapping.key(d);
+                            });
+      label.call(label_f);
+      label.enter().append("svg:text").call(label_f);
+
     },
     
     _set_link_interaction_mode: function(le) {
@@ -267,7 +299,7 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
       } else {
         this._render_selected_link(id);      
         this._render_selected_node('_NONE_');
-        this._report_selected(id, 'links');
+        this._report_selected(id, 'links', d);
       }
     },
     
@@ -335,7 +367,7 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
     _on_node_selected: function(d) {
       var key_f = this.mapping.nodes.key;
       var id = key_f(d);      
-      var msg = {id: id, type: 'node', source: this, data_source: this.data_source.nodes};
+      //var msg = {id: id, type: 'node', source: this, data_source: this.data_source.nodes};
 
       if (this.selected_node == id) {
         // if same link is clicked twice, unselect it
@@ -344,7 +376,7 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
       } else {
         this._render_selected_link('_NONE_');      
         this._render_selected_node(id);
-        this._report_selected(id, 'nodes');
+        this._report_selected(id, 'nodes', d);
       }
     },
     
@@ -386,16 +418,16 @@ L.provide('OML.network2', ["graph/js/abstract_chart", "#OML.abstract_chart"], fu
          
     },
     
-    _report_selected: function(selected_id, type) {
+    _report_selected: function(selected_id, type, datum) {
       var ds = this.data_source[type];
-      var msg = {id: selected_id, type: type, source: this, data_source: ds};
+      var msg = {id: selected_id, type: type, source: this, data_source: ds, datum: datum};
       OHUB.trigger("graph.selected", msg);          
       OHUB.trigger("graph." + ds.name + ".selected", msg);  
     },    
 
-    _report_deselected: function(selected_id, type) {
+    _report_deselected: function(selected_id, type, datum) {
       var ds = this.data_source[type];
-      var msg = {id: selected_id, type: type, source: this, data_source: ds};
+      var msg = {id: selected_id, type: type, source: this, data_source: ds, datum: datum};
       OHUB.trigger("graph.deselected", msg);          
       OHUB.trigger("graph." + ds.name + ".deselected", msg);  
     }    

data/share/htdocs/graph/js/scatter_plot.js

@@ -58,8 +58,12 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
       var r_f = typeof(r_m) != 'function' ? d3.functor(r_m) : r_m;
       var w_f = typeof(r_m) != 'function' ? (2 * r_m) : function(d) { return 2 * r_m(d); }
                 
-      var x = function(d) { return x_f(x_m(d)) + ca.x - r_f(d); };
-      var y = function(d) { return ca.ty + ca.h - y_f(y_m(d)) - r_f(d); };
+      var x = function(d) { 
+        return x_f(x_m(d)) + ca.x - r_f(d); 
+      };
+      var y = function(d) { 
+        return ca.ty + ca.h - y_f(y_m(d)) - r_f(d); 
+      };
       var rects = this.chart_layer.selectAll("rect").data(data);
       rects.transition().duration(o.transition)
         .attr("x", x)

data/share/htdocs/graph/js/table2.js

@@ -168,9 +168,12 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
         var i = 0;
       } else {
         columns = _.map(schema, function(col) {
-                        var i = 0;
                         return { id: col.index, name: col.title, field: col.name, width: 0, sortable: true };
-                      })
+                    });
+        // Remove the leading __id__ column
+        if (columns[0].field == '__id__') {
+          columns.splice(0, 1);
+        }
       }
       return columns;
     },

data/share/htdocs/js/data_source2.js

@@ -161,13 +161,35 @@ OML.data_source = function(opts) {
       });          
     } else {
       // need to append to 'rows' as it's referenced in other closures
-      _.each(msg.rows, function(r) { rows.push(r) });
-      var chop = msg.offset - offset;
-      if (offset >= 0 && chop > 0) {
-        rows = _.rest(rows, chop);
+      // _.each(msg.rows, function(r) { rows.push(r) });
+      // var chop = msg.offset - offset;
+      // if (offset >= 0 && chop > 0) {
+        // rows = _.rest(rows, chop);
+      // }
+      switch (msg.action) {
+        case 'added': 
+          _.each(msg.rows, function(r) { rows.push(r) });
+          break;
+        case 'removed':
+          // This could most likely be made a bit faster.
+          _.each(msg.rows, function(row) {
+            var id = row[0]; // first column is ALWAYS a unique row id
+            var l = rows.length;
+            var row_no;
+            for (row_no = 0; row_no < l; row_no++) {
+              if (rows[row_no][0] == id) break;
+            }
+            if (row_no < l) {
+              rows.splice(row_no, 1);
+            } else {
+              var xxx = 0; // Removing non existing row
+            }
+          });
+          break;
+        default:
+          throw "Unknown message action '" + msg.action + "'.";
       }
     }
-    offset = msg.offset;
       
     update_indexes();
     var evt = {data_source: data_source};
@@ -183,7 +205,7 @@ OML.data_source = function(opts) {
     // Reset state
     rows = [];
     update_indexes();
-    sm = {col_name: active_slice_col_name, col_value: col_value}
+    var sm = {col_name: active_slice_col_name, col_value: col_value}
     send_server_msg('request_slice', {slice: sm})
   }
   var active_slice_col_name = null;
@@ -269,8 +291,18 @@ OML.data_source = function(opts) {
       var evt_name = so.event.name;
       if (! evt_name) 
         throw "Missing event name in slice definition for data source '" + name + "'.";
-      OHUB.bind(evt_name, function(evt) {
-        set_slice_column(evt.id);        
+      OHUB.bind(evt_name, function(msg) {
+        var schema = msg.schema || msg.data_source.schema;
+        
+        var key = so.event.key;
+        var col = _.find(schema, function(cd) { return cd.name == key });
+        if (col) {
+          var event = msg.datum;
+          var col_id = event[col.index];        
+          if (col_id) {
+            set_slice_column(col_id);        
+          }
+        }
       })
     }
   }

data/share/htdocs/js/mustache.js

@@ -0,0 +1,29 @@
+L.provide('OML.mustache', ["vendor/mustache/mustache.js", 'vendor/bootstrap/css/bootstrap.css'], function () {
+
+  if (typeof(OML) == "undefined") OML = {};
+
+  OML['mustache'] = function(opts) {
+    
+    var moustache = {
+      version: "0.1",
+    }
+    
+    var template_url = opts.template;
+    if (! template_url) {
+      throw "Missing template declaration in mustache widget";
+    }
+    var context = {};
+    var el = $('#' + opts.base_id);
+    
+    $.ajax({
+      url: '/resource/' + template_url,
+      type: 'get'
+    }).done(function(template) {
+      var html = Mustache.to_html(template, context);
+      el.html(html);
+      var i = 0;
+    }) 
+
+    return moustache;
+  }
+})

data/share/htdocs/theme/abstract/abstract.js

@@ -2,7 +2,7 @@ L.baseURL = "/resource";
 OML = {
   data_sources: {},
   widgets: {},
-  
+  window_size: {width: null, height: null}
 };
   
 var OHUB = {};
@@ -10,6 +10,13 @@ _.extend(OHUB, Backbone.Events);
 
 $(window).resize(function(x) {
   var w = $(window);
-  OHUB.trigger('window.resize', {width: w.width(), h: w.height()});
-  OHUB.trigger('layout.resize', {});
+  var width = w.width();
+  var height = w.height();
+  var current = OML.window_size;
+  
+  if (current.width != width || current.height != height) {
+    current.width = width; current.height = height;
+    OHUB.trigger('window.resize', current);
+    OHUB.trigger('layout.resize', {});
+  }
 });      

data/share/htdocs/vendor/mustache-0.7.0/CHANGES

@@ -0,0 +1,21 @@
+= 0.7.0 / 10 Sep 2012
+
+  * Rename Renderer => Writer.
+  * Allow partials to be loaded dynamically using a callback (thanks @TiddoLangerak
+    for the suggestion).
+  * Fixed a bug with higher-order sections that prevented them from being
+    passed the raw text of the section from the original template.
+  * More concise token format. Tokens also include start/end indices in the
+    original template.
+  * High-level API is consistent with the Writer API.
+  * Allow partials to be passed to the pre-compiled function (thanks @fallenice).
+  * Don't use eval (thanks @cweider).
+
+= 0.6.0 / 31 Aug 2012
+
+  * Use JavaScript's definition of falsy when determining whether to render an
+    inverted section or not. Issue #186.
+  * Use Mustache.escape to escape values inside {{}}. This function may be
+    reassigned to alter the default escaping behavior. Issue #244.
+  * Fixed a bug that clashed with QUnit (thanks @kannix).
+  * Added volo support (thanks @guybedford).

data/share/htdocs/vendor/mustache-0.7.0/LICENSE

@@ -0,0 +1,10 @@
+The MIT License
+
+Copyright (c) 2009 Chris Wanstrath (Ruby)
+Copyright (c) 2010 Jan Lehnardt (JavaScript)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.