From 2ee14002c42ffdd139c795ee32e7963c76779b20 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Fri, 8 Jun 2018 11:27:17 +0200
Subject: [PATCH] =?UTF-8?q?=20#45=20compl=C3=A9ment=20au=20commit=20a4b5c3?=
=?UTF-8?q?a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/param/param-base.ts | 2 +-
src/param/param-definition.ts | 12 ++----------
src/param/param-values.ts | 4 ++++
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/param/param-base.ts b/src/param/param-base.ts
index 7eaae19a..8da7d270 100644
--- a/src/param/param-base.ts
+++ b/src/param/param-base.ts
@@ -83,7 +83,7 @@ export class BaseParam extends JalhydObject implements IObjectReference {
public setValue(val: number) {
this.checkValue(val);
- this._paramValues.setSingleValue(val);
+ this._paramValues.currentValue = val;
}
public get uncheckedValue(): number {
diff --git a/src/param/param-definition.ts b/src/param/param-definition.ts
index 8a90e7ed..5b674d24 100644
--- a/src/param/param-definition.ts
+++ b/src/param/param-definition.ts
@@ -63,16 +63,8 @@ export class ParamDefinition extends BaseParam {
else
return this.referencedExtraResult;
}
- else
- switch (this.paramValues.valueMode) {
- case ParamValueMode.SINGLE:
- case ParamValueMode.LISTE:
- case ParamValueMode.MINMAX:
- return super.getValue();
-
- default:
- throw new Error(`mode de valeur ${ParamValueMode[this.paramValues.valueMode]} incorrect pour le paramètre`);
- }
+
+ return super.getValue();
}
set v(val: number) {
diff --git a/src/param/param-values.ts b/src/param/param-values.ts
index 636da466..cd30b294 100644
--- a/src/param/param-values.ts
+++ b/src/param/param-values.ts
@@ -143,6 +143,10 @@ export class ParamValues implements IObjectReference {
return this._currentValue.value;
}
+ public set currentValue(v: number) {
+ this._currentValue.value = v;
+ }
+
/**
* valeur dans le mode SINGLE
*/
--
GitLab