From c1e02e3731aa96c87b19f2c35d0b88690a7ba2d0 Mon Sep 17 00:00:00 2001 From: zueuk Date: Fri, 2 Jun 2006 12:31:47 +0000 Subject: [PATCH] fixed wrong calc-function selection --- 2.10/Source/varJuliaN.pas | 11 +++++++---- 2.10/Source/varJuliaScope.pas | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/2.10/Source/varJuliaN.pas b/2.10/Source/varJuliaN.pas index 292e7a9..454f6ea 100644 --- a/2.10/Source/varJuliaN.pas +++ b/2.10/Source/varJuliaN.pas @@ -66,10 +66,13 @@ end; /////////////////////////////////////////////////////////////////////////////// procedure TVariationJulian.GetCalcFunction(var f: TCalcFunction); begin - if cn = 1/4 then f := CalcPower2 - else if cn = -1/4 then f := CalcPowerMinus2 - else if cn = 1/2 then f := CalcPower1 - else if cn = -1/2 then f := CalcPowerMinus1 + if c = 1 then begin + if N = 2 then f := CalcPower2 + else if N = -2 then f := CalcPowerMinus2 + else if N = 1 then f := CalcPower1 + else if N = -1 then f := CalcPowerMinus1 + else f := CalcFunction; + end else f := CalcFunction; end; diff --git a/2.10/Source/varJuliaScope.pas b/2.10/Source/varJuliaScope.pas index 1fe99cc..930872b 100644 --- a/2.10/Source/varJuliaScope.pas +++ b/2.10/Source/varJuliaScope.pas @@ -67,10 +67,13 @@ end; /////////////////////////////////////////////////////////////////////////////// procedure TVariationJuliaScope.GetCalcFunction(var f: TCalcFunction); begin - if cn = 1/4 then f := CalcPower2 - else if cn = -1/4 then f := CalcPowerMinus2 - else if cn = 1/2 then f := CalcPower1 - else if cn = -1/2 then f := CalcPowerMinus1 + if c = 1 then begin + if N = 2 then f := CalcPower2 + else if N = -2 then f := CalcPowerMinus2 + else if N = 1 then f := CalcPower1 + else if N = -1 then f := CalcPowerMinus1 + else f := CalcFunction; + end else f := CalcFunction; end;