Skip to content

N
nexpie-grafana-theme
Commit 3d3958e6 by Carl Bergquist Committed by GitHub
Options

Merge pull request #7328 from jubicoy/master 

Added commonly used kilo-prefixed energy units
parents 697d0867 03eb98e9
Showing with 6 additions and 0 deletions
public/app/core/utils/kbn.js
...@@ -441,12 +441,15 @@ function($, _) { ...@@ -441,12 +441,15 @@ function($, _) {
kbn.valueFormats.voltamp = kbn.formatBuilders.decimalSIPrefix('VA'); kbn.valueFormats.voltamp = kbn.formatBuilders.decimalSIPrefix('VA');
kbn.valueFormats.kvoltamp = kbn.formatBuilders.decimalSIPrefix('VA', 1); kbn.valueFormats.kvoltamp = kbn.formatBuilders.decimalSIPrefix('VA', 1);
kbn.valueFormats.voltampreact = kbn.formatBuilders.decimalSIPrefix('var'); kbn.valueFormats.voltampreact = kbn.formatBuilders.decimalSIPrefix('var');
kbn.valueFormats.kvoltampreact = kbn.formatBuilders.decimalSIPrefix('var', 1);
kbn.valueFormats.watth = kbn.formatBuilders.decimalSIPrefix('Wh'); kbn.valueFormats.watth = kbn.formatBuilders.decimalSIPrefix('Wh');
kbn.valueFormats.kwatth = kbn.formatBuilders.decimalSIPrefix('Wh', 1); kbn.valueFormats.kwatth = kbn.formatBuilders.decimalSIPrefix('Wh', 1);
kbn.valueFormats.joule = kbn.formatBuilders.decimalSIPrefix('J'); kbn.valueFormats.joule = kbn.formatBuilders.decimalSIPrefix('J');
kbn.valueFormats.ev = kbn.formatBuilders.decimalSIPrefix('eV'); kbn.valueFormats.ev = kbn.formatBuilders.decimalSIPrefix('eV');
kbn.valueFormats.amp = kbn.formatBuilders.decimalSIPrefix('A'); kbn.valueFormats.amp = kbn.formatBuilders.decimalSIPrefix('A');
kbn.valueFormats.kamp = kbn.formatBuilders.decimalSIPrefix('A', 1);
kbn.valueFormats.volt = kbn.formatBuilders.decimalSIPrefix('V'); kbn.valueFormats.volt = kbn.formatBuilders.decimalSIPrefix('V');
kbn.valueFormats.kvolt = kbn.formatBuilders.decimalSIPrefix('V', 1);
kbn.valueFormats.dBm = kbn.formatBuilders.decimalSIPrefix('dBm'); kbn.valueFormats.dBm = kbn.formatBuilders.decimalSIPrefix('dBm');
// Temperature // Temperature
...@@ -800,12 +803,15 @@ function($, _) { ...@@ -800,12 +803,15 @@ function($, _) {
{text: 'volt-ampere (VA)', value: 'voltamp' }, {text: 'volt-ampere (VA)', value: 'voltamp' },
{text: 'kilovolt-ampere (kVA)', value: 'kvoltamp' }, {text: 'kilovolt-ampere (kVA)', value: 'kvoltamp' },
{text: 'volt-ampere reactive (var)', value: 'voltampreact'}, {text: 'volt-ampere reactive (var)', value: 'voltampreact'},
{text: 'kilovolt-ampere reactive (kvar)', value: 'kvoltampreact'},
{text: 'watt-hour (Wh)', value: 'watth' }, {text: 'watt-hour (Wh)', value: 'watth' },
{text: 'kilowatt-hour (kWh)', value: 'kwatth' }, {text: 'kilowatt-hour (kWh)', value: 'kwatth' },
{text: 'joule (J)', value: 'joule' }, {text: 'joule (J)', value: 'joule' },
{text: 'electron volt (eV)', value: 'ev' }, {text: 'electron volt (eV)', value: 'ev' },
{text: 'Ampere (A)', value: 'amp' }, {text: 'Ampere (A)', value: 'amp' },
{text: 'Kiloampere (kA)', value: 'kamp' },
{text: 'Volt (V)', value: 'volt' }, {text: 'Volt (V)', value: 'volt' },
{text: 'Kilovolt (kV)', value: 'kvolt' },
{text: 'Decibel-milliwatt (dBm)', value: 'dBm' }, {text: 'Decibel-milliwatt (dBm)', value: 'dBm' },
] ]
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment