exprtofloat ausgelagert und umstrukturiert

1 files changed, 28 insertions, 6 deletions

diff --git a/typenunit.pas b/typenunit.pas
index 20754c0..6e7dab0 100644
--- a/typenunit.pas
+++ b/typenunit.pas
@@ -5,7 +5,7 @@ unit typenunit;
 interface
 
 uses
-  sysutils, agg_2D, FPimage, agg_basics, classes, Math, mystringlistunit, lowlevelunit;
+  sysutils, agg_2D, FPimage, agg_basics, classes, Math, mystringlistunit, lowlevelunit, matheunit;
 
 const Speicherhappen = 32768; // Anzahl an mit einem Mal zu reservierender Arrayzellen
       myInf = 1e12;
@@ -14,8 +14,6 @@ const Speicherhappen = 32768; // Anzahl an mit einem Mal zu reservierender Array
 
 type
   tExtraInfos = class;
-  tCallBackGetValue = function(name: string): extended of object;
-  tExprToFloat = function(syntaxtest: boolean; name: string): extended of object;
   tIntegrationsRichtung = (irHorizontal,irEinfall,irAusfall);
   tGenerischeInputDateiInfo = class // nur zum Vererben gedacht, nie selbst instanziieren!
     Name,Fehlerbehebungskommando: string;
@@ -197,17 +195,17 @@ type
   tWaveletTyp = (wtSin2,wtFrequenzfenster);
   tTransformationen = class;
   tExtraInfos = class
-    maxW,minW,
-//      xstart,xstop,tstart,tstop,
-      np,beta: extended;
+    maxW,minW,np,beta:                           extended;
     tsiz,xsteps,tsiz_,xsteps_:                   longint;
     transformationen:                            tTransformationen;
+    knownValues:                                 tKnownValueArray;
     constructor create;
     destructor destroy; override;
     function xstart: extended;
     function xstop: extended;
     function tstart: extended;
     function tstop: extended;
+    procedure refreshKnownValues;
   end;
   tTransformation = class
     // eine generische Transformation von Werten oder Koordinaten
@@ -869,10 +867,13 @@ begin
   xsteps:=0;
   tsiz_:=0;
   xsteps_:=0;
+  fillchar(knownValues,sizeof(knownValues),#0);
+  setlength(knownValues,0);
 end;
 
 destructor tExtraInfos.destroy;
 begin
+ setlength(knownValues,0);
  transformationen.free;
  inherited destroy;
 end;
@@ -897,6 +898,27 @@ begin
  result:=transformationen.tstop;
 end;
 
+procedure tExtraInfos.refreshKnownValues;
+begin
+  setlength(knownValues,8);
+  knownValues[0].name:='np';
+  knownValues[0].value:=np;
+  knownValues[1].name:='maxw';
+  knownValues[1].value:=maxW;
+  knownValues[2].name:='minw';
+  knownValues[2].value:=minW;
+  knownValues[3].name:='beta';
+  knownValues[3].value:=beta;
+  knownValues[4].name:='xstart';
+  knownValues[4].value:=xstart;
+  knownValues[5].name:='xstop';
+  knownValues[5].value:=xstop;
+  knownValues[6].name:='tstart';
+  knownValues[6].value:=tstart;
+  knownValues[7].name:='tstop';
+  knownValues[7].value:=tstop;
+end;
+
 // tFontRenderer ***************************************************************
 
 constructor tFontRenderer.create(schriftgroesze: longint);