omf_web 1.0.0 → 1.2.0

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

@@ -1,47 +1,47 @@
-L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart", "graph/js/axis", "#OML.axis"], function () {
+define(["graph/abstract_nv_chart"], function (abstract_nv_chart) {
 
-  OML.scatter_plot = OML.abstract_chart.extend({
+  var scatter_plot = abstract_nv_chart.extend({
     decl_properties: [
-      ['x_axis', 'key', {property: 'x'}], 
-      ['y_axis', 'key', {property: 'y'}], 
-      ['radius', 'int', 10],       
-      ['stroke_width', 'int', 2], 
+      ['x_axis', 'key', {property: 'x'}],
+      ['y_axis', 'key', {property: 'y'}],
+      ['radius', 'int', 10],
+      ['stroke_width', 'int', 2],
       ['stroke_color', 'color', 'black'],
       ['fill_color', 'color', 'orange']
     ],
-    
+
     defaults: function() {
       return this.deep_defaults({
         transition: 400, // Time in msec for transition when elements change
         axis: {
           orientation: 'horizontal'
         }
-      }, OML.scatter_plot.__super__.defaults.call(this));      
-    },    
-    
-    
+      }, scatter_plot.__super__.defaults.call(this));
+    },
+
+
     configure_base_layer: function(vis) {
       var base = this.base_layer = vis.append("svg:g")
                                       .attr("class", "scatterplot")
                                       ;
                  //.attr("transform", "translate(0, " + this.h + ")");
 
-      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');
     },
 
     resize: function() {
-      OML.scatter_plot.__super__.resize.call(this);
+      scatter_plot.__super__.resize.call(this);
       return this;
-    },   
+    },
 
     redraw: function(data) {
       var self = this;
       var o = this.opts;
       var ca = this.widget_area;
-      
+
       var m = this.mapping;
       var x_m = m.x_axis;
       var y_m = m.y_axis;
@@ -56,13 +56,13 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
                           .range([0, ca.h])
                           .nice();
       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 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 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)
@@ -86,10 +86,10 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
       rects.exit()
         .remove()
         ;
-          
+
       this.redraw_axis(data, x_f, y_f);
     },
-    
+
     redraw_axis: function(data, x, y) {
       var self = this;
       var ca = this.widget_area;
@@ -100,7 +100,7 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
         var xAxis = this.xAxis.scale(x);
         this.axis_layer.select('g.x.axis').call(xAxis);
       } else {
-        var xAxis = this.xAxis = OML.line_chart2_axis(oAxis.x).scale(x).orient("bottom").range([0, ca.w]);      
+        var xAxis = this.xAxis = line_chart2_axis(oAxis.x).scale(x).orient("bottom").range([0, ca.w]);
         this.axis_layer
           .append('g')
             .attr("transform", "translate(" + ca.x + "," + (ca.ty + ca.h) + ")")
@@ -108,13 +108,13 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
             .call(xAxis)
             ;
       }
-      
+
       var inv_y = y.range([ca.h, 0]);
       if (this.yAxis) {
         var yAxis = this.yAxis.scale(inv_y);
         this.axis_layer.select('g.y.axis').call(yAxis);
       } else {
-        var yAxis = this.yAxis = OML.line_chart2_axis(oAxis.y).scale(inv_y).orient("left").range([0, ca.h]);
+        var yAxis = this.yAxis = line_chart2_axis(oAxis.y).scale(inv_y).orient("left").range([0, ca.h]);
         this.axis_layer
           .append('g')
             .attr("transform", "translate(" + ca.x + "," + ca.ty + ")")
@@ -122,14 +122,14 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
             .call(yAxis)
             ;
       }
-                 
-      
+
+
     },
-    
-    
+
+
     on_highlighted: function(evt) {
       var els = evt.elements;
-      var piece_id = els[0].id
+      var piece_id = els[0].id;
       var vis = this.chart_layer;
       vis.selectAll("path")
        .filter(function(d) {
@@ -150,17 +150,19 @@ L.provide('OML.scatter_plot', ["graph/js/abstract_chart", "#OML.abstract_chart",
       var vis = this.chart_layer;
       vis.selectAll("path")
        .transition()
-         .style("opacity", 1.0)         
+         .style("opacity", 1.0)
          .delay(0)
-         .duration(300)
+         .duration(300);
       if (evt.source == null) {
         evt.source = this;
         OHUB.trigger("graph.dehighlighted", evt);
       }
     },
-  
-  })
-})
+
+  });
+
+  return scatter_plot;
+});
 
 /*
   Local Variables:

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

@@ -1,25 +1,29 @@
 
-L.provide('jquery.event.drag', ['vendor/jquery/jquery.event.drag.js'], function() {
-//  L.require(['theme/bright/css/slickgrid.css'], function() { // We seem to have a race condition with the CSS file
-    L.provide('slickgrid', [
-                 'vendor/slickgrid/slick.core.js',
-                 'vendor/slickgrid/slick.formatters.js',
-                 'vendor/slickgrid/slick.editors.js',
-                 'vendor/slickgrid/plugins/slick.rowselectionmodel.js',
-                 'vendor/slickgrid/slick.grid.js',
-                 'vendor/slickgrid/slick.dataview.js',
-                 'vendor/slickgrid/controls/slick.pager.js',
-                 'vendor/slickgrid/controls/slick.columnpicker.js',
-                 'theme/bright/css/slickgrid.css'
-    ]);
-//  });
+require.config({
+  shim: {
+   'vendor/slickgrid/slick.formatters': ['vendor/slickgrid/slick.core'],
+   'vendor/slickgrid/slick.editors': ['vendor/slickgrid/slick.core'],
+   'vendor/slickgrid/plugins/slick.rowselectionmodel': ['vendor/slickgrid/slick.core'],
+   'vendor/slickgrid/slick.grid': ['vendor/slickgrid/slick.core'],
+   'vendor/slickgrid/slick.dataview': ['vendor/slickgrid/slick.core'],
+   'vendor/slickgrid/controls/slick.pager': ['vendor/slickgrid/slick.core'],
+   'vendor/slickgrid/controls/slick.columnpicker': ['vendor/slickgrid/slick.core']
+  }
 });
-             
-L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#slickgrid'], function () {
 
-  if (typeof(OML) == "undefined") OML = {};
-  
-  OML.table2 = OML.abstract_widget.extend({
+
+define(["graph/abstract_widget",
+                 'vendor/jquery/jquery.event.drag',
+                 'vendor/slickgrid/slick.formatters',
+                 'vendor/slickgrid/slick.editors',
+                 'vendor/slickgrid/plugins/slick.rowselectionmodel',
+                 'vendor/slickgrid/slick.grid',
+                 'vendor/slickgrid/slick.dataview',
+                 'vendor/slickgrid/controls/slick.pager',
+                 'vendor/slickgrid/controls/slick.columnpicker',
+                 'css!theme/bright/css/slickgrid'], function(abstract_widget) {
+
+  var table2 = abstract_widget.extend({
     defaults: function() {
       return this.deep_defaults({
         // add defaults
@@ -35,17 +39,17 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
           right: 20,
           bottom: 2
         },
-      }, OML.table2.__super__.defaults.call(this));      
-    },    
+      }, table2.__super__.defaults.call(this));
+    },
 
     initialize: function(opts) {
-      OML.table2.__super__.initialize.call(this, opts);
+      table2.__super__.initialize.call(this, opts);
       // var ca = this.widget_area;
       // this.base_el
         // .style('height', ca.h + 'px')
-        // .style('width', ca.w + 'px')        
-        // .style('margin-left', ca.x + 'px')        
-        // .style('margin-top', ca.ty + 'px')        
+        // .style('width', ca.w + 'px')
+        // .style('margin-left', ca.x + 'px')
+        // .style('margin-top', ca.ty + 'px')
         // ;
       $(opts.base_el).focus(function(e) {
         // all your magic resize mojo goes here
@@ -54,29 +58,29 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
       this.init_grid();
       this.update();
     },
-    
+
     resize: function() {
-      OML.table2.__super__.resize.call(this);
+      table2.__super__.resize.call(this);
       // var ca = this.widget_area;
       // this.base_el
         // .style('height', ca.oh + 'px')
-        // .style('width', ca.w + 'px')        
+        // .style('width', ca.w + 'px')
         // .style('margin-left', ca.x + 'px')
-        // .style('margin-right', ca.ow - ca.w - ca.x + 'px') 
-        // .style('margin-top', ca.ty + 'px')        
+        // .style('margin-right', ca.ow - ca.w - ca.x + 'px')
+        // .style('margin-top', ca.ty + 'px')
         // ;
       if (this.grid) {
         this.grid.resizeCanvas();
         //this.grid.setColumns(this.columns);
       }
-        
+
       return this;
-    },   
-    
+    },
+
     redraw: function(data) {
       //this.resize();
-      
-      this.data = data;  
+
+      this.data = data;
       var self = this;
       // Should sort first
       if (this.sort_on_column) {
@@ -85,23 +89,23 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
         data = data.sort(function(a, b) {
           var x = a[sid], y = b[sid];
           var cmp = (x == y ? 0 : (x > y ? 1 : -1));
-          return  asc ? cmp : -1 * cmp;          
+          return  asc ? cmp : -1 * cmp;
         });
       }
       this.sorted_data = data;
-      
+
       this.grid.updateRowCount(); // fixes scroll bar
       this.grid.invalidateAllRows();
       this.grid.render();
     },
-      
+
     init_grid: function() {
       var schema = this.data_source.schema;
       var opts = this.opts;
       var self = this;
-      
+
       var columns = this.init_columns();
-    
+
       // Define function used to get the data.
       //var currentSortCol = { id: "title" };
       var self = this;
@@ -113,8 +117,8 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
       function getLength() {
         return self.sorted_data.length;
       }
-    
-      var topts = this.opts.topts
+
+      var topts = this.opts.topts;
       topts.dataItemColumnValueExtractor = function(item, columnDef) {
         var i = 0;
         return item[columnDef.id];
@@ -135,9 +139,9 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
       // grid.onSelectedRowsChanged.subscribe(function(e, args) {
         // var i = 0;
       // });
-      
+
     },
-    
+
     /*
      * Return an array of columns definitions to be used for the slick grid constructor
      */
@@ -145,10 +149,10 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
       var schema = this.data_source.schema;
       var opts = this.opts;
       var self = this;
-      
+
       var columns;
       if (opts.columns) {
-        var sh = {}; _.each(schema, function(e) { sh[e.name] = e; })
+        var sh = {}; _.each(schema, function(e) { sh[e.name] = e; });
         columns = _.map(opts.columns, function(c) {
           if (typeof c === 'string') {
             c = {field: c};
@@ -159,9 +163,9 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
             name: s.title || s.name,
             width: 0,
             sortable: true,
-          })
+          });
           if (c.format) {
-            c.formatter = self.find_formatter(c.type || s.type, c)
+            c.formatter = self.find_formatter(c.type || s.type, c);
           }
           return c;
         });
@@ -183,21 +187,23 @@ L.provide('OML.table2', ["graph/js/abstract_widget", "#OML.abstract_widget", '#s
         var d_f = d3.time.format(opts.format || "%X");
         return function(r, c, v) {
           var date = new Date(1000 * v);  // 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 (type == 'key') {
         var lm = opts.format;
         return function(r, c, v) {
           var l = lm[v] || ('??-' + v);
           return l;
-        }
+        };
       } else {
         var formatter = d3.format(opts.format);
         return function(r, c, v) {
           return formatter(v);
-        }
+        };
       }
     }
-  })
-})
+  });
+
+  return table2;
+});

data/share/htdocs/js/app.js

@@ -0,0 +1,43 @@
+
+var i = 0;
+require.config({
+    //By default load any module IDs from js/lib
+    baseUrl: '/resource',
+    //except, if the module ID starts with "app",
+    //load it from the js/app directory. paths
+    //config is relative to the baseUrl, and
+    //never includes a ".js" extension since
+    //the paths config could be for a directory.
+    paths: {
+        omf: 'js',
+        vendor: 'vendor',
+        graph: 'graph/js',
+        graph_css: 'graph/css'
+    },
+    shim: {
+      'vendor/jquery/jquery': {
+          //deps: ['jquery'],
+          exports: 'jQuery'
+      },
+    },
+    map: {
+      '*': {
+        'css': 'vendor/require-css/css'
+      }
+    }
+});
+
+// Start the main app logic.
+// requirejs(['vendor/jquery', 'vendor/backbone'],
+  // function($, _) {
+    // //jQuery, canvas and the app/sub module are all
+    // //loaded and can be used here now.
+    // var i = 0;
+// });
+
+require(['css!graph_css/graph'],
+  function(css) {
+    //jQuery, canvas and the app/sub module are all
+    //loaded and can be used here now.
+    var i = 0;
+});