Fix colors on the URL

lnls-sirius · Oct 26, 2023 · 30002c7 · 30002c7
1 parent fde525b
commit 30002c7
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 22 deletions.
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as S from "./styled";
 
-const version = "2023-10-23-92b1917";
+const version = "2023-10-26-fde525b";
 
 const Footer: React.FC = () => {
   return (

diff --git a/src/controllers/UrlLoader/index.ts b/src/controllers/UrlLoader/index.ts
@@ -83,7 +83,7 @@ class UrlLoaderImpl implements UrlLoader {
     control.updateTimeAxis();
     for (const data of pvs) {
       console.info(`Plotting `, data);
-      PlotPVs.plotPV({ name: data.pvname, optimize: data.optimize, diff: data.diff, bins: data.bins, updateChart: true });
+      PlotPVs.plotPV({ name: data.pvname, optimize: data.optimize, diff: data.diff, bins: data.bins, color: data.color, updateChart: true });
     }
   }
 }

diff --git a/src/entities/Chart/ChartJS/impl.ts b/src/entities/Chart/ChartJS/impl.ts
@@ -340,14 +340,20 @@ class ChartJSControllerImpl implements ChartJSController {
     ChartDispatcher.addAxisY(dataAxisSettings);
   }
 
-  appendDataset(data: any[], optimized: boolean, diffted: boolean, bins: number, metadata: ArchiverMetadata): void {
+  appendDataset(data: any[], optimized: boolean, diffted: boolean, bins: number, color: string|undefined, metadata: ArchiverMetadata): void {
     const { pvName, EGU, PREC } = metadata;
     const unit = eguNormalize(EGU, pvName);
 
     const precision = PREC === 0 || PREC === undefined || PREC === null ? 4 : PREC;
 
     // Parses the data fetched from the archiver the way that the chart's internal classes can plot
-    const color = colorStack.length > 0 ? colorStack.pop() : randomColorGenerator();
+    if(!color){
+      color = colorStack.length > 0 ? colorStack.pop() : randomColorGenerator();
+    }else{
+      const idx_color = colorStack.indexOf(color);
+      delete colorStack[idx_color];
+    }
+
 
     // Adds a new vertical axis if no other with the same unit exists
     this.appendDataAxis(unit, precision);

diff --git a/src/entities/Chart/ChartJS/interface.ts b/src/entities/Chart/ChartJS/interface.ts
@@ -43,7 +43,7 @@ export interface ChartJSController {
   toggleAxisType(axisId: string): void;
 
   appendDataAxis(nId: string, ticksPrecision: number): void;
-  appendDataset(data: any[], optimized: boolean, diff: boolean, bins: number, metadata: ArchiverMetadata): void;
+  appendDataset(data: any[], optimized: boolean, diff: boolean, bins: number, color: string, metadata: ArchiverMetadata): void;
 
   setDatasetOptimized(name: string, optimized: boolean): void;
   setDatasetDiff(name: string, diffted: boolean): void;

diff --git a/src/entities/Chart/impl.ts b/src/entities/Chart/impl.ts
@@ -79,8 +79,8 @@ class ChartImpl implements ChartInterface {
     }
   }
 
-  appendDataset(data: any[], optimized: boolean, diff: boolean, bins: number, metadata: ArchiverMetadata): void {
-    this.chartjs.appendDataset(data, optimized, diff, bins, metadata);
+  appendDataset(data: any[], optimized: boolean, diff: boolean, bins: number, color: string, metadata: ArchiverMetadata): void {
+    this.chartjs.appendDataset(data, optimized, diff, bins, color, metadata);
   }
 
   init(c: Chart): void {
@@ -757,8 +757,9 @@ class ChartImpl implements ChartInterface {
         const {
           label,
           pv: { bins, optimized, diff },
+          backgroundColor
         } = this.chartjs.getDatasetSettings(e.label);
-        pvs.push({ bins, label, optimized, diff });
+        pvs.push({ bins, label, optimized, diff, color:backgroundColor });
       });
     }
     const settings: Settings = { end: this.time.getEnd(), start: this.time.getStart(), ref: this.time.getRefDiff(), pvs };

diff --git a/src/entities/Chart/interface.ts b/src/entities/Chart/interface.ts
@@ -1,7 +1,7 @@
 import { ArchiverMetadata } from "../../data-access/interface";
 
 interface ChartInterface {
-  appendDataset(data: any[], optimized: boolean, diff: boolean, bins: number, metadata: ArchiverMetadata): void;
+  appendDataset(data: any[], optimized: boolean, diff: boolean, bins: number, color: string, metadata: ArchiverMetadata): void;
   updateTimeAxis(start?: Date, end?: Date): void;
 }
 export default ChartInterface;
diff --git a/src/use-cases/PlotPVs/impl.ts b/src/use-cases/PlotPVs/impl.ts
@@ -31,6 +31,7 @@ class PlotPVsImpl implements PlotPVs {
     optimized: boolean,
     diff: boolean,
     bins: number,
+    color: string,
     metadata: ArchiverMetadata
   ): Promise<void> {
     const start: Date = control.getStart();
@@ -44,19 +45,19 @@ class PlotPVsImpl implements PlotPVs {
       const { data } = res;
 
       const _data = fixOutOfRangeData(data, control.getStart(), control.getEnd());
-      control.appendDataset(_data, optimized, diff, bins, metadata);
+      control.appendDataset(_data, optimized, diff, bins, color, metadata);
     } catch (e) {
       let msg: string;
 
       if (e instanceof OptimizeDataError) {
         msg = `Failed to retrieve optimized data for ${pv} using optimize_${bins} [${start}, ${end}]`;
-        await this.fetchAndInsertPV(pv, false, false, -1, metadata);
+        await this.fetchAndInsertPV(pv, false, false, -1, color, metadata);
 
         console.warn(msg);
         StatusDispatcher.Warning("Append PV: Fetch data", msg);
       }else if (e instanceof DiffDataError) {
         msg = `Failed to retrieve diff data for ${pv} using diff [${start}, ${end}]`;
-        await this.fetchAndInsertPV(pv, false, false, -1, metadata);
+        await this.fetchAndInsertPV(pv, false, false, -1, color, metadata);
 
         console.warn(msg);
         StatusDispatcher.Warning("Append PV: Fetch data", msg);
@@ -70,23 +71,23 @@ class PlotPVsImpl implements PlotPVs {
     }
   }
 
-  private async appendPV(pv: string, optimize?: boolean, diff?: boolean, bins = DefaultBinSize): Promise<void> {
+  private async appendPV(pv: string, optimize?: boolean, diff?: boolean, bins = DefaultBinSize, color?: string): Promise<void> {
     const metadata = await this.getPVMetadata(pv);
 
-    await this.fetchAndInsertPV(pv, optimize, diff, bins, metadata);
+    await this.fetchAndInsertPV(pv, optimize, diff, bins, color, metadata);
 
     control.updateOptimizedWarning();
     control.updateDiffWarning();
     control.updateURL();
   }
 
-  plotPV({ name, optimize, diff, bins, updateChart }: PlotPVParams): void {
+  plotPV({ name, optimize, diff, bins, color, updateChart }: PlotPVParams): void {
     const pvIndex = control.getPlotIndex(name);
     const shouldUpdateExistingPV = pvIndex !== null;
     if (shouldUpdateExistingPV) {
       control.updatePlot(pvIndex);
     } else {
-      this.appendPV(name, optimize, diff, bins);
+      this.appendPV(name, optimize, diff, bins, color);
     }
     if (updateChart === true) {
       this.update();

diff --git a/src/use-cases/PlotPVs/interface.ts b/src/use-cases/PlotPVs/interface.ts
@@ -2,6 +2,7 @@ export interface PlotPVParams {
   name: string;
   optimize: boolean;
   diff: boolean;
+  color?: string;
   bins?: number;
   updateChart?: boolean;
 }

diff --git a/src/utility/Browser/impl.ts b/src/utility/Browser/impl.ts
@@ -16,6 +16,13 @@ export class Browser implements BrowserInterface {
       let diff = false;
       let bins = -1;
       let pvname = str;
+      let color: string|null = null;
+      if(str.indexOf("__") !== -1){
+        const url_param = str.split("__")
+        pvname = url_param[0];
+        str = url_param[0];
+        color = url_param[1];
+      }
 
       if (str.indexOf("optimized_") !== -1) {
         bins = parseFloat(str.substr("optimized_".length, str.indexOf("(") + 1));
@@ -30,7 +37,7 @@ export class Browser implements BrowserInterface {
         diff = true;
       }
 
-      return { optimize, diff, bins, pvname };
+      return { optimize, diff, bins, pvname, color };
     };
 
     const createDateFromString = (str: string): Date => {
@@ -88,8 +95,7 @@ export class Browser implements BrowserInterface {
 
   updateAddress({ end, start, ref, pvs }: Settings): void {
     let searchString = "?";
-    pvs.forEach(({ bins, label, optimized, diff }) => {
-
+    pvs.forEach(({ bins, label, optimized, diff, color }) => {
       let stringPV = ""
 
       if (optimized) {
@@ -99,11 +105,11 @@ export class Browser implements BrowserInterface {
       }
 
       if (diff) {
-        searchString += `pv=${stringPV}_diff&`;
+        searchString += `pv=${stringPV}_diff`;
       } else {
-        searchString += `pv=${stringPV}&`;
+        searchString += `pv=${stringPV}`;
       }
-
+      searchString += `__${color}&`;
     });
 
     searchString += `from=${encodeURIComponent(start.toJSON())}&`;

diff --git a/src/utility/Browser/interface.ts b/src/utility/Browser/interface.ts
@@ -3,6 +3,7 @@ export interface SettingsPVs {
   bins: number;
   optimized: boolean;
   diff: boolean;
+  color: string;
 }
 export interface Settings {
   start: Date;
@@ -16,6 +17,7 @@ export interface ConfigPV {
   optimize: boolean;
   diff: boolean;
   bins: number;
+  color?: string;
 }
 
 export interface ConfigParameters {