From 20b1862b8c2bd6e1c3178ac15db5955177b4d5a3 Mon Sep 17 00:00:00 2001 From: Hylke van der Schaaf Date: Thu, 4 May 2017 11:32:48 +0200 Subject: [PATCH] Added config option for setting minimum on y-axis of line graphs. --- src/DashboardServices/LineGraphWidgetFactory.js | 5 +++++ .../WidgetData/DataWidgetData/LineGraphWidgetData.js | 8 ++++++-- src/View/langEn.js | 1 + test/DashboardServices/LineGraphWidgetFactoryTest.js | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/DashboardServices/LineGraphWidgetFactory.js b/src/DashboardServices/LineGraphWidgetFactory.js index ee92fe7..b2c9260 100644 --- 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 index e0fef7f..d7ea575 100644 --- 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 index 10716f6..3ab28e4 100644 --- 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 index c25f71d..9e9548f 100644 --- 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