Added config option for setting minimum on y-axis of line graphs.

SensorThings-Dashboard · May 4, 2017 · 20b1862 · 20b1862
1 parent 745d636
commit 20b1862
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/DashboardServices/LineGraphWidgetFactory.js b/src/DashboardServices/LineGraphWidgetFactory.js
@@ -428,10 +428,15 @@ export class LineGraphWidgetFactory {
                     labelTicks = this._calcLabelTicks(new Date(min), new Date(max), steps);
                 }
 
+                if (config.ymin === undefined) {
+                    config.ymin = {data:0, type:0};
+                }
+
                 color = config.pointColor.data;
                 configurableOptions = {
                     xmin: min,
                     xmax: max,
+                    ymin: config.ymin.data,
                     backgroundGridBorder: config.backgroundGridBorder.data,
                     backgroundGridVlines: config.backgroundGridVlines.data,
                     backgroundBarcolor1: config.backgroundBarcolor1.data,

diff --git a/src/DataModel/Config/WidgetData/DataWidgetData/LineGraphWidgetData.js b/src/DataModel/Config/WidgetData/DataWidgetData/LineGraphWidgetData.js
@@ -113,13 +113,17 @@ export class LineGraphWidgetData {
             },
 
             titleXaxis: {
-                data: 'Time in sec',
+                data: 'Time',
                 type: TYPE_STRING
             },
             titleYaxis: {
-                data: 'New 9gag memes',
+                data: 'Y-Axis',
                 type: TYPE_STRING
             },
+            ymin: {
+                data: 0,
+                type: TYPE_NUMBER
+            },
             pointColor: {
                 data: '#000000',
                 type: TYPE_COLOR

diff --git a/src/View/langEn.js b/src/View/langEn.js
@@ -95,6 +95,7 @@ export var en = {
     "titleXaxis_Tooltip": "Title on the X Axis",
     "titleYaxis_Tooltip": "Title on the Y Axis",
     "pointColor_Tooltip": "Color of the Points to draw",
+    "ymin_Tooltip": "Minimum value on the Y Axis",
 
     //PlainDataWidget
     "valueSize_Tooltip": "Fontsize of the Value",

diff --git a/test/DashboardServices/LineGraphWidgetFactoryTest.js b/test/DashboardServices/LineGraphWidgetFactoryTest.js
@@ -101,6 +101,10 @@ describe("LineGraphWidgetFactory test", () => {
                 data: 'New 9gag memes',
                 type: TYPE_STRING
             },
+            ymin: {
+                data: 0,
+                type: TYPE_NUMBER
+            },
             pointColor: {
                 data: '#000000',
                 type: TYPE_COLOR