Refactored/cleaned up analyzer code

jsjames · jsjames · commit cd0649a3284e · 2025-06-28T16:30:41.000-07:00
Dimmer can now be either a line/bar/area or state graph
Fixed xAxisIndex when both value and state graphs are displayed

Signed-off-by: Jeff James &lt;jeff@james-online.com&gt;
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/bg.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/bg.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Динамичен",
   "analyzer.coords.period.fixed": "Фиксиран",
   "analyzer.coords.period.day": "Ден",
-  "analyzer.coords.period.week": "Седмица",
+  "analyzer.coords.period.isoWeek": "Седмица",
   "analyzer.coords.period.month": "Месец",
   "analyzer.coords.period.year": "Година",
   "analyzer.coords.coordSystem": "Координатна система",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/ca.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/ca.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinàmic",
   "analyzer.coords.period.fixed": "Fixe",
   "analyzer.coords.period.day": "Dia",
-  "analyzer.coords.period.week": "Setmana",
+  "analyzer.coords.period.isoWeek": "Setmana",
   "analyzer.coords.period.month": "Mes",
   "analyzer.coords.period.year": "Any",
   "analyzer.coords.coordSystem": "Sistema de coordenades",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/cs.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/cs.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamické",
   "analyzer.coords.period.fixed": "Pevné",
   "analyzer.coords.period.day": "Den",
-  "analyzer.coords.period.week": "Týden",
+  "analyzer.coords.period.isoWeek": "Týden",
   "analyzer.coords.period.month": "Měsíc",
   "analyzer.coords.period.year": "Rok",
   "analyzer.coords.coordSystem": "Systém souřadnic",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/da.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/da.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamisk",
   "analyzer.coords.period.fixed": "Fast",
   "analyzer.coords.period.day": "Dag",
-  "analyzer.coords.period.week": "Uge",
+  "analyzer.coords.period.isoWeek": "Uge",
   "analyzer.coords.period.month": "Måned",
   "analyzer.coords.period.year": "År",
   "analyzer.coords.coordSystem": "Koordinatsystem",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/de.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/de.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamisch",
   "analyzer.coords.period.fixed": "Fest",
   "analyzer.coords.period.day": "Tag",
-  "analyzer.coords.period.week": "Woche",
+  "analyzer.coords.period.isoWeek": "Woche",
   "analyzer.coords.period.month": "Monat",
   "analyzer.coords.period.year": "Jahr",
   "analyzer.coords.coordSystem": "Koordinatensystem",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/el.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/el.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Δυναμικό",
   "analyzer.coords.period.fixed": "Σταθερό",
   "analyzer.coords.period.day": "Ημέρα",
-  "analyzer.coords.period.week": "Εβδομάδα",
+  "analyzer.coords.period.isoWeek": "Εβδομάδα",
   "analyzer.coords.period.month": "Μήνας",
   "analyzer.coords.period.year": "Έτος",
   "analyzer.coords.coordSystem": "Σύστημα Συντεταγμένων",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/en.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/en.json
@@ -21,7 +21,7 @@
   "analyzer.coords.period.dynamic": "Dynamic",
   "analyzer.coords.period.fixed": "Fixed",
   "analyzer.coords.period.day": "Day",
-  "analyzer.coords.period.week": "Week",
+  "analyzer.coords.period.isoWeek": "Week",
   "analyzer.coords.period.month": "Month",
   "analyzer.coords.period.year": "Year",
   "analyzer.coords.coordSystem": "Coordinate System",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/es.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/es.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinámico",
   "analyzer.coords.period.fixed": "Fijo",
   "analyzer.coords.period.day": "Día",
-  "analyzer.coords.period.week": "Semana",
+  "analyzer.coords.period.isoWeek": "Semana",
   "analyzer.coords.period.month": "Mes",
   "analyzer.coords.period.year": "Año",
   "analyzer.coords.coordSystem": "Sistema de coordenadas",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/fa.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/fa.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "پویا",
   "analyzer.coords.period.fixed": "اصلاح شد",
   "analyzer.coords.period.day": "روز",
-  "analyzer.coords.period.week": "هفته",
+  "analyzer.coords.period.isoWeek": "هفته",
   "analyzer.coords.period.month": "ماه",
   "analyzer.coords.period.year": "سال",
   "analyzer.coords.coordSystem": "دستگاه مختصات",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/fi.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/fi.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynaaminen",
   "analyzer.coords.period.fixed": "Kiinteä",
   "analyzer.coords.period.day": "Päivä",
-  "analyzer.coords.period.week": "Viikko",
+  "analyzer.coords.period.isoWeek": "Viikko",
   "analyzer.coords.period.month": "Kuukausi",
   "analyzer.coords.period.year": "Vuosi",
   "analyzer.coords.coordSystem": "Koordinaattijärjestelmä",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/fr.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/fr.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamique",
   "analyzer.coords.period.fixed": "Fixe",
   "analyzer.coords.period.day": "Jour",
-  "analyzer.coords.period.week": "Semaine",
+  "analyzer.coords.period.isoWeek": "Semaine",
   "analyzer.coords.period.month": "Mois",
   "analyzer.coords.period.year": "Année",
   "analyzer.coords.coordSystem": "Système de coordonnées",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/he.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/he.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "דינמי",
   "analyzer.coords.period.fixed": "מקובע",
   "analyzer.coords.period.day": "יום",
-  "analyzer.coords.period.week": "שבוע",
+  "analyzer.coords.period.isoWeek": "שבוע",
   "analyzer.coords.period.month": "חודש",
   "analyzer.coords.period.year": "שנה",
   "analyzer.coords.coordSystem": "מערכת קואורדינטות",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/hu.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/hu.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinamikus",
   "analyzer.coords.period.fixed": "Rögzített",
   "analyzer.coords.period.day": "Nap",
-  "analyzer.coords.period.week": "Hét",
+  "analyzer.coords.period.isoWeek": "Hét",
   "analyzer.coords.period.month": "Hónap",
   "analyzer.coords.period.year": "Év",
   "analyzer.coords.coordSystem": "Koordináta-rendszer",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/it.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/it.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinamica",
   "analyzer.coords.period.fixed": "Prefissato",
   "analyzer.coords.period.day": "Giorno",
-  "analyzer.coords.period.week": "Settimana",
+  "analyzer.coords.period.isoWeek": "Settimana",
   "analyzer.coords.period.month": "Mese",
   "analyzer.coords.period.year": "Anno",
   "analyzer.coords.coordSystem": "Sistema di coordinate",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/iw.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/iw.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "דינמי",
   "analyzer.coords.period.fixed": "מקובע",
   "analyzer.coords.period.day": "יום",
-  "analyzer.coords.period.week": "שבוע",
+  "analyzer.coords.period.isoWeek": "שבוע",
   "analyzer.coords.period.month": "חודש",
   "analyzer.coords.period.year": "שנה",
   "analyzer.coords.coordSystem": "מערכת קואורדינטות",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/lb.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/lb.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamesch",
   "analyzer.coords.period.fixed": "Fix",
   "analyzer.coords.period.day": "Dag",
-  "analyzer.coords.period.week": "Woch",
+  "analyzer.coords.period.isoWeek": "Woch",
   "analyzer.coords.period.month": "Mount",
   "analyzer.coords.period.year": "Joer",
   "analyzer.coords.coordSystem": "Koordinatesystem",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/lt.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/lt.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinaminė",
   "analyzer.coords.period.fixed": "Pataisyta",
   "analyzer.coords.period.day": "Diena",
-  "analyzer.coords.period.week": "Savaitė",
+  "analyzer.coords.period.isoWeek": "Savaitė",
   "analyzer.coords.period.month": "Mėnuo",
   "analyzer.coords.period.year": "Metai",
   "analyzer.coords.coordSystem": "Koordinačių sistemos",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/lv.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/lv.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinamisks",
   "analyzer.coords.period.fixed": "Fiksēts",
   "analyzer.coords.period.day": "Diena",
-  "analyzer.coords.period.week": "Nedēļa",
+  "analyzer.coords.period.isoWeek": "Nedēļa",
   "analyzer.coords.period.month": "Mēnesis",
   "analyzer.coords.period.year": "Gads",
   "analyzer.coords.coordSystem": "Koordinātu sistēma",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/nl.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/nl.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamisch",
   "analyzer.coords.period.fixed": "Vast",
   "analyzer.coords.period.day": "Dag",
-  "analyzer.coords.period.week": "Week",
+  "analyzer.coords.period.isoWeek": "Week",
   "analyzer.coords.period.month": "Maand",
   "analyzer.coords.period.year": "Jaar",
   "analyzer.coords.coordSystem": "Coördinatenstelsel",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/no.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/no.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamisk",
   "analyzer.coords.period.fixed": "Fast",
   "analyzer.coords.period.day": "Dag",
-  "analyzer.coords.period.week": "Uke",
+  "analyzer.coords.period.isoWeek": "Uke",
   "analyzer.coords.period.month": "Måned",
   "analyzer.coords.period.year": "År",
   "analyzer.coords.coordSystem": "Koordinatsystem",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/pl.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/pl.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamiczny",
   "analyzer.coords.period.fixed": "Stały",
   "analyzer.coords.period.day": "Dzień",
-  "analyzer.coords.period.week": "Tydzień",
+  "analyzer.coords.period.isoWeek": "Tydzień",
   "analyzer.coords.period.month": "Miesiąc",
   "analyzer.coords.period.year": "Rok",
   "analyzer.coords.coordSystem": "Układ Współrzędnych",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/pt-BR.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/pt-BR.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinâmico",
   "analyzer.coords.period.fixed": "Fixo",
   "analyzer.coords.period.day": "Dia",
-  "analyzer.coords.period.week": "Semana",
+  "analyzer.coords.period.isoWeek": "Semana",
   "analyzer.coords.period.month": "Mês",
   "analyzer.coords.period.year": "Ano",
   "analyzer.coords.coordSystem": "Sistema de Coordenadas",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/pt.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/pt.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinâmico",
   "analyzer.coords.period.fixed": "Fixo",
   "analyzer.coords.period.day": "Dia",
-  "analyzer.coords.period.week": "Semana",
+  "analyzer.coords.period.isoWeek": "Semana",
   "analyzer.coords.period.month": "Mês",
   "analyzer.coords.period.year": "Ano",
   "analyzer.coords.coordSystem": "Coordenadas do Sistema",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/ru.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/ru.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Динамический",
   "analyzer.coords.period.fixed": "Фиксированный",
   "analyzer.coords.period.day": "День",
-  "analyzer.coords.period.week": "Неделя",
+  "analyzer.coords.period.isoWeek": "Неделя",
   "analyzer.coords.period.month": "Месяц",
   "analyzer.coords.period.year": "Год",
   "analyzer.coords.coordSystem": "Система координат",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/sk.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/sk.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamický",
   "analyzer.coords.period.fixed": "Pevný",
   "analyzer.coords.period.day": "Deň",
-  "analyzer.coords.period.week": "Týždeň",
+  "analyzer.coords.period.isoWeek": "Týždeň",
   "analyzer.coords.period.month": "Mesiac",
   "analyzer.coords.period.year": "Rok",
   "analyzer.coords.coordSystem": "Súradnicový systém",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/sl.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/sl.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinamično",
   "analyzer.coords.period.fixed": "Statičen",
   "analyzer.coords.period.day": "Dan",
-  "analyzer.coords.period.week": "Teden",
+  "analyzer.coords.period.isoWeek": "Teden",
   "analyzer.coords.period.month": "Mesec",
   "analyzer.coords.period.year": "Leto",
   "analyzer.coords.coordSystem": "Koordinatni sistem",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/sv.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/sv.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamisk",
   "analyzer.coords.period.fixed": "Fast",
   "analyzer.coords.period.day": "Dag",
-  "analyzer.coords.period.week": "Vecka",
+  "analyzer.coords.period.isoWeek": "Vecka",
   "analyzer.coords.period.month": "Månad",
   "analyzer.coords.period.year": "År",
   "analyzer.coords.coordSystem": "Koordinatsystem",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/tl.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/tl.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dynamic",
   "analyzer.coords.period.fixed": "Fixed",
   "analyzer.coords.period.day": "Araw",
-  "analyzer.coords.period.week": "Linggo",
+  "analyzer.coords.period.isoWeek": "Linggo",
   "analyzer.coords.period.month": "Buwan",
   "analyzer.coords.period.year": "Taon",
   "analyzer.coords.coordSystem": "Coordinate System",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/tr.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/tr.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Dinamik",
   "analyzer.coords.period.fixed": "Sabit",
   "analyzer.coords.period.day": "Gün",
-  "analyzer.coords.period.week": "Hafta",
+  "analyzer.coords.period.isoWeek": "Hafta",
   "analyzer.coords.period.month": "Ay",
   "analyzer.coords.period.year": "Yıl",
   "analyzer.coords.coordSystem": "Koordinat Sistemi",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/uk.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/uk.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "Динамічний",
   "analyzer.coords.period.fixed": "Фіксований",
   "analyzer.coords.period.day": "День",
-  "analyzer.coords.period.week": "Тиждень",
+  "analyzer.coords.period.isoWeek": "Тиждень",
   "analyzer.coords.period.month": "Місяць",
   "analyzer.coords.period.year": "Рік",
   "analyzer.coords.coordSystem": "Система координат",
diff --git a/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/zh.json b/bundles/org.openhab.ui/web/src/assets/i18n/analyzer/zh.json
@@ -20,7 +20,7 @@
   "analyzer.coords.period.dynamic": "动态",
   "analyzer.coords.period.fixed": "固定",
   "analyzer.coords.period.day": "日",
-  "analyzer.coords.period.week": "周",
+  "analyzer.coords.period.isoWeek": "周",
   "analyzer.coords.period.month": "月",
   "analyzer.coords.period.year": "年",
   "analyzer.coords.coordSystem": "坐标系",
diff --git a/bundles/org.openhab.ui/web/src/pages/analyzer/analyzer-helpers.js b/bundles/org.openhab.ui/web/src/pages/analyzer/analyzer-helpers.js
@@ -0,0 +1,55 @@
+export function parseUnit(item) {
+  let unit =
+    item.transformedState?.split(' ')[1] ??
+    item.state?.split(' ')[1] ??
+    item.stateDescription?.pattern?.split(' ')[1];
+  if (unit) unit = unit.replace(/^%%/, '%');
+
+  return unit || '';
+}
+
+export function getYAxis(item, coordSettings) {
+  let unit = parseUnit(item);
+  let unitAxis = coordSettings.valueAxesOptions.findIndex((a) => a.unit === unit);
+  if (unitAxis >= 0) {
+    return unitAxis;
+  } else {
+    coordSettings.valueAxesOptions.push({ name: unit, unit, split: 'line' });
+    return coordSettings.valueAxesOptions.length - 1;
+  }
+}
+
+export function renderVisualMap(visualMap) {
+    return [
+        {
+          component: 'oh-chart-visualmap',
+          config: {
+            show: true,
+            orient: 'horizontal',
+            calculable: true,
+            bottom: 0,
+            left: 'center',
+            presetPalette: visualMap.palette,
+            type: visualMap.type,
+            ...(visualMap.min && visualMap.min !== '') && { min: parseFloat(visualMap.min) },
+            ...(visualMap.max && visualMap.max !== '') && { max: parseFloat(visualMap.max) }
+          }
+        }
+      ]
+}
+
+export function renderValueAxis(a) {
+  return {
+    component: 'oh-value-axis',
+    config: {
+      gridIndex: 0,
+      name: a.name || a.unit,
+      ...(a.min && a.min !== '') && { min: parseFloat(a.min) },
+      ...(a.max && a.max !== '') && { max: parseFloat(a.max) },
+      scale: a.scale,
+      ...(a.split === 'none' || a.split === 'area' || a.split === 'area+minor') && { splitLine: { show: false } },
+      ...(a.split === 'line+minor' || a.split === 'area+minor' || a.split === 'all') && { minorTick: { show: true }, minorSplitLine: { show: true } },
+      ...(a.split === 'area' || a.split === 'line+area' || a.split === 'area+minor' || a.split === 'all') && { splitArea: { show: true } }
+    }
+  }
+}
diff --git a/bundles/org.openhab.ui/web/src/pages/analyzer/analyzer.vue b/bundles/org.openhab.ui/web/src/pages/analyzer/analyzer.vue
diff --git a/bundles/org.openhab.ui/web/src/pages/analyzer/chart-aggregate.js b/bundles/org.openhab.ui/web/src/pages/analyzer/chart-aggregate.js
diff --git a/bundles/org.openhab.ui/web/src/pages/analyzer/chart-calendar.js b/bundles/org.openhab.ui/web/src/pages/analyzer/chart-calendar.js
diff --git a/bundles/org.openhab.ui/web/src/pages/analyzer/chart-time.js b/bundles/org.openhab.ui/web/src/pages/analyzer/chart-time.js
