fix: results for MacroRugoRemous form

refs #609

src/app/calculators/macrorugoremous/en.json

@@ -3,7 +3,9 @@
     
     "fs_condlim": "Boundary conditions",
     "Dx": "Discretisation step",
-    
+    "Y": "Water depth",
+    "ZW": "Water line",
+
     "select_resolution": "Resolution method",
     "RESOLUTION_0": "Integration by trapezoid",
     "RESOLUTION_1": "Runge Kutta fourth order",

src/app/calculators/macrorugoremous/fr.json

@@ -3,6 +3,8 @@
 
     "fs_condlim": "Conditions aux limites",
     "Dx": "Pas de discrétisation",
+    "Y": "Tirant d'eau",
+    "ZW": "Ligne d'eau",
 
     "select_resolution": "Méthode de résolution",
     "RESOLUTION_0": "Intégration par trapèzes",

src/app/components/calculator-results/calculator-results.component.html

 <div>
     <section-results *ngIf="isSP" [results]=formResultsArray></section-results>
-    <remous-results *ngIf="isRemous" [results]=formResultsArray></remous-results>
+    <remous-results *ngIf="isRemous || isMRR" [results]=formResultsArray></remous-results>
     <pab-results *ngIf="isPAB" [results]=formResultsArray></pab-results>
     <pb-results *ngIf="isPB" [results]=formResultsArray></pb-results>
     <verificateur-results *ngIf="isVerificateur" [results]=formResultsArray></verificateur-results>
     <macrorugo-compound-results *ngIf="isMRC" [results]=formResultsArray></macrorugo-compound-results>
     <jet-results *ngIf="isJet" [results]=formResultsArray></jet-results>
-    <fixedvar-results *ngIf="! isJet" [results]=formResultsArray></fixedvar-results>
+    <fixedvar-results *ngIf="!isJet && !isMRR" [results]=formResultsArray></fixedvar-results>
 </div>

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

@@ -57,6 +57,10 @@ export class CalculatorResultsComponent implements AfterViewChecked {
         return this.calculatorComponent.isMRC;
     }
 
+    public get isMRR() {
+        return this.calculatorComponent.isMRR;
+    }
+
     public get isJet() {
         return this.calculatorComponent.isJet;
     }

src/app/components/generic-calculator/calculator.component.ts

@@ -705,6 +705,11 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         return this.is(CalculatorType.MacroRugoCompound);
     }
 
+    // true if current Nub is MacroRugoRemous
+    public get isMRR() {
+        return this.is(CalculatorType.MacroRugoRemous);
+    }
+
     // true if current Nub is MacroRugoCompound
     public get isPAM() {
         return this.is(CalculatorType.MacroRugo);

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

@@ -187,13 +187,7 @@ export class RemousResultsComponent extends ResultsComponentDirective implements
      * Retourne un peudo-paramètre variable représentant toutes les abscisses possibles
      */
     private get abscissaePseudoParameter(): ParamDefinition {
-        const param = new ParamDefinition(undefined, "", ParamDomainValue.POS_NULL);
-        param.setValues(
-            0,
-            this._remousResults.Long,
-            this._remousResults.Dx
-        );
-        return param;
+        return this._remousResults.xValues;
     }
 
     /**

src/app/results/remous-results.ts

@@ -83,6 +83,13 @@ export class RemousResults extends CalculatorResults {
         this._hasTor = false;
         this._hasExtra = false;
         this._extraChart = false;
+
+        // série de valeurs de X
+        this._xValues = new ParamDefinition(
+            undefined,
+            "ABSCISSE",
+            ParamDomainValue.POS_NULL
+        );
     }
 
     public set parameters(p: CourbeRemousParams) {
@@ -100,13 +107,6 @@ export class RemousResults extends CalculatorResults {
         // pas d'espace
         this._Dx = nub.getParameter("Dx").singleValue;
 
-        // série de valeurs de X
-        this._xValues = new ParamDefinition(
-            p,
-            "ABSCISSE",
-            ParamDomainValue.POS_NULL
-        );
-
         // cote de fond amont
         this._ZF1 = nub.getParameter("ZF1").singleValue;
 
@@ -122,6 +122,10 @@ export class RemousResults extends CalculatorResults {
         return this._varResults;
     }
 
+    public get xValues(): ParamDefinition {
+        return this._xValues;
+    }
+
     public get result(): Result {
         return this._result;
     }