diff --git a/src/app/formulaire/definition/concrete/form-passe-bassin-puissance.ts b/src/app/formulaire/definition/concrete/form-passe-bassin-puissance.ts index 2dd9ae04076a8ed9155b3a9c1f28f4df98b68ad8..b015411520b8a4cb43911880ce833e48b6c67d5d 100644 --- a/src/app/formulaire/definition/concrete/form-passe-bassin-puissance.ts +++ b/src/app/formulaire/definition/concrete/form-passe-bassin-puissance.ts @@ -1,8 +1,9 @@ +import { CalculatorType, ComputeNodeType } from "jalhyd"; + import { FormDefFixedVar } from "../form-def-fixedvar"; import { FormResultFixedVar } from "../form-result-fixedvar"; import { ApplicationSetupService } from "../../../services/app-setup/app-setup.service"; import { ParamService } from "../../../services/param/param.service"; -import { CalculatorType } from "jalhyd"; import { FormulaireDefinition } from "../form-definition"; import { FormComputePasseBassinPuissance } from "../form-compute-pab-bassin-puissance"; import { CalculatorResults } from "../../../results/calculator-results"; @@ -26,6 +27,7 @@ export class FormulairePasseBassinPuissance extends FormulaireDefinition { } protected createNubs() { + this._nubs.set(ComputeNodeType.None, this.paramService.createNub(this.calculatorType)); } protected initParse() { diff --git a/src/app/formulaire/definition/form-compute-pab-bassin-puissance.ts b/src/app/formulaire/definition/form-compute-pab-bassin-puissance.ts index c8bd05ea47edcbddff5958dedbb5375664294483..e7d689de3517f29a18894b059eca6044a6bee9b9 100644 --- a/src/app/formulaire/definition/form-compute-pab-bassin-puissance.ts +++ b/src/app/formulaire/definition/form-compute-pab-bassin-puissance.ts @@ -1,4 +1,4 @@ -import { ComputeNode, ParamsEquation, PabPuissanceParams, PabPuissance } from "jalhyd"; +import { ComputeNode, ParamsEquation, PabPuissanceParams, PabPuissance, ComputeNodeType } from "jalhyd"; import { FormComputeFixedVar } from "./form-compute-fixedvar"; import { FormulaireDefinition } from "./form-definition"; @@ -9,17 +9,7 @@ export class FormComputePasseBassinPuissance extends FormComputeFixedVar { super(formBase, formResult); } - public getNubAndParameters(): [ComputeNode, ParamsEquation] { - let DH: number = this._formBase.getParameterValue("DH"); // Chute entre bassins - let Q: number = this._formBase.getParameterValue("Q"); // Débit - let V: number = this._formBase.getParameterValue("V"); // volume V - let Pv: number = this._formBase.getParameterValue("Pv"); // puissance dissipée - let prms = new PabPuissanceParams(DH, Q, V, Pv); - let nub = new PabPuissance(prms); // pour initialiser la calculabilité des paramètres - return [nub, prms]; - } - protected getCurrentNub() { - return undefined; + return this._formBase.getNub(ComputeNodeType.None); } } \ No newline at end of file