Browse Source

UI: Flot widget improvements.

pull/296/head
Igor Kulikov 9 years ago
parent
commit
de1f730441
  1. 4
      ui/src/app/common/utils.service.js
  2. 31
      ui/src/app/widget/lib/flot-widget.js

4
ui/src/app/common/utils.service.js

@ -446,6 +446,10 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
} else { } else {
dataKey.color = genNextColor(datasources); dataKey.color = genNextColor(datasources);
} }
if (keyInfo.postFuncBody && keyInfo.postFuncBody.length) {
dataKey.usePostProcessing = true;
dataKey.postFuncBody = keyInfo.postFuncBody;
}
return dataKey; return dataKey;
} }

31
ui/src/app/widget/lib/flot-widget.js

@ -222,6 +222,8 @@ export default class TbFlot {
if (settings.yaxis) { if (settings.yaxis) {
this.yaxis.font.color = settings.yaxis.color || this.yaxis.font.color; this.yaxis.font.color = settings.yaxis.color || this.yaxis.font.color;
this.yaxis.min = angular.isDefined(settings.yaxis.min) ? settings.yaxis.min : null;
this.yaxis.max = angular.isDefined(settings.yaxis.max) ? settings.yaxis.max : null;
this.yaxis.label = settings.yaxis.title || null; this.yaxis.label = settings.yaxis.title || null;
this.yaxis.labelFont.color = this.yaxis.font.color; this.yaxis.labelFont.color = this.yaxis.font.color;
this.yaxis.labelFont.size = this.yaxis.font.size+2; this.yaxis.labelFont.size = this.yaxis.font.size+2;
@ -457,7 +459,12 @@ export default class TbFlot {
var tickDecimals = angular.isDefined(keySettings.axisTickDecimals) ? keySettings.axisTickDecimals : 0; var tickDecimals = angular.isDefined(keySettings.axisTickDecimals) ? keySettings.axisTickDecimals : 0;
var position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : "left"; var position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : "left";
var min = angular.isDefined(keySettings.axisMin) ? keySettings.axisMin : yaxis.min;
var max = angular.isDefined(keySettings.axisMax) ? keySettings.axisMax : yaxis.max;
yaxis.label = label; yaxis.label = label;
yaxis.min = min;
yaxis.max = max;
yaxis.tickUnits = units; yaxis.tickUnits = units;
yaxis.tickDecimals = tickDecimals; yaxis.tickDecimals = tickDecimals;
yaxis.alignTicksWithAxis = position == "right" ? 1 : null; yaxis.alignTicksWithAxis = position == "right" ? 1 : null;
@ -765,6 +772,16 @@ export default class TbFlot {
"title": "Y axis settings", "title": "Y axis settings",
"type": "object", "type": "object",
"properties": { "properties": {
"min": {
"title": "Minimum value on the scale",
"type": "number",
"default": null
},
"max": {
"title": "Maximum value on the scale",
"type": "number",
"default": null
},
"showLabels": { "showLabels": {
"title": "Show labels", "title": "Show labels",
"type": "boolean", "type": "boolean",
@ -845,6 +862,8 @@ export default class TbFlot {
{ {
"key": "yaxis", "key": "yaxis",
"items": [ "items": [
"yaxis.min",
"yaxis.max",
"yaxis.showLabels", "yaxis.showLabels",
"yaxis.title", "yaxis.title",
"yaxis.titleAngle", "yaxis.titleAngle",
@ -898,6 +917,16 @@ export default class TbFlot {
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"axisMin": {
"title": "Minimum value on the axis scale",
"type": "number",
"default": null
},
"axisMax": {
"title": "Maximum value on the axis scale",
"type": "number",
"default": null
},
"axisTitle": { "axisTitle": {
"title": "Axis title", "title": "Axis title",
"type": "string", "type": "string",
@ -930,6 +959,8 @@ export default class TbFlot {
"type": "javascript" "type": "javascript"
}, },
"showSeparateAxis", "showSeparateAxis",
"axisMin",
"axisMax",
"axisTitle", "axisTitle",
"axisTickDecimals", "axisTickDecimals",
{ {

Loading…
Cancel
Save