v8.8 release (part2)

add flot curverLines support and example use, allow loading
vars/functions in userMetrics, beautify `userMetrics/_example.js`

Author: LowPowerLab

gateway.js

@@ -75,13 +75,21 @@ try {
   {
     fs.readdirSync(__dirname + '/' + userMetricsDir).forEach(function(file) {
       if (file.match(/\.js$/) !== null) {
-        var name = file.replace('.js', '');
-        console.info('LOADING USER METRICS MODULE [' + name + ']');
+        console.info('LOADING USER METRICS MODULE [' + file + ']');
         try {
           var tmp = require(__dirname + '/' + userMetricsDir + '/' + file);
-          metricsDef = merge(true, metricsDef, tmp);
+          metricsDef.metrics = merge(true, metricsDef.metrics, tmp.metrics);
+          metricsDef.motes = merge(true, metricsDef.motes, tmp.motes);
+          metricsDef.events = merge(true, metricsDef.events, tmp.events);
+          delete tmp.metrics;
+          delete tmp.motes;
+          delete tmp.events;
+          metricsDef = merge(true, metricsDef, tmp); //merge anything else (properties, variables, objects, functions)
+          //console.info('USER METRICS MERGE RESULT V: ' + JSON.stringify(metricsDef.metrics.V)); //verify that a custom metric was loaded
+          //console.info('USER METRICS MERGE RESULT VAR: ' + JSON.stringify(metricsDef.ONEDAYHOURS)); //verify that a custom variable was loaded
+          //console.info('USER METRICS MERGE RESULT FUNC: ' + metricsDef.secondsInOneDay.toString()); //verify that a custom function was loaded
         } catch (ex) {
-          console.error('FAIL LOADING USER METRICS MODULE ['+ name + ']: ' + ex.message);
+          console.error('FAIL LOADING USER METRICS MODULE ['+ file + ']: ' + ex.message);
         }
       }
     });

userMetrics/_example.js

@@ -1,5 +1,66 @@
 /*this sample metric will override that which is already defined in main metrics.js*/
 /*you can redefine defaults or write your own new custom metrics in 1 or more files in this folder, separate them as you'd like - they all get merged together when the app loads*/
 exports.metrics = {
-  V : { name:'V', regexp:/(?:V?BAT|VOLTS|V)\:([\d\.]+)v?/i, value:'', unit:'v', graph:1, graphOptions:{ legendLbl:'VOLTZ!', lines: { fill:true, lineWidth:1 }, yaxis: { min: 0, autoscaleMargin: 0.5 }}}
+  V:
+  {
+    name: 'V',
+    regexp: /(?:V?BAT|VOLTS|V)\:([\d\.]+)v?/i,
+    value: '',
+    unit: 'v',
+    graph: 1,
+    graphOptions:
+    {
+      legendLbl: 'VOLTZ!',
+      lines:
+      {
+        fill: true,
+        lineWidth: 1
+      },
+      yaxis:
+      {
+        min: 0,
+        autoscaleMargin: 0.25
+      }
+    }
+  },
+  H:
+  {
+    name: 'H',
+    regexp: /H\:([\d\.]+)/i,
+    value: '',
+    unit: '%',
+    pin: 1,
+    graph: 1,
+    graphOptions:
+    {
+      legendLbl: 'Humidity',
+      lines:
+      {
+        lineWidth: 1
+      },
+      yaxis:
+      {
+        autoscaleMargin: 0.25
+      },
+      series:
+      {
+        curvedLines:
+        {
+          active: true,
+          apply: true,
+          //monotonicFit: true, //makes the curve tight to datapoints
+          //nrSplinePoints: 5 //number of sample points (of the spline) in between two consecutive points (more = smoother)
+        }
+      }
+    }
+  }
+};
+
+/*example of defining a property to use anywhere in the app/events or in other custom functions*/
+exports.ONEDAYHOURS = 24;
+
+/*example of defining a general purpose function to use in the app/events or in other custom functions*/
+exports.secondsInOneDay = function() {
+  var result = exports.ONEDAYHOURS * 3600;
+  return result;
 };

www/index.html

@@ -60,6 +60,7 @@
   <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.min.js"></script>
   <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.time.min.js"></script>
   <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.selection.min.js"></script>
+  <script language="javascript" type="text/javascript" src="https://rawgit.com/MichaelZinsmaier/CurvedLines/master/curvedLines.js"></script>
   <script language="javascript" type="text/javascript" src="js/graphHelper.js"></script>
   <script language="javascript" type="text/javascript" src="js/dateFormat.js"></script> <!-- for demo see http://jsfiddle.net/phZr7/1/ -->
   <script language="javascript" type="text/javascript" src="js/bind.1.0.1.min.js"></script>