summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epost.lps87
-rw-r--r--epostunit.pas18
-rw-r--r--werteunit.inc2
-rw-r--r--werteunit.pas12
4 files changed, 60 insertions, 59 deletions
diff --git a/epost.lps b/epost.lps
index 14c85b8..f3bc1b7 100644
--- a/epost.lps
+++ b/epost.lps
@@ -7,8 +7,8 @@
<Unit0>
<Filename Value="epost.lpr"/>
<IsPartOfProject Value="True"/>
- <TopLine Value="30"/>
- <CursorPos X="56" Y="46"/>
+ <TopLine Value="493"/>
+ <CursorPos X="34" Y="507"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit0>
@@ -24,8 +24,8 @@
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="56"/>
- <CursorPos X="3" Y="65"/>
+ <TopLine Value="5847"/>
+ <CursorPos X="88" Y="5857"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit2>
@@ -33,8 +33,8 @@
<Filename Value="werteunit.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="9"/>
- <TopLine Value="1350"/>
- <CursorPos X="106" Y="1363"/>
+ <TopLine Value="1381"/>
+ <CursorPos X="52" Y="1403"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit3>
@@ -77,8 +77,8 @@
<Filename Value="werteunit.inc"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="10"/>
- <TopLine Value="172"/>
- <CursorPos X="19" Y="185"/>
+ <TopLine Value="211"/>
+ <CursorPos X="32" Y="211"/>
<UsageCount Value="181"/>
<Loaded Value="True"/>
</Unit8>
@@ -201,123 +201,124 @@
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
- <Filename Value="werteunit.pas"/>
- <Caret Line="913" Column="44" TopLine="901"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="231" Column="53" TopLine="208"/>
</Position1>
<Position2>
<Filename Value="epostunit.pas"/>
- <Caret Line="6144" Column="62" TopLine="6144"/>
+ <Caret Line="5479" Column="70" TopLine="5456"/>
</Position2>
<Position3>
<Filename Value="epostunit.pas"/>
- <Caret Line="1342" Column="37" TopLine="1325"/>
+ <Caret Line="5480" Column="61" TopLine="5456"/>
</Position3>
<Position4>
<Filename Value="epostunit.pas"/>
- <Caret Line="96" Column="30" TopLine="78"/>
+ <Caret Line="5534" Column="36" TopLine="5506"/>
</Position4>
<Position5>
<Filename Value="epostunit.pas"/>
- <Caret Line="1115" Column="33" TopLine="1113"/>
+ <Caret Line="5699" Column="68" TopLine="5671"/>
</Position5>
<Position6>
<Filename Value="epostunit.pas"/>
- <Caret Line="1336" Column="30" TopLine="1308"/>
+ <Caret Line="6781" Column="23" TopLine="6752"/>
</Position6>
<Position7>
<Filename Value="epostunit.pas"/>
- <Caret Line="1349" Column="30" TopLine="1321"/>
+ <Caret Line="6783" Column="32" TopLine="6754"/>
</Position7>
<Position8>
<Filename Value="epostunit.pas"/>
- <Caret Line="1362" Column="30" TopLine="1334"/>
+ <Caret Line="6792" Column="69" TopLine="6784"/>
</Position8>
<Position9>
<Filename Value="epostunit.pas"/>
- <Caret Line="343" Column="25" TopLine="325"/>
+ <Caret Line="6801" Column="31" TopLine="6784"/>
</Position9>
<Position10>
<Filename Value="epostunit.pas"/>
- <Caret Line="7837" Column="59" TopLine="7808"/>
+ <Caret Line="226" Column="22" TopLine="208"/>
</Position10>
<Position11>
<Filename Value="epostunit.pas"/>
- <Caret Line="7866" Column="29" TopLine="7838"/>
+ <Caret Line="231" Column="53" TopLine="208"/>
</Position11>
<Position12>
<Filename Value="epostunit.pas"/>
- <Caret Line="8127" Column="26" TopLine="8125"/>
+ <Caret Line="5478" Column="70" TopLine="5450"/>
</Position12>
<Position13>
<Filename Value="epostunit.pas"/>
+ <Caret Line="5479" Column="15" TopLine="5450"/>
</Position13>
<Position14>
<Filename Value="epostunit.pas"/>
- <Caret Line="343" Column="25" TopLine="314"/>
+ <Caret Line="5504" Column="35" TopLine="5476"/>
</Position14>
<Position15>
<Filename Value="epostunit.pas"/>
- <Caret Line="7837" Column="59" TopLine="7832"/>
+ <Caret Line="5505" Column="17" TopLine="5477"/>
</Position15>
<Position16>
<Filename Value="epostunit.pas"/>
- <Caret Line="7858" Column="84" TopLine="7844"/>
+ <Caret Line="5506" Column="25" TopLine="5478"/>
</Position16>
<Position17>
<Filename Value="epostunit.pas"/>
- <Caret Line="5108" TopLine="5092"/>
+ <Caret Line="5533" Column="25" TopLine="5505"/>
</Position17>
<Position18>
- <Filename Value="typenunit.pas"/>
- <Caret Line="631" Column="18" TopLine="604"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5691" Column="53" TopLine="5675"/>
</Position18>
<Position19>
- <Filename Value="typenunit.pas"/>
- <Caret Line="1530" Column="41" TopLine="1499"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5699" Column="43" TopLine="5675"/>
</Position19>
<Position20>
<Filename Value="epostunit.pas"/>
- <Caret Line="804" TopLine="787"/>
+ <Caret Line="5856" Column="18" TopLine="5841"/>
</Position20>
<Position21>
<Filename Value="epostunit.pas"/>
- <Caret Line="2738" TopLine="2720"/>
+ <Caret Line="131" Column="23" TopLine="115"/>
</Position21>
<Position22>
<Filename Value="epostunit.pas"/>
- <Caret Line="6838" TopLine="6822"/>
+ <Caret Line="132" Column="23" TopLine="115"/>
</Position22>
<Position23>
<Filename Value="epostunit.pas"/>
- <Caret Line="6844" TopLine="6827"/>
+ <Caret Line="2198" Column="26" TopLine="2169"/>
</Position23>
<Position24>
<Filename Value="epostunit.pas"/>
- <Caret Line="1367" TopLine="1350"/>
+ <Caret Line="2200" Column="20" TopLine="2183"/>
</Position24>
<Position25>
- <Filename Value="werteunit.pas"/>
- <Caret Line="913" Column="35" TopLine="901"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5563" Column="138" TopLine="5544"/>
</Position25>
<Position26>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1373" Column="11" TopLine="1363"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5567" Column="22" TopLine="5544"/>
</Position26>
<Position27>
<Filename Value="epostunit.pas"/>
- <Caret Line="8153" TopLine="8136"/>
+ <Caret Line="5571" Column="22" TopLine="5544"/>
</Position27>
<Position28>
- <Filename Value="werteunit.pas"/>
- <Caret Line="2340" TopLine="2307"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5575" Column="22" TopLine="5547"/>
</Position28>
<Position29>
<Filename Value="epostunit.pas"/>
- <Caret Line="6836" TopLine="6809"/>
+ <Caret Line="5579" Column="22" TopLine="5551"/>
</Position29>
<Position30>
<Filename Value="epostunit.pas"/>
- <Caret Line="7894" Column="15" TopLine="7824"/>
+ <Caret Line="5856" Column="22" TopLine="5828"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/epostunit.pas b/epostunit.pas
index 2573b34..99fe461 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -8199,21 +8199,21 @@ begin
case zi.genauigkeit of
gSingle:
case qu.genauigkeit of
- gSingle: zi.sWerte.integriereSingle(@(qu.sWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
- gDouble: zi.sWerte.integriereDouble(@(qu.dWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
- gExtended: zi.sWerte.integriereExtended(@(qu.eWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gSingle: zi.sWerte.integriere(pTLLWerteSingle(@(qu.sWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gDouble: zi.sWerte.integriere(pTLLWerteDouble(@(qu.dWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gExtended: zi.sWerte.integriere(pTLLWerteExtended(@(qu.eWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
end{of case};
gDouble:
case qu.genauigkeit of
- gSingle: zi.dWerte.integriereSingle(@(qu.sWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
- gDouble: zi.dWerte.integriereDouble(@(qu.dWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
- gExtended: zi.dWerte.integriereExtended(@(qu.eWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gSingle: zi.dWerte.integriere(pTLLWerteSingle(@(qu.sWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gDouble: zi.dWerte.integriere(pTLLWerteDouble(@(qu.dWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gExtended: zi.dWerte.integriere(pTLLWerteExtended(@(qu.eWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
end{of case};
gExtended:
case qu.genauigkeit of
- gSingle: zi.eWerte.integriereSingle(@(qu.sWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
- gDouble: zi.eWerte.integriereDouble(@(qu.dWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
- gExtended: zi.eWerte.integriereExtended(@(qu.eWerte),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gSingle: zi.eWerte.integriere(pTLLWerteSingle(@(qu.sWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gDouble: zi.eWerte.integriere(pTLLWerteDouble(@(qu.dWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
+ gExtended: zi.eWerte.integriere(pTLLWerteExtended(@(qu.eWerte)),xMi,xMa,tMi,tMa,xOf,tOf,rtg);
end{of case};
end{of case};
gibAus('... und fertig',1);
diff --git a/werteunit.inc b/werteunit.inc
index 65331cf..754cc46 100644
--- a/werteunit.inc
+++ b/werteunit.inc
@@ -208,7 +208,7 @@ end;
{$ENDIF}
{$IFDEF tLLWerte_integriere}
-//procedure tLLWerte.integriereSingle(qu: pTLLWerteSingle; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
+//procedure tLLWerte.integriere(qu: pTLLWerteSingle; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
var
i,j: longint;
int,faktor: extended;
diff --git a/werteunit.pas b/werteunit.pas
index 53945ee..e2055eb 100644
--- a/werteunit.pas
+++ b/werteunit.pas
@@ -73,9 +73,9 @@ type
procedure gibMinMaxDichten(out wMi,wMa: extended; out pMi,pMa: tInt64Point; out mMi,mMa: boolean; xMin,xMax,tMin,tMax: longint);
function zuPixelWerten(wHoehe,wBreite,xPMi,xMi,tMi: longint; xZ,yZ: extended; mo: boolean; pPWerte: pTExtendedArray; pPAnzahlen: pTLongintArray): boolean;
function findeSchwellwerte(xMi,xMa,tMi,tMa: longint; Schw: extended): tExtPointArray;
- procedure integriereSingle(qu: pTLLWerteSingle; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
- procedure integriereDouble(qu: pTLLWerteDouble; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
- procedure integriereExtended(qu: pTLLWerteDouble; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
+ procedure integriere(qu: pTLLWerteSingle; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung); overload;
+ procedure integriere(qu: pTLLWerteDouble; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung); overload;
+ procedure integriere(qu: pTLLWerteExtended; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung); overload;
procedure gauszFit(amplituden,breiten,positionen,ueberlappe,hintergruende: pTLLWerteExtended; von,bis: longint; senkrecht: boolean; fensterBreite,maxBreite,maxVerschiebung: extended; positionsMitten: tExtendedArray);
function ermittleRandDurchschnitt: extended;
function ermittleRandMinimum: extended;
@@ -1396,11 +1396,11 @@ begin
end;
{$DEFINE tLLWerte_integriere}
-procedure tLLWerte.integriereSingle(qu: pTLLWerteSingle; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
+procedure tLLWerte.integriere(qu: pTLLWerteSingle; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
{$INCLUDE werteunit.inc}
-procedure tLLWerte.integriereDouble(qu: pTLLWerteDouble; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
+procedure tLLWerte.integriere(qu: pTLLWerteDouble; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
{$INCLUDE werteunit.inc}
-procedure tLLWerte.integriereExtended(qu: pTLLWerteDouble; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
+procedure tLLWerte.integriere(qu: pTLLWerteExtended; xMi,xMa,tMi,tMa,xOf,tOf: longint; richtung: tIntegrationsRichtung);
{$INCLUDE werteunit.inc}
{$UNDEF tLLWerte_integriere}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-02 08:38:48 +0000