diff --git a/src/app/calculators/macrorugoremous/en.json b/src/app/calculators/macrorugoremous/en.json index 2a4de3bbbb01c0b69155b1a8f4fb23bc9eb258e1..231a37c2156288a77835f7183776f952000efbf7 100644 --- a/src/app/calculators/macrorugoremous/en.json +++ b/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", diff --git a/src/app/calculators/macrorugoremous/fr.json b/src/app/calculators/macrorugoremous/fr.json index 108fb740b3b2678483c4c14f381802d4ca5c1cc8..081a929d4c04bf4f53cd03b9c6e4067dc871a468 100644 --- a/src/app/calculators/macrorugoremous/fr.json +++ b/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", diff --git a/src/app/components/calculator-results/calculator-results.component.html b/src/app/components/calculator-results/calculator-results.component.html index 61ddf062b3f7b144d0375276fc83fcd9963bc8ee..c2bf438d05995716d063dcacbb7bad79c609628c 100644 --- a/src/app/components/calculator-results/calculator-results.component.html +++ b/src/app/components/calculator-results/calculator-results.component.html @@ -1,10 +1,10 @@ <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> diff --git a/src/app/components/calculator-results/calculator-results.component.ts b/src/app/components/calculator-results/calculator-results.component.ts index 796d0e481ca79e3504b8ed9efdb98377b1f3a3cd..acc655e44d3d85073a7184c99c69833550432227 100644 --- a/src/app/components/calculator-results/calculator-results.component.ts +++ b/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; } diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts index 499b77cc1e47a960394c46a9fe790b391f860dc2..18955e18d960ebd6f1e5513330d9a19bed1672a6 100644 --- a/src/app/components/generic-calculator/calculator.component.ts +++ b/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); diff --git a/src/app/components/remous-results/remous-results.component.ts b/src/app/components/remous-results/remous-results.component.ts index 2fd73ae1e13f3ecb6b1b9444b07e0800ca6435f8..454a4a7ccff5ecb0da04d669496561303a960ee0 100644 --- a/src/app/components/remous-results/remous-results.component.ts +++ b/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; } /** diff --git a/src/app/results/remous-results.ts b/src/app/results/remous-results.ts index 6474180121bba3063eb77c3e80971d47cebf45ff..57cec46c40e52144180d9674a643de5c8111b892 100644 --- a/src/app/results/remous-results.ts +++ b/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; }