omf_web 1.0.0 → 1.2.0

data/share/htdocs/graph/js/abstract_widget.js

@@ -1,7 +1,4 @@
-
-L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
-
-  if (typeof(OML) == "undefined") OML = {};
+define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
 
   if (typeof(d3.each) == 'undefined') {
     d3.each = function(array, f) {
@@ -15,10 +12,10 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
       return a;
     };
   };
-  
-  
-  OML['abstract_widget'] = Backbone.Model.extend({
-    
+
+
+  var abstract_widget = Backbone.Model.extend({
+
     defaults: function() {
       return {
         base_el: "body",
@@ -34,44 +31,44 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
           x: 0,
           y: 0
         },
-      }     
+      }
     },
-    
+
     //base_css_class: 'oml-chart',
-    
+
     initialize: function(opts) {
       var o = this.opts = this.deep_defaults(opts, this.defaults());
-    
+
       var base_el = o.base_el;
       if (typeof(base_el) == "string") base_el = d3.select(base_el);
       this.base_el = base_el;
-    
+
       this.init_data_source();
       this.process_schema();
       this.resize();
-      
+
       var self = this;
       OHUB.bind('layout.resize', function(e) {
         self.resize();
         self.update();
-      });  
+      });
     },
-    
+
     update: function() {
       if ($(this.opts.base_el).is(':hidden')) {
         return;
       }
-      
+
       var data;
       if ((data = this.data_source.rows()) == null) {
         throw "Missing rows in data source"
       }
       if (data.length == 0) return;
-      
+
       this.redraw(data);
-      
+
     },
-    
+
     resize: function() {
       var o = this.opts;
       var w = o.width;
@@ -87,9 +84,9 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
         var elw = bel.width();
         w = w * elw;
         //w = w * this.base_el[0][0].clientWidth;
-        if (isNaN(w)) w = 800; 
+        if (isNaN(w)) w = 800;
       }
-      
+
       var h = o.height;
       if (h <= 1.0) {
         h = h * w;
@@ -98,30 +95,30 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
 
       return this;
     },
-    
-    
-    _resize_base_el: function(w, h) {  
+
+
+    _resize_base_el: function(w, h) {
       var m = this.opts.margin;
       this.w = w - m.left - m.right; // take away the margins
       this.h = h - m.top - m.bottom;
       this.base_el
         .style('height', this.h + 'px')
-        .style('width', this.w + 'px')        
+        .style('width', this.w + 'px')
         .style('margin-left', m.left + 'px')
-        .style('margin-right', m.right + 'px') 
-        .style('margin-top', m.top + 'px')        
-        .style('margin-bottom', m.bottom + 'px')                
+        .style('margin-right', m.right + 'px')
+        .style('margin-top', m.top + 'px')
+        .style('margin-bottom', m.bottom + 'px')
         ;
     },
-    
-    
+
+
     // Find the appropriate data source and bind to it
     //
     init_data_source: function() {
       var o = this.opts;
       var sources = o.data_sources;
       var self = this;
-      
+
       if (! (sources instanceof Array)) {
         throw "Expected an array"
       }
@@ -130,27 +127,27 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
       }
       this.data_source = this.init_single_data_source(sources[0]);
     },
-    
-    
+
+
     // Find the appropriate data source and bind to it
     //
     init_single_data_source: function(ds_descr) {
-      var ds = OML.data_sources.lookup(ds_descr.stream);
+      var ds = ds_repo.lookup(ds_descr.stream);
       var self = this;
       OHUB.bind(ds.event_name, function() {
         self.update();;
       })
       return ds;
     },
-    
-    
+
+
     process_schema: function() {
       this.schema = this.process_single_schema(this.data_source);
       if (typeof(this.decl_properties) != "undefined") {
         this.mapping = this.process_single_mapping(null, this.opts.mapping, this.decl_properties);
       }
     },
-    
+
     process_single_schema: function(data_source) {
       var self = this;
       var o = this.opts;
@@ -161,11 +158,11 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
       });
       return schema;
     },
-   
+
     process_single_mapping: function(source_name, mapping_decl, properties_decl) {
       var self = this;
       var m = {};
-      var om = mapping_decl || {};      
+      var om = mapping_decl || {};
       _.map(properties_decl, function(a) {
         var pname = a[0]; var type = a[1]; var def = a[2];
         var descr = om[pname];
@@ -182,8 +179,8 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
         throw "Can't provide named stream '" + stream + "'.";
       }
       return this.schema;
-    },  
-    
+    },
+
     /*
      * Return data_source named 'name'.
      */
@@ -192,7 +189,7 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
         throw "Can't provide named stream '" + name + "'.";
       }
       return this.data_source;
-    },  
+    },
 
     create_mapping: function(mname, descr, stream, type, def) {
        var self = this;
@@ -223,7 +220,7 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
        if (schema == undefined) {
          throw "Can't find schema for stream '" + stream + "'.";
        }
-       
+
        if (type == 'index') {
          var key = descr.key;
          if (key == undefined || stream == undefined) {
@@ -234,7 +231,7 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
            throw "Unknown stream element '" + key + "'.";
          }
          var vindex = col_schema.index;
-         
+
          var jstream_name = descr.join_stream;
          if (jstream_name == undefined) {
            throw "Missing join stream declaration in '" + mname + "'.";
@@ -244,15 +241,15 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
            throw "Can't find schema for stream '" + jstream_name + "'.";
          }
          var jstream = this.data_source_for_stream(jstream_name);
-  
+
          var jkey = descr.join_key;
          if (jkey == undefined) jkey = 'id';
-         var jcol_schema = jschema[jkey];       
+         var jcol_schema = jschema[jkey];
          if (jcol_schema == undefined) {
            throw "Unknown stream element '" + jkey + "' in '" + jstream + "'.";
          }
          var index_f = jstream.index_for_column(jcol_schema);
-         
+
          return function(d) {
            var join = d[vindex];
            //var t = jstream.get_indexed_row(jindex, join); //self.get_indexed_table(jstream, jindex);
@@ -282,35 +279,35 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
          }
          var index = col_schema.index;
          switch (type) {
-         case 'int': 
-         case 'float':        
+         case 'int':
+         case 'float':
          case 'key' :
            var scale = descr.scale;
            var min_value = descr.min;
            var max_value = descr.max;
            return function(d) {
              var v = d[index];
-             if (scale != undefined) v = v * scale; 
-             if (min_value != undefined && v < min_value) v = min_value; 
-             if (max_value != undefined && v > max_value) v = max_value; 
+             if (scale != undefined) v = v * scale;
+             if (min_value != undefined && v < min_value) v = min_value;
+             if (max_value != undefined && v > max_value) v = max_value;
              return v;
            };
-         case 'color': 
+         case 'color':
            var color_fname = descr.color;
            if (color_fname == undefined) {
              throw "Missing color function for '" + mname + "'.";
-           } 
+           }
            var color_fp = self.decl_color_func[color_fname];
            if (color_fp == undefined) {
              throw "Unknown color function '" + color_fname + "'.";
-           } 
+           }
            var color_f = color_fp();
            var scale = descr.scale;
            var min_value = descr.min;
            return function(d) {
              var v = d[index];
-             if (scale != undefined) v = v * scale; 
-             if (min_value != undefined && v < min_value) v = min_value; 
+             if (scale != undefined) v = v * scale;
+             if (min_value != undefined && v < min_value) v = min_value;
              var color = color_f(v);
              return color;
            };
@@ -318,14 +315,14 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
            // return function(d) {
              // return d[index];
            // }
-         default:    
+         default:
            throw "Unknown mapping type '" + type + "'";
          }
        }
        var i = 0;
     },
 
-    
+
     // Fill in a given object (and any objects it contains) with default properties.
     // ... borrowed from unerscore.js
     //
@@ -339,7 +336,9 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
       }
       return source;
     },
-    
-    
+
+
   });
+
+  return abstract_widget;
 })

data/share/htdocs/graph/js/axis.js

@@ -1,34 +1,35 @@
 //L.provide('OML.axis', ["graph.css", ["/resource/vendor/d3/d3.js", "/resource/vendor/d3/d3.time.js"]], function () {
-L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {  
+//L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {
+define(["vendor/d3/d3"], function () {
 
-  OML.line_chart2_axis = function(options) {
+  var axis = function(options) {
     if (!options) options = {};
-    
+
     var d3_axis = d3.svg.axis();
 
     var defaults = {
       legend: {
         text: 'DESCRIBE ME',
-        offset: 40 
+        offset: 40
       },
       ticks: {
         // type: 'date',
         // format: '%I:%M', // hour:minutes
         // format: ",.0f" // integers with comma-grouping for thousands.
         transition: 500  // smoothly transition the ticks when they change
-      }      
+      }
     };
 
     var orient = 'bottom';
     var scale;
     var range = [0, 100]; // default range, should be set specifically
     var opts = _.defaults((options || {}), defaults);
-    
+
     // LEGEND
     var ol = options.legend;
     ol = ol ? (typeof(ol) === "string" ? {text: ol} : ol) : {};
-    options.legend = _.defaults(ol, defaults.legend); 
-    
+    options.legend = _.defaults(ol, defaults.legend);
+
     // TICKS
     var ot = options.ticks = _.defaults(options.ticks, defaults.ticks);
     // Check if we need a special formatter for the tick labels
@@ -36,7 +37,7 @@ L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {
       var d_f = d3.time.format(ot.format || "%X");
       d3_axis.tickFormat(function(d) {
         var date = new Date(1000 * d);  // TODO: Implicitly assuming that value is in seconds is most likely NOT a good idea
-        var fs = d_f(date); 
+        var fs = d_f(date);
         return fs;
       });
     } else if (ot.type == 'key') {
@@ -45,14 +46,14 @@ L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {
         var l = lm[d] || ('??-' + d);
         return l;
       });
-      
+
     } else if (ot.format) {
       d3_axis.tickFormat(d3.format(ot.format));
     }
-    
+
     if (count = ot.count)  d3_axis.ticks(count);
-        
-    
+
+
     function axis(selection) {
       selection.each(function(data) {
         var o = opts;
@@ -71,7 +72,7 @@ L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {
           case 'left':
             axisLabel.enter().append('text').attr('class', 'axis_legend')
                 .attr('transform', 'rotate(-90)')
-                .attr('y', -1 * ol.offset); 
+                .attr('y', -1 * ol.offset);
             axisLabel
                 .attr('x', -1 * (range[1] - range[0]) / 2);
                 break;
@@ -80,52 +81,56 @@ L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {
         axisLabel
             .text(function(d) { return d });
 
-        // TICKS  
+        // TICKS
         var ot = opts.ticks;
         var tl = ot.transition ? layer.transition().duration(ot.transition) : layer;
         tl.call(d3_axis);
-        
+
         // d3.select(this).selectAll('line.tick')
           // //.filter(function(d) { return !parseFloat(d) })
           // .filter(function(d) {
-            // //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique 
+            // //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique
             // var v = !parseFloat(Math.round(d*100000)/1000000);
-            // return v; 
-          // }) 
+            // return v;
+          // })
           // .classed('zero', true);
       });
       return axis;
-    }      
-    
+    }
+
     axis.orient = function(_) {
       if (!arguments.length) return orient;
       orient = _;
       d3_axis.orient(orient);
       return axis;
     };
-    
+
     axis.range = function(_) {
       if (!arguments.length) return range;
       range = _;
       return axis;
     };
-    
+
     axis.scale = function(_) {
       if (!arguments.length) return scale;
       scale = _;
       d3_axis.scale(scale);
       return axis;
     };
-    
+
     axis.tick_values = function(_) {
       if (!arguments.length) return scale;
       values = _;
       d3_axis.tickValues(values);
       return axis;
     };
-    
+
     return axis;
   }
+
+  return function(opts) {
+    return axis(opts);
+  }
 })
 
 /*

data/share/htdocs/graph/js/barchart_brush.js

@@ -1,58 +1,58 @@
 /*
- * Draws a simple barchart wiht a slection brush.
- * 
+ * Draws a simple barchart with a selection brush.
+ *
  * Most code was copied from http://square.github.com/crossfilter/ and all that
  * credit goes to Mike Bostok.
  */
 
 
-L.provide('OML.barchart_brush', ["graph/js/abstract_chart", "#OML.abstract_chart"], function () {
+define("graph/js/abstract_chart"], function (abstract_chart) {
 
-  OML.barchart_brush = OML.abstract_chart.extend({
+  var barchart_brush = abstract_chart.extend({
     decl_properties: [
-      ['key', 'int', {property: 'key'}], 
-      ['value', 'float', {property: 'value'}], 
-      // ['x_axis', 'key', {property: 'x'}], 
-      // ['y_axis', 'key', {property: 'y'}], 
-      // ['group_by', 'key', {property: 'id', optional: true}],             
-      ['stroke_width', 'int', 2], 
+      ['key', 'int', {property: 'key'}],
+      ['value', 'float', {property: 'value'}],
+      // ['x_axis', 'key', {property: 'x'}],
+      // ['y_axis', 'key', {property: 'y'}],
+      // ['group_by', 'key', {property: 'id', optional: true}],
+      ['stroke_width', 'int', 2],
       ['stroke_color', 'color', 'white'],
       ['fill_color', 'color', 'blue']
     ],
-    
+
     defaults: function() {
       return this.deep_defaults({
         relative: false,   // If true, report percentage
         axis: {
           orientation: 'horizontal'
         }
-      }, OML.barchart_brush.__super__.defaults.call(this));      
+      }, barchart_brush.__super__.defaults.call(this));
     },
-    
+
     configure_base_layer: function(vis) {
       var base = this.base_layer = vis.append("svg:g")
                                       .attr("class", "barchart")
                                       ;
-      var ca = this.chart_area; 
+      var ca = this.chart_area;
       this.legend_layer = base.append("svg:g");
       this.chart_layer = base.append("svg:g");
       this.axis_layer = base.append('g');
     },
-    
+
     redraw: function(data) {
-        
-    }    
-  }) // end of barchart_brush    
+
+    }
+  }) // end of barchart_brush
 
 
 
-  OML._barchart_brush = function barChart() {
-    if (!OML._barchart_brush.id) OML._barchart_brush.id = 0;
+  var _barchart_brush = function barChart() {
+    if (!_barchart_brush.id) _barchart_brush.id = 0;
 
     var margin = {top: 10, right: 10, bottom: 20, left: 10},
         x,
         y = d3.scale.linear().range([100, 0]),
-        id = OML._barchart_brush.id++,
+        id = _barchart_brush.id++,
         axis = d3.svg.axis().orient("bottom"),
         brush = d3.svg.brush(),
         brushDirty,
@@ -237,4 +237,6 @@ L.provide('OML.barchart_brush', ["graph/js/abstract_chart", "#OML.abstract_chart
 
     return d3.rebind(chart, brush, "on");
   }
+
+  return barchart_brush;
 });

data/share/htdocs/graph/js/code_mirror.js

@@ -1,7 +1,7 @@
-L.provide('OML.code_mirror', ["graph/js/abstract_widget", "#OML.abstract_widget"], function () {
+define(["graph/abstract_widget"], function (abstract_widget) {
+
+  var code_mirror = abstract_widget.extend({
 
-  OML.code_mirror = OML.abstract_widget.extend({
-    
     defaults: function() {
       return this.deep_defaults({
         height: 1.0,
@@ -11,33 +11,33 @@ L.provide('OML.code_mirror', ["graph/js/abstract_widget", "#OML.abstract_widget"
           right: 20,
           bottom: 10
         },
-      }, OML.code_mirror.__super__.defaults.call(this));      
-    },    
-    
-    
+      }, code_mirror.__super__.defaults.call(this));
+    },
+
+
     initialize: function(opts) {
-      OML.code_mirror.__super__.initialize.call(this, opts);
+      code_mirror.__super__.initialize.call(this, opts);
       this.code_mirror = null;
       this.update();
     },
-    
+
     update: function() {
       var o = this.opts;
-      
+
       if ($(o.base_el).is(':hidden')) {
         this.code_mirror = null;
         return;
       }
 
-      // TODO: When we create a code mirror object and then make the 
-      // encompassing element invisible and visible again, things seem 
-      // go astray. Brute force solution is to recreate the editor on every 
+      // TODO: When we create a code mirror object and then make the
+      // encompassing element invisible and visible again, things seem
+      // go astray. Brute force solution is to recreate the editor on every
       // update.
-      
+
       if (!this.code_mirror) {
         var edit_el = $(o.edit_el);
         edit_el.empty(); // remove old instances if any
-        
+
         CodeMirror.modeURL = "/resource/vendor/codemirror/mode/%N/%N.js";
 
         var self = this;
@@ -60,22 +60,22 @@ L.provide('OML.code_mirror', ["graph/js/abstract_widget", "#OML.abstract_widget"
         CodeMirror.autoLoadMode(cm, o.mode);
 
         var hlLine = cm.setLineClass(0, "activeline");
-        
+
         this.on_changed(this.code_mirror, null);
         this.code_mirror.focus();
       }
       this._update_widget_height(o);
       this.code_mirror.refresh();
     },
-    
+
     _update_widget_height: function(opts) {
       var s_el = $(opts.base_el + " .CodeMirror-scroll");
-      s_el.css('height', this.h);      
+      s_el.css('height', this.h);
     },
-    
+
     on_changed: function(editor, change) {
       if (editor == undefined) return;
-      
+
       var o = this.opts;
       var h = editor.historySize();
 
@@ -84,41 +84,43 @@ L.provide('OML.code_mirror', ["graph/js/abstract_widget", "#OML.abstract_widget"
       var redo = h.redo > 0;
       $(o.base_el + '_save_a').fadeTo('fast', save ? 1.0 : 0.3);
       $(o.base_el + '_undo_a').fadeTo('fast', undo ? 1.0 : 0.3);
-      $(o.base_el + '_redo_a').fadeTo('fast', redo ? 1.0 : 0.3);            
+      $(o.base_el + '_redo_a').fadeTo('fast', redo ? 1.0 : 0.3);
     },
-    
+
     on_save_pressed: function() {
       var o = this.opts;
       var self = this;
       var cm = this.code_mirror;
-      
+
       $.ajax({
         url: o.save_url,
         data: {content: cm.getValue()},
         type: 'POST'
-      }).done(function() { 
+      }).done(function() {
         cm.clearHistory();
         self.on_changed(cm, null);
         OHUB.trigger('content.changed.' + o.content_id, {});
       });
     },
-    
+
     on_undo_pressed: function() {
       this.code_mirror.undo();
     },
-    
+
     on_redo_pressed: function() {
       this.code_mirror.redo();
     },
 
     resize: function() {
-      OML.code_mirror.__super__.resize.call(this);
-      var i = 0;      
+      code_mirror.__super__.resize.call(this);
+      var i = 0;
     },
-    
+
     init_data_source: function() {},
     process_schema: function() {},
-        
-  }) /* end of OML.code_mirror */
-  
-}) /* end of L.provide */
+
+  }); /* end of code_mirror */
+
+  return code_mirror;
+
+});