Skip to content
Snippets Groups Projects
Commit 97b783e7 authored by francois.grand's avatar francois.grand
Browse files

#77 adaptation de la passe à bassins (puissance dissipée) à la factory de Nub

parent f206657f
No related branches found
No related tags found
1 merge request!15Resolve "faire les modifications nécessaires prendre en compte le ticket cassiopee/jalhyd#46 (Gestion de la session dans la lib)"
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() {
......
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment