summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-08-29 10:32:02 +0200
committerErich Eckner <git@eckner.net>2017-08-29 10:32:02 +0200
commitadef6dfa91c63279f93f064382a490017cd33d54 (patch)
treeb761b4264c5523bf55b096bc01f2369c59a3514f
parent68796d71e2539154db557b733d74a650eb6d0b12 (diff)
downloadepost-adef6dfa91c63279f93f064382a490017cd33d54.tar.xz
extrahierePhasenwinkel nun (vorerst) komplett
-rw-r--r--epost.lps100
-rw-r--r--epostunit.pas8
2 files changed, 53 insertions, 55 deletions
diff --git a/epost.lps b/epost.lps
index 33a21e9..b762f1d 100644
--- a/epost.lps
+++ b/epost.lps
@@ -22,9 +22,10 @@
<Unit2>
<Filename Value="epostunit.pas"/>
<IsPartOfProject Value="True"/>
+ <IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="2028"/>
- <CursorPos X="91" Y="2048"/>
+ <TopLine Value="6122"/>
+ <CursorPos Y="6138"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit2>
@@ -38,10 +39,9 @@
<Unit4>
<Filename Value="werteunit.pas"/>
<IsPartOfProject Value="True"/>
- <IsVisibleTab Value="True"/>
<EditorIndex Value="7"/>
- <TopLine Value="129"/>
- <CursorPos X="14" Y="153"/>
+ <TopLine Value="1026"/>
+ <CursorPos X="17" Y="1044"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit4>
@@ -217,123 +217,121 @@
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
- <Filename Value="werteunit.pas"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="2066" Column="61" TopLine="2048"/>
</Position1>
<Position2>
- <Filename Value="werteunit.pas"/>
- <Caret Line="23" Column="46"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="165" Column="29" TopLine="149"/>
</Position2>
<Position3>
- <Filename Value="werteunit.pas"/>
- <Caret Line="193" Column="37" TopLine="163"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="4053" Column="28" TopLine="4030"/>
</Position3>
<Position4>
- <Filename Value="werteunit.pas"/>
- <Caret Line="178" Column="38" TopLine="158"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="178" Column="35" TopLine="162"/>
</Position4>
<Position5>
- <Filename Value="werteunit.pas"/>
- <Caret Line="2022" Column="61" TopLine="2013"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="4056" Column="23" TopLine="4028"/>
</Position5>
<Position6>
- <Filename Value="werteunit.pas"/>
- <Caret Line="74" Column="33" TopLine="53"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5276" Column="39" TopLine="5272"/>
</Position6>
<Position7>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1988" Column="7" TopLine="1965"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="402" Column="22" TopLine="384"/>
</Position7>
<Position8>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1990" Column="32" TopLine="1970"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5276" Column="52" TopLine="5247"/>
</Position8>
<Position9>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1998" Column="37" TopLine="1976"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5286" Column="26" TopLine="5257"/>
</Position9>
<Position10>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1995" Column="9" TopLine="1967"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="7421" Column="23" TopLine="7413"/>
</Position10>
<Position11>
<Filename Value="werteunit.pas"/>
- <Caret Line="1998" Column="33" TopLine="1980"/>
+ <Caret Line="80" Column="35" TopLine="64"/>
</Position11>
<Position12>
- <Filename Value="werteunit.pas"/>
- <Caret Line="23" Column="15" TopLine="5"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="7421" Column="23" TopLine="7413"/>
</Position12>
<Position13>
<Filename Value="epostunit.pas"/>
- <Caret Line="3773" Column="25" TopLine="3760"/>
</Position13>
<Position14>
<Filename Value="epostunit.pas"/>
- <Caret Line="134" Column="33" TopLine="118"/>
+ <Caret Line="178" Column="35" TopLine="150"/>
</Position14>
<Position15>
- <Filename Value="werteunit.pas"/>
- <Caret Line="2010" Column="5" TopLine="1978"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="4056" Column="23" TopLine="4028"/>
</Position15>
<Position16>
<Filename Value="epostunit.pas"/>
- <Caret Line="2039" Column="52" TopLine="2013"/>
+ <Caret Line="5300" Column="20" TopLine="5272"/>
</Position16>
<Position17>
- <Filename Value="typenunit.pas"/>
- <Caret Line="21" Column="31"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="195" Column="63" TopLine="179"/>
</Position17>
<Position18>
- <Filename Value="typenunit.pas"/>
- <Caret Line="2760" TopLine="2737"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="122" Column="26" TopLine="106"/>
</Position18>
<Position19>
- <Filename Value="typenunit.pas"/>
- <Caret Line="2758" Column="47" TopLine="2741"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="195" Column="68" TopLine="167"/>
</Position19>
<Position20>
- <Filename Value="typenunit.pas"/>
- <Caret Line="18" Column="97"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5301" TopLine="5267"/>
</Position20>
<Position21>
<Filename Value="epostunit.pas"/>
- <Caret Line="2039" Column="52" TopLine="2013"/>
</Position21>
<Position22>
<Filename Value="epostunit.pas"/>
- <Caret Line="2017" Column="32" TopLine="1999"/>
+ <Caret Line="122" Column="26" TopLine="95"/>
</Position22>
<Position23>
<Filename Value="epostunit.pas"/>
- <Caret Line="3721" Column="46" TopLine="3702"/>
+ <Caret Line="195" Column="68" TopLine="167"/>
</Position23>
<Position24>
<Filename Value="epostunit.pas"/>
- <Caret Line="3784" Column="30" TopLine="3766"/>
+ <Caret Line="965" Column="58" TopLine="950"/>
</Position24>
<Position25>
<Filename Value="epostunit.pas"/>
- <Caret Line="3837" Column="46" TopLine="3819"/>
+ <Caret Line="165" Column="29" TopLine="149"/>
</Position25>
<Position26>
<Filename Value="epostunit.pas"/>
- <Caret Line="134" Column="33" TopLine="118"/>
+ <Caret Line="4039" Column="57" TopLine="4014"/>
</Position26>
<Position27>
- <Filename Value="werteunit.pas"/>
- <Caret Line="2007" Column="99" TopLine="1951"/>
+ <Filename Value="epostunit.pas"/>
</Position27>
<Position28>
<Filename Value="werteunit.pas"/>
- <Caret Line="1985" Column="7" TopLine="1956"/>
+ <Caret Line="2197" Column="88" TopLine="2184"/>
</Position28>
<Position29>
<Filename Value="werteunit.pas"/>
- <Caret Line="109" Column="69" TopLine="96"/>
+ <Caret Line="51" Column="17" TopLine="35"/>
</Position29>
<Position30>
<Filename Value="werteunit.pas"/>
- <Caret Line="23" Column="31" TopLine="5"/>
+ <Caret Line="52" Column="17" TopLine="35"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/epostunit.pas b/epostunit.pas
index bd80ff0..78e12f7 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -4036,7 +4036,7 @@ begin
end{of case};
betraege.free;
- gibAus('zentrieren '+tIntPointToStr(maxPos),3);
+ gibAus('zentrieren ('+tIntPointToStr(maxPos)+')',3);
verschiebe(threads,maxPos);
gibAus('berechne inverse x-FFT ...',3);
@@ -4052,8 +4052,8 @@ begin
end;
gibAus(' (Parseval-Fehler = '+floatToStr(pvFehler)+')',3);
-// gibAus('Phasenwinkel ermitteln ...',3);
-// ermittlePhasenWinkel(threads);
+ gibAus('Phasenwinkel ermitteln ...',3);
+ ermittlePhasenWinkel(threads);
gibAus('... fertig '+timetostr(now-Zeit),3);
result:=true;
@@ -5297,7 +5297,7 @@ begin
for i:=0 to length(phasenWinkelThreads)-1 do
phasenWinkelThreads[i].free;
gibAus('Alle Phasenwinkelthreads fertig!',1);
- _tSiz:=_tSiz div 2;
+ istKomplex:=false;
holeRAM(3);
end;