From 337f4b73e14ed197b015599a409f25322395d205 Mon Sep 17 00:00:00 2001
From: Benedikt Seeger <benedikt.seeger@ptb.de>
Date: Tue, 4 Mar 2025 14:06:46 +0100
Subject: [PATCH] improved rednering
---
src/renderers/MeasurementRenderer.js | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/renderers/MeasurementRenderer.js b/src/renderers/MeasurementRenderer.js
index 5d8cee5..3f72688 100644
--- a/src/renderers/MeasurementRenderer.js
+++ b/src/renderers/MeasurementRenderer.js
@@ -1,3 +1,4 @@
+// src/renderers/MeasurementRenderer.js
import Plotly from 'plotly.js-dist';
import { DCCRealListQuantity, DCCConformity } from '../dccQuantity.js';
import JSONEditor from 'jsoneditor';
@@ -273,12 +274,13 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
});
tabPanel.appendChild(xAxisContainer);
+ // Change tolerance toggle label to "Show conformity limits"
const toleranceToggle = document.createElement('input');
toleranceToggle.type = 'checkbox';
toleranceToggle.id = 'toleranceToggle';
const tolLabel = document.createElement('label');
tolLabel.htmlFor = 'toleranceToggle';
- tolLabel.textContent = ' Enable tolerance markings';
+ tolLabel.textContent = ' Show conformity limits';
const tolContainer = document.createElement('div');
tolContainer.appendChild(toleranceToggle);
tolContainer.appendChild(tolLabel);
@@ -290,6 +292,8 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
tabPanel.appendChild(subplotsContainer);
const tableContainer = document.createElement('div');
tableContainer.id = 'tableContainer';
+ // Add extra spacing between plots and table
+ tableContainer.style.marginTop = '20px';
tabPanel.appendChild(tableContainer);
function updateVisualization() {
@@ -298,12 +302,14 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
const selectedIndex = selectedRadio.value;
const xQuantity = indexQuantities[selectedIndex];
const xValues = xQuantity.getValues();
+ // Get xUnit using dsiUnits conversion with oneLine true
const xUnit = xQuantity.getUnit({ oneLine: true, wrapper: 'span' });
+ const XQuantityName = xQuantity.getName(language);
console.debug('Selected X-Axis values:', xValues);
console.debug('X-Axis unit:', xUnit);
const headers = [];
- headers.push('X-Axis (selected) (' + xUnit + ')');
+ headers.push(XQuantityName+' in ' + xUnit + ' (selected X)');
const dataValues = [];
const uncertaintiesArray = [];
@@ -338,7 +344,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
const unitGroups = {};
dataQuantities.forEach((q, idx) => {
- const unit = q.getUnit({ oneLine: false});
+ const unit = q.getUnit({ oneLine: false });
if (!unitGroups[unit]) { unitGroups[unit] = []; }
const header = dataHeaders[idx];
let values = q.getValues();
@@ -504,7 +510,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
}
} else {
cell.textContent = cellData;
- if (tableData[0][cellIndex] && tableData[0][cellIndex].toLowerCase().includes('conformity')) {
+ if (tableData[0][cellIndex] && tableData[0][cellIndex].toLowerCase().includes('conformity') && conformityMapping[cellIndex] !== undefined) {
const confKey = cellData.trim().toLowerCase();
if (conformityColors[confKey]) {
cell.style.backgroundColor = conformityColors[confKey];
--
GitLab