From 38b180b81582609c57694188e567dca5fbd0fb71 Mon Sep 17 00:00:00 2001
From: Benedikt Seeger <benedikt.seeger@ptb.de>
Date: Tue, 4 Mar 2025 13:59:14 +0100
Subject: [PATCH] added options to getUnit
---
src/dccQuantity.js | 8 ++++----
src/renderers/MeasurementRenderer.js | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/dccQuantity.js b/src/dccQuantity.js
index e4d2698..d67a837 100644
--- a/src/dccQuantity.js
+++ b/src/dccQuantity.js
@@ -50,12 +50,12 @@ export class DCCRealListQuantity extends DCCQuantity {
return [];
}
- getUnit() {
+ getUnit(options = { oneLine: true }) {
const realList = this.jsonData['si:realListXMLList'];
if (realList && realList['si:unitXMLList']) {
const rawUnit = realList['si:unitXMLList'].trim();
const unit = new DSIUnit(rawUnit);
- return unit.toHTML({ oneLine: true });
+ return unit.toHTML(options);
}
return '';
}
@@ -88,12 +88,12 @@ export class DCCRealQuantity extends DCCQuantity {
return [];
}
- getUnit() {
+ getUnit(options = { oneLine: true }) {
const realData = this.jsonData['si:real'];
if (realData && realData['si:unit']) {
const rawUnit = realData['si:unit'].trim();
const unit = new DSIUnit(rawUnit);
- return unit.toHTML({ oneLine: true });
+ return unit.toHTML(options);
}
return '';
}
diff --git a/src/renderers/MeasurementRenderer.js b/src/renderers/MeasurementRenderer.js
index 4d518d9..5d8cee5 100644
--- a/src/renderers/MeasurementRenderer.js
+++ b/src/renderers/MeasurementRenderer.js
@@ -228,7 +228,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
const dataHeaders = dataQuantities.map((q, idx) => {
let headerText = q.getName(language);
- let unit = q.getUnit();
+ let unit = q.getUnit({ oneLine: true, wrapper: 'span' });
if (!headerText.toLowerCase().includes(" in ")) {
headerText = headerText + " in " + unit;
}
@@ -298,7 +298,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
const selectedIndex = selectedRadio.value;
const xQuantity = indexQuantities[selectedIndex];
const xValues = xQuantity.getValues();
- const xUnit = xQuantity.getUnit();
+ const xUnit = xQuantity.getUnit({ oneLine: true, wrapper: 'span' });
console.debug('Selected X-Axis values:', xValues);
console.debug('X-Axis unit:', xUnit);
@@ -338,7 +338,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
const unitGroups = {};
dataQuantities.forEach((q, idx) => {
- const unit = q.getUnit();
+ const unit = q.getUnit({ oneLine: false});
if (!unitGroups[unit]) { unitGroups[unit] = []; }
const header = dataHeaders[idx];
let values = q.getValues();
--
GitLab