Commit de1f7304411ab5d400ba35030416f7c287a1f1f1

Authored by Igor Kulikov
1 parent 4af989c2

UI: Flot widget improvements.

... ... @@ -446,6 +446,10 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
446 446 } else {
447 447 dataKey.color = genNextColor(datasources);
448 448 }
  449 + if (keyInfo.postFuncBody && keyInfo.postFuncBody.length) {
  450 + dataKey.usePostProcessing = true;
  451 + dataKey.postFuncBody = keyInfo.postFuncBody;
  452 + }
449 453 return dataKey;
450 454 }
451 455
... ...
... ... @@ -222,6 +222,8 @@ export default class TbFlot {
222 222
223 223 if (settings.yaxis) {
224 224 this.yaxis.font.color = settings.yaxis.color || this.yaxis.font.color;
  225 + this.yaxis.min = angular.isDefined(settings.yaxis.min) ? settings.yaxis.min : null;
  226 + this.yaxis.max = angular.isDefined(settings.yaxis.max) ? settings.yaxis.max : null;
225 227 this.yaxis.label = settings.yaxis.title || null;
226 228 this.yaxis.labelFont.color = this.yaxis.font.color;
227 229 this.yaxis.labelFont.size = this.yaxis.font.size+2;
... ... @@ -457,7 +459,12 @@ export default class TbFlot {
457 459 var tickDecimals = angular.isDefined(keySettings.axisTickDecimals) ? keySettings.axisTickDecimals : 0;
458 460 var position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : "left";
459 461
  462 + var min = angular.isDefined(keySettings.axisMin) ? keySettings.axisMin : yaxis.min;
  463 + var max = angular.isDefined(keySettings.axisMax) ? keySettings.axisMax : yaxis.max;
  464 +
460 465 yaxis.label = label;
  466 + yaxis.min = min;
  467 + yaxis.max = max;
461 468 yaxis.tickUnits = units;
462 469 yaxis.tickDecimals = tickDecimals;
463 470 yaxis.alignTicksWithAxis = position == "right" ? 1 : null;
... ... @@ -765,6 +772,16 @@ export default class TbFlot {
765 772 "title": "Y axis settings",
766 773 "type": "object",
767 774 "properties": {
  775 + "min": {
  776 + "title": "Minimum value on the scale",
  777 + "type": "number",
  778 + "default": null
  779 + },
  780 + "max": {
  781 + "title": "Maximum value on the scale",
  782 + "type": "number",
  783 + "default": null
  784 + },
768 785 "showLabels": {
769 786 "title": "Show labels",
770 787 "type": "boolean",
... ... @@ -845,6 +862,8 @@ export default class TbFlot {
845 862 {
846 863 "key": "yaxis",
847 864 "items": [
  865 + "yaxis.min",
  866 + "yaxis.max",
848 867 "yaxis.showLabels",
849 868 "yaxis.title",
850 869 "yaxis.titleAngle",
... ... @@ -898,6 +917,16 @@ export default class TbFlot {
898 917 "type": "boolean",
899 918 "default": false
900 919 },
  920 + "axisMin": {
  921 + "title": "Minimum value on the axis scale",
  922 + "type": "number",
  923 + "default": null
  924 + },
  925 + "axisMax": {
  926 + "title": "Maximum value on the axis scale",
  927 + "type": "number",
  928 + "default": null
  929 + },
901 930 "axisTitle": {
902 931 "title": "Axis title",
903 932 "type": "string",
... ... @@ -930,6 +959,8 @@ export default class TbFlot {
930 959 "type": "javascript"
931 960 },
932 961 "showSeparateAxis",
  962 + "axisMin",
  963 + "axisMax",
933 964 "axisTitle",
934 965 "axisTickDecimals",
935 966 {
... ...