Graphique de la PAB: réglages conservés

src/app/components/pab-results/pab-results.component.ts

@@ -24,6 +24,9 @@ export class PabResultsComponent implements DoCheck {
     /** résultats non mis en forme */
     private _pabResults: PabResults;
 
+    /** résultats mis en forme pour le graphique */
+    private _plottableResults: PlottablePabResults;
+
     /** true si les résultats doiventt être remis à jour */
     private _doUpdate = false;
 
@@ -40,7 +43,9 @@ export class PabResultsComponent implements DoCheck {
 
     constructor(
         private appSetupService: ApplicationSetupService,
-    ) { }
+    ) {
+        this._plottableResults = new PlottablePabResults();
+    }
 
     public set results(rs: CalculatorResults[]) {
         this._pabResults = undefined;
@@ -138,7 +143,7 @@ export class PabResultsComponent implements DoCheck {
 
     /** builds a set of PlottableData from PabResults, to feed the graph */
     protected get plottableResults(): PlottableData {
-        const pr = new PlottablePabResults(this._pabResults);
-        return pr;
+        this._plottableResults.setPabResults(this.pabResults);
+        return this._plottableResults;
     }
 }

src/app/results/plottable-pab-results.ts

@@ -11,13 +11,18 @@ export class PlottablePabResults implements PlottableData {
 
     protected pabResults: PabResults;
 
-    public constructor(pabResults: PabResults) {
-        this.pabResults = pabResults;
-
+    public constructor(pabResults?: PabResults) {
+        if (pabResults) {
+            this.setPabResults(pabResults);
+        }
         // axes par défaut
-        console.log(">> axes par défaut");
-        this.chartX = "CLOISON";
-        this.chartY = "Z1_PAB";
+        this.chartX = this.chartX || "CLOISON";
+        this.chartY = this.chartY || "Z1_PAB";
+    }
+
+    /** reaffect pabResults, for ex. when objet was contructed with empty pabResults */
+    public setPabResults(pabResults: PabResults) {
+        this.pabResults = pabResults;
     }
 
     /**
@@ -126,68 +131,6 @@ export class PlottablePabResults implements PlottableData {
                 break;
         }
 
-        // line 1
-        /* this._dataSet.push([
-            "", "", "", "",
-            this._pabResults.cloisonsResults[0] ? this._pabResults.cloisonsResults[0].vCalc.toFixed(nDigits) : "X",
-            "", "", "", ""
-        ]);
-
-        // lines 2 - n-1
-        for (let i = 0; i < pr.cloisonsResults.length - 1; i++) {
-            // console.log("pr.cloisonsResults[i]", pr.cloisonsResults[i]);
-            // console.log("resultElement STRINGIFIÉ", JSON.stringify(pr.cloisonsResults[i].resultElement));
-            const ZRAM = pr.cloisonsResults[i].getExtraResult("ZRAM");
-            const PV = pr.cloisonsResults[i].getExtraResult("PV");
-            const Y = pr.cloisonsResults[i].getExtraResult("Y");
-            const ZRB = pr.cloisonsResults[i].getExtraResult("ZRB");
-            this._dataSet.push([
-                i + 1,
-                (pr.cloisonsResults[i].vCalc - pr.cloisonsResults[i + 1].vCalc).toFixed(nDigits),
-                (ZRAM !== undefined) ? ZRAM.toFixed(nDigits) : "X",
-                pr.cloisonsQ[i].toFixed(nDigits),
-                pr.cloisonsResults[i + 1].vCalc.toFixed(nDigits),
-                (PV !== undefined) ? PV.toFixed(nDigits) : "X",
-                (Y !== undefined) ? Y.toFixed(nDigits) : "X",
-                (ZRB !== undefined) ? ZRB.toFixed(nDigits) : "X",
-                pr.bassinsQA[i]
-            ]);
-        }
-
-        // line n
-        const l = pr.cloisonsResults.length;
-        const nZRAM = pr.cloisonsResults[l - 1].getExtraResult("ZRAM");
-        const nPV = pr.cloisonsResults[l - 1].getExtraResult("PV");
-        const nY = pr.cloisonsResults[l - 1].getExtraResult("Y");
-        const nZRB = pr.cloisonsResults[l - 1].getExtraResult("ZRB");
-        this._dataSet.push([
-            l,
-            (pr.cloisonsResults[l - 1].vCalc - pr.cloisonAvalResults.vCalc).toFixed(nDigits),
-            (nZRAM !== undefined) ? nZRAM.toFixed(nDigits) : "X",
-            pr.cloisonsQ[l - 1].toFixed(nDigits),
-            pr.cloisonAvalResults.vCalc.toFixed(nDigits),
-            (nPV !== undefined) ? nPV.toFixed(nDigits) : "X",
-            (nY !== undefined) ? nY.toFixed(nDigits) : "X",
-            (nZRB !== undefined) ? nZRB.toFixed(nDigits) : "X",
-            pr.bassinsQA[l - 1]
-        ]);
-
-        // downstream line
-        const caZRAM = pr.cloisonAvalResults.getExtraResult("ZRAM");
-        this._dataSet.push([
-            this.intlService.localizeText("INFO_EXTRARES_LIB_AVAL"),
-            (pr.cloisonAvalResults.vCalc - pr.Z2).toFixed(nDigits),
-            (caZRAM !== undefined) ? caZRAM.toFixed(nDigits) : "X",
-            pr.cloisonAvalQ.toFixed(nDigits),
-            pr.Z2.toFixed(nDigits),
-            "",
-            "",
-            "",
-            ""
-        ]); */
-
-
-
         return data;
     }
 }

src/app/results/var-results.ts

@@ -185,7 +185,7 @@ export class VarResults extends CalculatedParamResults implements PlottableData
             this._extraResultHeaders.push(intlService.getExtraResLabel(k));
         }
 
-        // when variable parameter changes, ensure the X / Y current values are still availble
+        // when variable parameter changes, ensure the X / Y current values are still available
         // (might be the previous variated parameter, that is not accessible anymore)
         const aca = this.getAvailableChartAxis();
         if (! aca.includes(this.chartX)) {