diff --git a/src/nub.ts b/src/nub.ts index d8110b2bb4cdeb404b583cc4705f8f3c2beef418..a5160d4a6e0ee5aec7c1ed1b5fa9dd10d0044d49 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 baca22343183e8b927f8720cbf30af0529a69980..091786adfcf4dcb0d32ad441b321109fa5d4d3a2 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 */