various fixes

Author: dbuezas

src/filters/filters.ts

@@ -61,11 +61,13 @@ const filters = {
     }),
   calibrate_linear:
     (mappingStr: `${number} -> ${number}`[]) =>
-    ({ ys }) => {
+    ({ ys, meta }) => {
       const mapping = mappingStr.map((str) => str.split("->").map(parseFloat));
-      const mapper = linearRegressionLine(linearRegression(mapping));
+      const regression = linearRegression(mapping);
+      const mapper = linearRegressionLine(regression);
       return {
         ys: mapNumbers(ys, mapper),
+        meta: { ...meta, regression },
       };
     },
   derivate:
@@ -141,7 +143,7 @@ const filters = {
           ys2.push(acc.y / acc.count);
         }
       }
-      return { xs, ys, ...rest };
+      return { xs: xs2, ys: ys2, ...rest };
     },
   median:
     ({ window_size = 10, extended = false, centered = true } = {}) =>
@@ -192,7 +194,7 @@ const filters = {
     });
   },
   map_y: (fnStr: string) => {
-    const fn = myEval(`(i, x, y, state, statistic) => ${fnStr}`);
+    const fn = myEval(`(i, x, y, state, statistic, vars) => ${fnStr}`);
     return ({ xs, ys, states, statistics, vars }) => ({
       xs,
       ys: ys.map((_, i) => fn(i, xs[i], ys[i], states[i], statistics[i], vars)),

src/plotly-graph-card.ts

@@ -429,9 +429,11 @@ export class PlotlyGraph extends HTMLElement {
         try {
           for (const filter of trace.filters) {
             data = { ...data, ...filter(data) };
+            vars = data.vars;
           }
         } catch (e) {
-          throw new Error(`Error in filter `);
+          console.error(e);
+          throw new Error(`Error in filter: ${e}`);
         }
       }
       if (trace.lambda) {
@@ -453,6 +455,7 @@ export class PlotlyGraph extends HTMLElement {
           console.error(e);
         }
       }
+      if (trace.internal) return;
       if (!this.isBrowsing) {
         // to ensure the y axis autoranges to the visible data
         removeOutOfRange(data, this.getAutoFetchRangeWithValueMargins());
@@ -492,8 +495,8 @@ export class PlotlyGraph extends HTMLElement {
         },
         trace
       );
-      if (!trace.internal) real_traces.push(mergedTrace);
-      if (!trace.internal && mergedTrace.show_value) {
+      real_traces.push(mergedTrace);
+      if (mergedTrace.show_value) {
         mergedTrace.legendgroup ??= "group" + traceIdx;
         show_value_traces.push({
           texttemplate: `%{y:.2~f}%{customdata.unit_of_measurement}`, // here so it can be overwritten