remous : correction d'un bug d'affichage des courbes fluviale, torrentielle et...

remous : correction d'un bug d'affichage des courbes fluviale, torrentielle et paramètre supplémentaire

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

@@ -196,15 +196,15 @@ export class RemousResultsComponent {
             let yTor: string = r["tor"];
 
             let yExtra: string = r["extraFlu"];
-            if (yExtra == undefined)
+            if (yExtra == "")
                 yExtra = r["extraTor"];
 
-            if (yFlu != undefined && yFlu != "")
-                dataFlu.push(this.mapY(x, +yFlu));
-            if (yTor != undefined && yTor != "")
-                dataTor.push(this.mapY(x, +yTor));
-            if (yExtra != undefined && yExtra != "")
-                dataExtra.push(this.mapY(x, +yExtra));
+            if (yFlu != "")
+                dataFlu.push({ "x": x, "y": this.mapY(x, +yFlu) });
+            if (yTor != "")
+                dataTor.push({ "x": x, "y": this.mapY(x, +yTor) });
+            if (yExtra != "")
+                dataExtra.push({ "x": x, "y": this._extraGraph ? +yExtra : this.mapY(x, +yExtra) });
         }
         if (this._extraGraph)
             ds2.push({ label: this._extraParamLabel, data: dataExtra, tension: 0, borderColor: "#0093BD", pointRadius: 5 });