From 1c83ddb73bf2285269f055581fdbebd8188f5051 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Fri, 9 Mar 2018 15:15:20 +0100
Subject: [PATCH] simplification de l'utilisation de l'enum CalculatorType
---
src/app/formulaire/definition/form-def-section.ts | 2 +-
src/app/formulaire/definition/form-result-fixedvar.ts | 3 ++-
src/app/services/param/param.service.ts | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/app/formulaire/definition/form-def-section.ts b/src/app/formulaire/definition/form-def-section.ts
index 4514d241f..558d4f458 100644
--- a/src/app/formulaire/definition/form-def-section.ts
+++ b/src/app/formulaire/definition/form-def-section.ts
@@ -1,5 +1,5 @@
import {
- ComputeNodeType, CalculatorType, ParamsSectionTrapez, cSnTrapez, ParamsSectionRectang, cSnRectang,
+ ComputeNodeType, ParamsSectionTrapez, cSnTrapez, ParamsSectionRectang, cSnRectang,
ParamsSectionCirc, cSnCirc, ParamsSectionPuiss, cSnPuiss, acSection, ParamsEquation
} from "jalhyd";
diff --git a/src/app/formulaire/definition/form-result-fixedvar.ts b/src/app/formulaire/definition/form-result-fixedvar.ts
index 7cd26b3bb..5508e98ac 100644
--- a/src/app/formulaire/definition/form-result-fixedvar.ts
+++ b/src/app/formulaire/definition/form-result-fixedvar.ts
@@ -1,6 +1,7 @@
+import { ResultElement, cLog } from "jalhyd";
+
import { FixedVarResults, GraphType } from "../../results/fixed-var-results";
import { ParamRadioConfig, NgParameter, ParamValueMode } from "../ngparam";
-import { Nub, ParamsEquation, CalculatorType, Result, ResultElement, cLog } from "jalhyd";
import { FormResult } from "./form-result";
import { FormulaireDefinition } from "./form-definition";
import { CalculatorResults } from "../../results/calculator-results";
diff --git a/src/app/services/param/param.service.ts b/src/app/services/param/param.service.ts
index 57706e786..8d088ef02 100644
--- a/src/app/services/param/param.service.ts
+++ b/src/app/services/param/param.service.ts
@@ -4,16 +4,16 @@ import { NgParameter } from "../../formulaire/ngparam";
import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
export class ParamService {
- private createAccuracyParameter(calcType: CalculatorType): ParamDefinition {
+ private createAccuracyParameter(): ParamDefinition {
const d = new ParamDomain(ParamDomainValue.INTERVAL, 1e-10, 100);
- const p = new ParamDefinition(calcType, 'Pr', d);
+ const p = new ParamDefinition('Pr', d);
p.calculability = ParamCalculability.FREE;
return p;
}
public createParameter(calcType: CalculatorType, nodeType: ComputeNodeType, symbol: string, isTmpl = false): NgParameter {
if (symbol === "Pr")
- var prmDef: ParamDefinition = this.createAccuracyParameter(calcType);
+ var prmDef: ParamDefinition = this.createAccuracyParameter();
else
prmDef = ComputeNodeParameters.getInstance().getComputeNodeParameter(calcType, nodeType, symbol);
--
GitLab