Merge pull request #33 from nikolaswise/master

time axis working

Author: paulcpederson

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Angular-Dimple Changelog
 
+# v1.1.1
+* add time formats and such
+
 # v1.1.0
 * add functionality inside ng-repeat
 * graphs update live when scope changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-dimple",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Angular.js wrapper for the Dimple charting language",
   "repository": "https://github.com/esripdx/angular-dimple",
   "license": "ISC",

site/data/simple.json

@@ -1,27 +1,34 @@
 [
   {
+    "Name": "Tom",
     "Height": 64,
     "Weight": 190,
     "Time": 1408406400000
   },{
+    "Name": "Tom",
     "Height": 68,
     "Weight": 195,
     "Time": 1408579200000
   },{
+    "Name": "Tom",
     "Height": 69,
     "Weight": 198,
     "Time": 1408665600000
   },{
+    "Name": "Tom",
     "Height": 70,
     "Weight": 205,
     "Time": 1408752000000
   },{
+    "Name": "Tom",
     "Height": 67,
     "Weight": 198,
     "Time": 1408838400000
   },{
+    "Name": "Tom",
     "Height": 76,
     "Weight": 195,
     "Time": 1408924800000
   }
-]
+]
+

source/x.js

@@ -17,6 +17,11 @@ angular.module('angular-dimple.x', [])
             x = chart.addMeasureAxis('x', [$attrs.groupBy, $attrs.field]);
           } else if ($attrs.type == 'Percent') {
             x = chart.addPctAxis('x', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            x = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              x.tickFormat = $attrs.format;
+            }
           } else {
             x = chart.addCategoryAxis('x', [$attrs.groupBy, $attrs.field]);
           }
@@ -28,6 +33,11 @@ angular.module('angular-dimple.x', [])
             x = chart.addMeasureAxis('x', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             x = chart.addPctAxis('x', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            x = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              x.tickFormat = $attrs.format;
+            }
           } else {
             x = chart.addCategoryAxis('x', $attrs.field);
           }

source/y.js

@@ -17,6 +17,11 @@ angular.module('angular-dimple.y', [])
             y = chart.addCategoryAxis('y', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             y = chart.addPctAxis('y', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            y = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              y.tickFormat = $attrs.format;
+            }
           } else {
             y = chart.addMeasureAxis('y', $attrs.field);
           }
@@ -28,6 +33,11 @@ angular.module('angular-dimple.y', [])
             y = chart.addCategoryAxis('y', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             y = chart.addPctAxis('y', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            y = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              y.tickFormat = $attrs.format;
+            }
           } else {
             y = chart.addMeasureAxis('y', $attrs.field);
           }