dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Improve digital gauge - horizontal bar.

Browse Source
This commit is contained in:
Igor Kulikov 2017-08-07 18:41:13 +03:00
parent f5b42f098f
commit 86018bba01
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/app/entity/alias/aliases-entity-select-panel.controller.js
View File

@ -29,7 +29,8 @@ export default function AliasesEntitySelectPanelController(mdPanelRef, $scope, $
var allEntityAliases = vm.aliasController.getEntityAliases(); var allEntityAliases = vm.aliasController.getEntityAliases();
for (var aliasId in allEntityAliases) { for (var aliasId in allEntityAliases) {
var aliasInfo = vm.aliasController.getInstantAliasInfo(aliasId); var aliasInfo = vm.aliasController.getInstantAliasInfo(aliasId);
if (aliasInfo && !aliasInfo.resolveMultiple && aliasInfo.currentEntity) { if (aliasInfo && !aliasInfo.resolveMultiple && aliasInfo.currentEntity
&& aliasInfo.resolvedEntities.length > 1) {
vm.entityAliasesInfo[aliasId] = angular.copy(aliasInfo); vm.entityAliasesInfo[aliasId] = angular.copy(aliasInfo);
vm.entityAliasesInfo[aliasId].selectedId = aliasInfo.currentEntity.id; vm.entityAliasesInfo[aliasId].selectedId = aliasInfo.currentEntity.id;
} }

10
ui/src/app/widget/lib/CanvasDigitalGauge.js
View File

@ -338,6 +338,8 @@ function barDimensions(context, options, x, y, w, h) {
bd.height = w / aspect; bd.height = w / aspect;
} }
bd.origBaseX = bd.baseX;
bd.origBaseY = bd.baseY;
bd.baseX += (w - bd.width) / 2; bd.baseX += (w - bd.width) / 2;
bd.baseY += (h - bd.height) / 2; bd.baseY += (h - bd.height) / 2;
@ -432,15 +434,15 @@ function barDimensions(context, options, x, y, w, h) {
if (options.hideMinMax && options.label === '') { if (options.hideMinMax && options.label === '') {
bd.labelY = bd.barBottom; bd.labelY = bd.barBottom;
bd.barLeft = options.fontMinMaxSize/3 * bd.fontSizeFactor; bd.barLeft = bd.origBaseX + options.fontMinMaxSize/3 * bd.fontSizeFactor;
bd.barRight = bd.width - options.fontMinMaxSize/3 * bd.fontSizeFactor; bd.barRight = bd.bd.origBaseX + w + /*bd.width*/ - options.fontMinMaxSize/3 * bd.fontSizeFactor;
} else { } else {
context.font = canvasGauges.drawings.font(options, 'MinMax', bd.fontSizeFactor); context.font = canvasGauges.drawings.font(options, 'MinMax', bd.fontSizeFactor);
var minTextWidth = context.measureText(options.minValue+'').width; var minTextWidth = context.measureText(options.minValue+'').width;
var maxTextWidth = context.measureText(options.maxValue+'').width; var maxTextWidth = context.measureText(options.maxValue+'').width;
var maxW = Math.max(minTextWidth, maxTextWidth); var maxW = Math.max(minTextWidth, maxTextWidth);
bd.minX = bd.baseX + maxW/2 + options.fontMinMaxSize/3 * bd.fontSizeFactor; bd.minX = bd.origBaseX + maxW/2 + options.fontMinMaxSize/3 * bd.fontSizeFactor;
bd.maxX = bd.baseX + bd.width - maxW/2 - options.fontMinMaxSize/3 * bd.fontSizeFactor; bd.maxX = bd.origBaseX + w + /*bd.width*/ - maxW/2 - options.fontMinMaxSize/3 * bd.fontSizeFactor;
bd.barLeft = bd.minX; bd.barLeft = bd.minX;
bd.barRight = bd.maxX; bd.barRight = bd.maxX;
bd.labelY = bd.barBottom + (8 + options.fontLabelSize) * bd.fontSizeFactor; bd.labelY = bd.barBottom + (8 + options.fontLabelSize) * bd.fontSizeFactor;