From ead0829da96b25e4ada790936f3d956adc36dbc9 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Thu, 28 Jun 2018 15:20:34 +0200
Subject: [PATCH] #45 Nub.getReferencedValuesIterator() : utilisation de
getReferencedObject()
---
src/nub.ts | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/nub.ts b/src/nub.ts
index bb7bff8f..e8626d37 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -211,25 +211,8 @@ export abstract class Nub extends ComputeNode implements IReferencedNub {
}
public getReferencedValuesIterator(desc: string): NumberIterator {
- const tmp = desc.split(".");
-
- if (tmp.length > 1 && tmp[1] === "")
- if (this._result !== undefined && this._result.name === tmp[0])
- return this._result.valuesIterator;
-
- const p = this.getParameter(desc);
- switch (p.paramValues.valueMode) {
- case ParamValueMode.SINGLE:
- case ParamValueMode.MINMAX:
- case ParamValueMode.LISTE:
- return p.paramValues.valuesIterator;
-
- case ParamValueMode.CALCUL:
- return this.getReferencedResult(desc).valuesIterator;
-
- case ParamValueMode.LINK:
- throw new Error(`Nub.getReferencedValuesIterator() : mode de valeur ${ParamValueMode[p.paramValues.valueMode]} invalide pour le paramètre référencé par ${desc}`);
- }
+ const ro = this.getReferencedObject(desc);
+ return ro.valuesIterator;
}
public getReferencedObject(desc: string): NamedIterableValues {
--
GitLab