diff options
| -rw-r--r-- | epost.lps | 141 | ||||
| -rw-r--r-- | werteunit.pas | 17 |
2 files changed, 81 insertions, 77 deletions
@@ -7,8 +7,8 @@ <Unit0> <Filename Value="epost.lpr"/> <IsPartOfProject Value="True"/> - <TopLine Value="36"/> - <CursorPos Y="46"/> + <TopLine Value="221"/> + <CursorPos Y="245"/> <UsageCount Value="202"/> <Loaded Value="True"/> </Unit0> @@ -22,9 +22,10 @@ <Unit2> <Filename Value="epostunit.pas"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="2018"/> - <CursorPos X="36" Y="2014"/> + <TopLine Value="4025"/> + <CursorPos Y="4044"/> <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="108"/> - <CursorPos X="50" Y="128"/> + <TopLine Value="2172"/> + <CursorPos X="21" Y="2191"/> <UsageCount Value="200"/> <Loaded Value="True"/> </Unit4> @@ -49,7 +49,7 @@ <Filename Value="typenunit.pas"/> <IsPartOfProject Value="True"/> <EditorIndex Value="9"/> - <TopLine Value="2758"/> + <TopLine Value="2757"/> <CursorPos X="31" Y="2786"/> <UsageCount Value="200"/> <Loaded Value="True"/> @@ -77,7 +77,7 @@ <IsPartOfProject Value="True"/> <EditorIndex Value="8"/> <CursorPos X="35" Y="10"/> - <UsageCount Value="121"/> + <UsageCount Value="129"/> <Loaded Value="True"/> </Unit8> <Unit9> @@ -85,34 +85,34 @@ <EditorIndex Value="-1"/> <TopLine Value="1612"/> <CursorPos X="2" Y="1675"/> - <UsageCount Value="5"/> + <UsageCount Value="4"/> </Unit9> <Unit10> <Filename Value="../units/mystringlistunit.pas"/> <EditorIndex Value="-1"/> <TopLine Value="638"/> <CursorPos X="58" Y="660"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit10> <Unit11> <Filename Value="../units/lowlevelunit.pas"/> <EditorIndex Value="6"/> - <TopLine Value="6"/> - <CursorPos X="3" Y="24"/> - <UsageCount Value="90"/> + <TopLine Value="160"/> + <CursorPos X="26" Y="220"/> + <UsageCount Value="93"/> <Loaded Value="True"/> </Unit11> <Unit12> <Filename Value="../units/randomunit.pas"/> <EditorIndex Value="-1"/> - <UsageCount Value="5"/> + <UsageCount Value="4"/> </Unit12> <Unit13> <Filename Value="../units/matheunit.pas"/> <EditorIndex Value="5"/> - <TopLine Value="47"/> - <CursorPos X="26" Y="75"/> - <UsageCount Value="64"/> + <TopLine Value="769"/> + <CursorPos X="15" Y="801"/> + <UsageCount Value="67"/> <Loaded Value="True"/> </Unit13> <Unit14> @@ -120,7 +120,7 @@ <EditorIndex Value="2"/> <TopLine Value="126"/> <CursorPos X="7" Y="147"/> - <UsageCount Value="19"/> + <UsageCount Value="22"/> <Loaded Value="True"/> </Unit14> <Unit15> @@ -128,41 +128,41 @@ <EditorIndex Value="-1"/> <TopLine Value="182"/> <CursorPos X="21" Y="202"/> - <UsageCount Value="8"/> + <UsageCount Value="7"/> </Unit15> <Unit16> <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovlh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="61"/> <CursorPos X="10" Y="99"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit16> <Unit17> <Filename Value="/usr/lib/fpc/src/rtl/unix/baseunix.pp"/> <UnitName Value="BaseUnix"/> <EditorIndex Value="-1"/> <TopLine Value="61"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit17> <Unit18> <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovl.inc"/> <EditorIndex Value="-1"/> <TopLine Value="414"/> <CursorPos X="20" Y="434"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit18> <Unit19> <Filename Value="/usr/lib/fpc/src/rtl/linux/bunxsysc.inc"/> <EditorIndex Value="-1"/> <TopLine Value="16"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit19> <Unit20> <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="74"/> <CursorPos X="15" Y="102"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit20> <Unit21> <Filename Value="/usr/lib/fpc/src/packages/fcl-image/src/fpimage.pp"/> @@ -170,168 +170,169 @@ <EditorIndex Value="-1"/> <TopLine Value="10"/> <CursorPos X="3" Y="30"/> - <UsageCount Value="6"/> + <UsageCount Value="5"/> </Unit21> <Unit22> <Filename Value="../fpGUI/src/corelib/render/software/agg_basics.pas"/> <EditorIndex Value="-1"/> <TopLine Value="327"/> <CursorPos X="12" Y="347"/> - <UsageCount Value="9"/> + <UsageCount Value="8"/> </Unit22> <Unit23> <Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="673"/> <CursorPos X="42" Y="705"/> - <UsageCount Value="9"/> + <UsageCount Value="8"/> </Unit23> <Unit24> <Filename Value="/usr/lib/fpc/src/rtl/objpas/math.pp"/> <EditorIndex Value="-1"/> <TopLine Value="166"/> <CursorPos X="10" Y="183"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit24> <Unit25> <Filename Value="GTIWebServerTestAggActionHandlerUnit.pas"/> <EditorIndex Value="-1"/> <TopLine Value="53"/> <CursorPos X="49" Y="82"/> - <UsageCount Value="7"/> + <UsageCount Value="6"/> </Unit25> <Unit26> <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/sysstrh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="204"/> <CursorPos X="18" Y="222"/> - <UsageCount Value="9"/> + <UsageCount Value="8"/> </Unit26> <Unit27> <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/osutilsh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="9"/> <CursorPos X="10" Y="26"/> - <UsageCount Value="9"/> + <UsageCount Value="8"/> </Unit27> </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> - <Filename Value="epostunit.pas"/> + <Filename Value="werteunit.pas"/> + <Caret Line="225" Column="38" TopLine="196"/> </Position1> <Position2> - <Filename Value="epostunit.pas"/> - <Caret Line="178" Column="35" TopLine="150"/> + <Filename Value="werteunit.pas"/> + <Caret Line="342" Column="98" TopLine="326"/> </Position2> <Position3> <Filename Value="epostunit.pas"/> - <Caret Line="4056" Column="23" TopLine="4028"/> + <Caret Line="4056" TopLine="4044"/> </Position3> <Position4> <Filename Value="epostunit.pas"/> - <Caret Line="5300" Column="20" TopLine="5272"/> + <Caret Line="177" Column="25" TopLine="161"/> </Position4> <Position5> <Filename Value="epostunit.pas"/> - <Caret Line="195" Column="63" TopLine="179"/> + <Caret Line="4056" Column="13" TopLine="4040"/> </Position5> <Position6> <Filename Value="epostunit.pas"/> - <Caret Line="122" Column="26" TopLine="106"/> + <Caret Line="5261" Column="24" TopLine="5251"/> </Position6> <Position7> <Filename Value="epostunit.pas"/> - <Caret Line="195" Column="68" TopLine="167"/> + <Caret Line="395" Column="20" TopLine="377"/> </Position7> <Position8> <Filename Value="epostunit.pas"/> - <Caret Line="5301" TopLine="5267"/> + <Caret Line="5247" Column="48" TopLine="5218"/> </Position8> <Position9> <Filename Value="epostunit.pas"/> + <Caret Line="5261" Column="26" TopLine="5232"/> </Position9> <Position10> <Filename Value="epostunit.pas"/> - <Caret Line="122" Column="26" TopLine="95"/> + <Caret Line="5271" Column="26" TopLine="5242"/> </Position10> <Position11> <Filename Value="epostunit.pas"/> - <Caret Line="195" Column="68" TopLine="167"/> + <Caret Line="7426" Column="24" TopLine="7401"/> </Position11> <Position12> <Filename Value="epostunit.pas"/> - <Caret Line="965" Column="58" TopLine="950"/> + <Caret Line="177" Column="25" TopLine="161"/> </Position12> <Position13> <Filename Value="epostunit.pas"/> - <Caret Line="165" Column="29" TopLine="149"/> + <Caret Line="4056" Column="13" TopLine="4028"/> </Position13> <Position14> <Filename Value="epostunit.pas"/> - <Caret Line="4039" Column="57" TopLine="4014"/> + <Caret Line="5243" Column="28" TopLine="5214"/> </Position14> <Position15> <Filename Value="epostunit.pas"/> + <Caret Line="7423" Column="54" TopLine="7406"/> </Position15> <Position16> <Filename Value="werteunit.pas"/> - <Caret Line="2197" Column="88" TopLine="2184"/> + <Caret Line="82" Column="25" TopLine="66"/> </Position16> <Position17> - <Filename Value="werteunit.pas"/> - <Caret Line="51" Column="17" TopLine="35"/> + <Filename Value="epostunit.pas"/> + <Caret Line="7424" Column="72" TopLine="7406"/> </Position17> <Position18> - <Filename Value="werteunit.pas"/> - <Caret Line="52" Column="17" TopLine="35"/> + <Filename Value="epostunit.pas"/> </Position18> <Position19> - <Filename Value="epostunit.pas"/> - <Caret Line="8026" TopLine="8009"/> + <Filename Value="werteunit.pas"/> + <Caret Line="2221" Column="66" TopLine="2202"/> </Position19> <Position20> - <Filename Value="epostunit.pas"/> - <Caret Line="8056" Column="83" TopLine="8044"/> + <Filename Value="werteunit.pas"/> + <Caret Line="2069" Column="15" TopLine="2051"/> </Position20> <Position21> <Filename Value="epostunit.pas"/> - <Caret Line="164" Column="36" TopLine="148"/> + <Caret Line="2112" Column="48" TopLine="2090"/> </Position21> <Position22> <Filename Value="epostunit.pas"/> - <Caret Line="3890" Column="3" TopLine="3874"/> + <Caret Line="165" Column="29" TopLine="149"/> </Position22> <Position23> <Filename Value="epostunit.pas"/> - <Caret Line="134" Column="33" TopLine="118"/> + <Caret Line="4056" Column="44" TopLine="4033"/> </Position23> <Position24> <Filename Value="epostunit.pas"/> - <Caret Line="2014" Column="36" TopLine="2018"/> + <Caret Line="177" Column="25" TopLine="161"/> </Position24> <Position25> - <Filename Value="werteunit.pas"/> - <Caret Line="75" Column="35" TopLine="59"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4056" Column="13" TopLine="4028"/> </Position25> <Position26> - <Filename Value="werteunit.pas"/> - <Caret Line="1987" Column="41" TopLine="1985"/> + <Filename Value="epostunit.pas"/> + <Caret Line="5258" Column="68" TopLine="5232"/> </Position26> <Position27> - <Filename Value="werteunit.pas"/> - <Caret Line="23" Column="31" TopLine="5"/> + <Filename Value="epostunit.pas"/> </Position27> <Position28> - <Filename Value="werteunit.pas"/> - <Caret Line="149" Column="44" TopLine="129"/> + <Filename Value="epostunit.pas"/> + <Caret Line="177" Column="25" TopLine="149"/> </Position28> <Position29> - <Filename Value="epost.lpr"/> - <Caret Line="51" Column="11" TopLine="27"/> + <Filename Value="werteunit.pas"/> + <Caret Line="2169" TopLine="2143"/> </Position29> <Position30> <Filename Value="werteunit.pas"/> - <Caret Line="111" Column="30" TopLine="108"/> + <Caret Line="2132" Column="93" TopLine="2116"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/werteunit.pas b/werteunit.pas index b62282e..89fcb08 100644 --- a/werteunit.pas +++ b/werteunit.pas @@ -2064,11 +2064,11 @@ end; procedure tLLWerte.kantenFilter(betraege: tLLWerte; xFak,yFak: extended; filterTyp: tKantenFilterTyp; einseitig: boolean; out maxPos: tInt64Point); var - maxima: tInt64PointArray; - i,iM,j,jM,jP,mCnt,di,dj: int64; - wert,minWert,maxWert: extended; - istVollKomplex: byte; // 1=nein, 2=ja - schiebung: tInt64Point; + maxima: tInt64PointArray; + i,iM,j,jM,jP,mCnt,di,dj: int64; + wert,minWert,maxWert,radius: extended; + istVollKomplex: byte; // 1=nein, 2=ja + schiebung: tInt64Point; begin istVollKomplex:=params.tSiz div betraege.params.tSiz; if (betraege.params.tSiz*istVollKomplex <> params.tSiz) or @@ -2129,9 +2129,10 @@ begin if istVollKomplex=1 then begin iM:=params.xSteps div 2 + 1; jM:=params.tSiz div 2 + 1; + radius:=sqr(min(maxPos['x'],iM-maxPos['x']))*xFak + sqr(min(maxPos['y'],jM-maxPos['y']))*yFak; for j:=0 to jM do for i:=0 to iM do begin - wert:=(sqr(i)*xFak+sqr(j)*yFak)/(sqr(maxPos['x'])*xFak+sqr(maxPos['y'])*yFak); + wert:=sqrt((sqr(i)*xFak+sqr(j)*yFak)/radius); if wert > 0.6 then wert:=0 else if wert > 0.4 then @@ -2158,11 +2159,13 @@ begin if einseitig then begin schiebung:=maxPos; filterTyp:=kfTiefpass; + // wir nehmen nur Frequenzen, die nah an maxPos liegen - das ist ein Tiefpass auf den verschobenen Werten! end else schiebung:=int64Point(0,0); iM:=params.xSteps; jM:=params.tSiz div 2; + radius:=sqr(min(maxPos['x'],iM-maxPos['x']))*xFak + sqr(min(maxPos['y'],jM-maxPos['y']))*yFak; for j:=0 to jM-1 do begin dj:=abs(j-schiebung['y']); if jM-dj<dj then @@ -2171,7 +2174,7 @@ begin di:=abs(i-schiebung['x']); if iM-di<di then di:=iM-di; - wert:=(sqr(di)*xFak+sqr(dj)*yFak)/(sqr(maxPos['x'])*xFak+sqr(maxPos['y'])*yFak); + wert:=sqrt((sqr(di)*xFak+sqr(dj)*yFak)/radius); if wert > 0.6 then wert:=0 else if wert > 0.4 then |