IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (#17064)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-05-14 16:33:47 +02:00 committed by GitHub
parent 3df94c6f27
commit 68ad93f410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/Gauge/Gauge.tsx
View File

@ -76,7 +76,7 @@ export class Gauge extends PureComponent<Props> {
);
const gaugeWidthReduceRatio = showThresholdLabels ? 1.5 : 1;
const gaugeWidth = Math.min(dimension / 5, 40) / gaugeWidthReduceRatio;
const gaugeWidth = Math.min(dimension / 5.5, 40) / gaugeWidthReduceRatio;
const thresholdMarkersWidth = gaugeWidth / 5;
const fontSize = Math.min(dimension / 5.5, 100) * (value.text !== null ? this.getFontScale(value.text.length) : 1);
const thresholdLabelFontSize = fontSize / 2.5;

6
public/app/plugins/panel/gauge/GaugePanel.tsx
View File

@ -5,7 +5,7 @@ import React, { PureComponent } from 'react';
import { config } from 'app/core/config';
// Components
import { Gauge, FieldDisplay, getFieldDisplayValues } from '@grafana/ui';
import { Gauge, FieldDisplay, getFieldDisplayValues, VizOrientation } from '@grafana/ui';
// Types
import { GaugeOptions } from './types';
@ -43,7 +43,7 @@ export class GaugePanel extends PureComponent<PanelProps<GaugeOptions>> {
};
render() {
const { height, width, options, data, renderCounter } = this.props;
const { height, width, data, renderCounter } = this.props;
return (
<VizRepeater
getValues={this.getValues}
@ -52,7 +52,7 @@ export class GaugePanel extends PureComponent<PanelProps<GaugeOptions>> {
height={height}
source={data}
renderCounter={renderCounter}
orientation={options.orientation}
orientation={VizOrientation.Auto}
/>
);
}