From fa36dd298ad9d0060c762c4f50cd349621eb61e6 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Wed, 6 Jun 2018 10:25:00 +0200
Subject: [PATCH] =?UTF-8?q?=20#45=20classe=20Result=20:=20ajout=20de=20la?=
 =?UTF-8?q?=20propri=C3=A9t=C3=A9=20"name"=20pour=20d=C3=A9signer=20de=20q?=
 =?UTF-8?q?uel=20r=C3=A9sultat=20on=20parle=20(symbole=20du=20param=C3=A8t?=
 =?UTF-8?q?re,=20etc...)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nub.ts         |  7 ++++---
 src/util/result.ts | 13 +++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/nub.ts b/src/nub.ts
index d8110b2b..a5160d4a 100644
--- a/src/nub.ts
+++ b/src/nub.ts
@@ -47,12 +47,14 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
         }
         if (computedVar.isAnalytical()) {
             this._result = this.Equation(sVarCalc);
+            this._result.name = sVarCalc;
             return this._result;
         }
 
         const resSolve: Result = this.Solve(sVarCalc, rInit, rPrec);
         if (!resSolve.ok) {
             this._result = resSolve;
+            this._result.name = sVarCalc;
             return this._result;
         }
         const sAnalyticalPrm: string = this.getFirstAnalyticalParameter().symbol;
@@ -60,6 +62,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
         const res: Result = this.Equation(sAnalyticalPrm);
         res.vCalc = resSolve.vCalc;
         this._result = res;
+        this._result.name = sVarCalc;
         return res;
     }
 
@@ -70,9 +73,6 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
      * @param sDonnee éventuel symbole du paramètre à calculer
      */
     public CalcSerie(rPrec: number = 0.001, rInit?: number, sDonnee?: string): Result {
-        const res = new Result();
-        this._result = res;
-
         let variatedParam: ParamDefinition;
         let computedParam: ParamDefinition;
         for (const p of this.parameterIterator) {
@@ -126,6 +126,7 @@ export abstract class Nub extends ComputeNode implements IReferencedObject {
             this._result = res;
         }
 
+        this._result.name = computedSymbol;
         return this._result;
     }
 
diff --git a/src/util/result.ts b/src/util/result.ts
index baca2234..091786ad 100644
--- a/src/util/result.ts
+++ b/src/util/result.ts
@@ -15,6 +15,11 @@ export class Result {
 
     private _resultElements: ResultElement[];
 
+    /**
+     * nom de la variable/paramètre calculé
+     */
+    private _name: string;
+
     constructor(v?: number | Message | ResultElement, d?: any) {
         this._globalLog = new cLog();
         this._resultElements = [];
@@ -29,6 +34,14 @@ export class Result {
         }
     }
 
+    public get name(): string {
+        return this._name;
+    }
+
+    public set name(n: string) {
+        this._name = n;
+    }
+
     /**
      * retourne le journal de la calculette
      */
-- 
GitLab