diff options
| -rw-r--r-- | epost.lps | 180 | ||||
| -rw-r--r-- | epostunit.pas | 41 |
2 files changed, 130 insertions, 91 deletions
@@ -7,10 +7,10 @@ <Unit0> <Filename Value="epost.lpr"/> <IsPartOfProject Value="True"/> - <TopLine Value="468"/> - <CursorPos X="37" Y="488"/> + <EditorIndex Value="-1"/> + <TopLine Value="455"/> + <CursorPos X="16" Y="478"/> <UsageCount Value="202"/> - <Loaded Value="True"/> </Unit0> <Unit1> <Filename Value="input.epost"/> @@ -23,16 +23,15 @@ <Filename Value="epostunit.pas"/> <IsPartOfProject Value="True"/> <IsVisibleTab Value="True"/> - <EditorIndex Value="1"/> - <TopLine Value="6595"/> - <CursorPos X="19" Y="6616"/> + <TopLine Value="9327"/> + <CursorPos Y="9343"/> <UsageCount Value="201"/> <Loaded Value="True"/> </Unit2> <Unit3> <Filename Value="werteunit.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="9"/> + <EditorIndex Value="8"/> <TopLine Value="929"/> <CursorPos X="42" Y="930"/> <UsageCount Value="200"/> @@ -41,7 +40,7 @@ <Unit4> <Filename Value="typenunit.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="12"/> + <EditorIndex Value="11"/> <TopLine Value="2346"/> <CursorPos X="40" Y="2352"/> <UsageCount Value="200"/> @@ -50,7 +49,7 @@ <Unit5> <Filename Value="../units/fftunit.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="3"/> + <EditorIndex Value="2"/> <TopLine Value="97"/> <CursorPos X="12" Y="116"/> <UsageCount Value="201"/> @@ -59,7 +58,7 @@ <Unit6> <Filename Value="../units/fftunit.inc"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="4"/> + <EditorIndex Value="3"/> <TopLine Value="168"/> <CursorPos X="56" Y="179"/> <UsageCount Value="202"/> @@ -68,7 +67,7 @@ <Unit7> <Filename Value="gauszFit.inc"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="11"/> + <EditorIndex Value="10"/> <CursorPos X="35" Y="10"/> <UsageCount Value="201"/> <Loaded Value="True"/> @@ -76,48 +75,48 @@ <Unit8> <Filename Value="werteunit.inc"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="10"/> + <EditorIndex Value="9"/> <TopLine Value="172"/> <CursorPos X="21" Y="183"/> - <UsageCount Value="166"/> + <UsageCount Value="171"/> <Loaded Value="True"/> </Unit8> <Unit9> <Filename Value="fileunit.pas"/> <EditorIndex Value="-1"/> <CursorPos Y="204"/> - <UsageCount Value="198"/> + <UsageCount Value="197"/> </Unit9> <Unit10> <Filename Value="../units/mystringlistunit.pas"/> - <EditorIndex Value="8"/> + <EditorIndex Value="7"/> <TopLine Value="515"/> <CursorPos X="21" Y="543"/> - <UsageCount Value="81"/> + <UsageCount Value="84"/> <Loaded Value="True"/> </Unit10> <Unit11> <Filename Value="../units/lowlevelunit.pas"/> - <EditorIndex Value="7"/> - <TopLine Value="1059"/> - <CursorPos X="34" Y="1086"/> + <EditorIndex Value="6"/> + <TopLine Value="393"/> + <CursorPos X="28" Y="418"/> <UsageCount Value="100"/> <Loaded Value="True"/> </Unit11> <Unit12> <Filename Value="../units/matheunit.pas"/> - <EditorIndex Value="5"/> - <TopLine Value="520"/> - <CursorPos X="19" Y="537"/> + <EditorIndex Value="4"/> + <TopLine Value="1046"/> + <CursorPos X="28" Y="1045"/> <UsageCount Value="101"/> <Loaded Value="True"/> </Unit12> <Unit13> <Filename Value="../units/systemunit.pas"/> - <EditorIndex Value="2"/> - <TopLine Value="202"/> - <CursorPos X="33" Y="202"/> - <UsageCount Value="95"/> + <EditorIndex Value="1"/> + <TopLine Value="190"/> + <CursorPos X="22" Y="195"/> + <UsageCount Value="98"/> <Loaded Value="True"/> </Unit13> <Unit14> @@ -125,41 +124,41 @@ <EditorIndex Value="-1"/> <TopLine Value="176"/> <CursorPos X="23" Y="194"/> - <UsageCount Value="8"/> + <UsageCount Value="7"/> </Unit14> <Unit15> <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovlh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="61"/> <CursorPos X="10" Y="99"/> - <UsageCount Value="3"/> + <UsageCount Value="2"/> </Unit15> <Unit16> <Filename Value="/usr/lib/fpc/src/rtl/unix/baseunix.pp"/> <UnitName Value="BaseUnix"/> <EditorIndex Value="-1"/> <TopLine Value="61"/> - <UsageCount Value="3"/> + <UsageCount Value="2"/> </Unit16> <Unit17> <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovl.inc"/> <EditorIndex Value="-1"/> <TopLine Value="414"/> <CursorPos X="20" Y="434"/> - <UsageCount Value="3"/> + <UsageCount Value="2"/> </Unit17> <Unit18> <Filename Value="/usr/lib/fpc/src/rtl/linux/bunxsysc.inc"/> <EditorIndex Value="-1"/> <TopLine Value="16"/> - <UsageCount Value="3"/> + <UsageCount Value="2"/> </Unit18> <Unit19> <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="74"/> <CursorPos X="15" Y="102"/> - <UsageCount Value="3"/> + <UsageCount Value="2"/> </Unit19> <Unit20> <Filename Value="/usr/lib/fpc/src/packages/fcl-image/src/fpimage.pp"/> @@ -167,148 +166,149 @@ <EditorIndex Value="-1"/> <TopLine Value="10"/> <CursorPos X="3" Y="30"/> - <UsageCount Value="3"/> + <UsageCount Value="2"/> </Unit20> <Unit21> <Filename Value="/usr/lib/fpc/src/rtl/objpas/math.pp"/> <EditorIndex Value="-1"/> <TopLine Value="351"/> <CursorPos X="10" Y="368"/> - <UsageCount Value="4"/> + <UsageCount Value="3"/> </Unit21> <Unit22> <Filename Value="GTIWebServerTestAggActionHandlerUnit.pas"/> <EditorIndex Value="-1"/> <TopLine Value="53"/> <CursorPos X="49" Y="82"/> - <UsageCount Value="4"/> + <UsageCount Value="3"/> </Unit22> <Unit23> <Filename Value="../units/protokollunit.pas"/> - <EditorIndex Value="6"/> + <EditorIndex Value="5"/> <TopLine Value="87"/> <CursorPos X="3" Y="18"/> - <UsageCount Value="30"/> + <UsageCount Value="33"/> <Loaded Value="True"/> </Unit23> </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> - <Filename Value="epostunit.pas"/> - <Caret Line="8600" Column="42" TopLine="8571"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="402" Column="32" TopLine="384"/> </Position1> <Position2> - <Filename Value="epostunit.pas"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="403" Column="32" TopLine="385"/> </Position2> <Position3> - <Filename Value="epostunit.pas"/> - <Caret Line="196" Column="25" TopLine="168"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="404" Column="12" TopLine="386"/> </Position3> <Position4> - <Filename Value="epostunit.pas"/> - <Caret Line="2922" Column="54" TopLine="2893"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="349" Column="42" TopLine="317"/> </Position4> <Position5> - <Filename Value="epostunit.pas"/> - <Caret Line="2923" Column="53" TopLine="2894"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="83" Column="49" TopLine="55"/> </Position5> <Position6> - <Filename Value="epostunit.pas"/> - <Caret Line="3189" Column="39" TopLine="3160"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="63" TopLine="63"/> </Position6> <Position7> - <Filename Value="epostunit.pas"/> - <Caret Line="4260" Column="60" TopLine="4232"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="88" Column="16" TopLine="71"/> </Position7> <Position8> - <Filename Value="epostunit.pas"/> - <Caret Line="4290" Column="60" TopLine="4262"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="402" TopLine="377"/> </Position8> <Position9> - <Filename Value="epostunit.pas"/> - <Caret Line="4431" Column="60" TopLine="4403"/> + <Filename Value="../units/lowlevelunit.pas"/> </Position9> <Position10> - <Filename Value="epostunit.pas"/> - <Caret Line="4560" Column="51" TopLine="4532"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="91" TopLine="59"/> </Position10> <Position11> <Filename Value="epostunit.pas"/> - <Caret Line="4810" Column="18" TopLine="4782"/> + <Caret Line="6133" Column="30" TopLine="6110"/> </Position11> <Position12> - <Filename Value="epostunit.pas"/> - <Caret Line="6043" Column="13" TopLine="6036"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="139" Column="22" TopLine="110"/> </Position12> <Position13> - <Filename Value="epostunit.pas"/> - <Caret Line="6060" Column="13" TopLine="6048"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1004" Column="15" TopLine="969"/> </Position13> <Position14> <Filename Value="epostunit.pas"/> - <Caret Line="6114" Column="27" TopLine="6090"/> + <Caret Line="6139" Column="12" TopLine="6113"/> </Position14> <Position15> - <Filename Value="epostunit.pas"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1041" Column="112" TopLine="1023"/> </Position15> <Position16> - <Filename Value="epostunit.pas"/> - <Caret Line="81" Column="18" TopLine="52"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="89" Column="31" TopLine="71"/> </Position16> <Position17> - <Filename Value="epostunit.pas"/> - <Caret Line="98" Column="55" TopLine="69"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="413" Column="15" TopLine="388"/> </Position17> <Position18> - <Filename Value="epostunit.pas"/> - <Caret Line="129" Column="115" TopLine="101"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="423" Column="37" TopLine="388"/> </Position18> <Position19> - <Filename Value="epostunit.pas"/> - <Caret Line="148" Column="51" TopLine="120"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="422" Column="7" TopLine="405"/> </Position19> <Position20> - <Filename Value="epostunit.pas"/> - <Caret Line="152" Column="66" TopLine="124"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="140" Column="16" TopLine="127"/> </Position20> <Position21> - <Filename Value="epostunit.pas"/> - <Caret Line="162" Column="67" TopLine="134"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1023" Column="33" TopLine="999"/> </Position21> <Position22> - <Filename Value="epostunit.pas"/> - <Caret Line="250" Column="61" TopLine="221"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1033" Column="25" TopLine="1016"/> </Position22> <Position23> - <Filename Value="epostunit.pas"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="89" Column="31" TopLine="71"/> </Position23> <Position24> <Filename Value="epostunit.pas"/> - <Caret Line="642" Column="14" TopLine="609"/> + <Caret Line="6136" Column="12" TopLine="6130"/> </Position24> <Position25> - <Filename Value="../units/matheunit.pas"/> - <Caret Line="57" Column="21" TopLine="28"/> + <Filename Value="epostunit.pas"/> + <Caret Line="603" Column="57" TopLine="590"/> </Position25> <Position26> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="202" Column="33" TopLine="202"/> + <Filename Value="epostunit.pas"/> + <Caret Line="6136" Column="56" TopLine="6125"/> </Position26> <Position27> - <Filename Value="../units/matheunit.pas"/> - <Caret Line="537" Column="19" TopLine="520"/> + <Filename Value="epostunit.pas"/> </Position27> <Position28> - <Filename Value="epost.lpr"/> - <Caret Line="190" Column="66" TopLine="190"/> + <Filename Value="epostunit.pas"/> + <Caret Line="6138" TopLine="6105"/> </Position28> <Position29> <Filename Value="epostunit.pas"/> - <Caret Line="6118" TopLine="6101"/> + <Caret Line="9343" TopLine="9327"/> </Position29> <Position30> - <Filename Value="epostunit.pas"/> - <Caret Line="194" Column="26" TopLine="178"/> + <Filename Value="../units/matheunit.pas"/> + <Caret Line="64" Column="28" TopLine="47"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/epostunit.pas b/epostunit.pas index e5e1db7..dff17fb 100644 --- a/epostunit.pas +++ b/epostunit.pas @@ -6046,10 +6046,13 @@ var fOut: textfile; bekannteBefehle: tMyStringList; Zeit,entspringen, - letzterWert,verschiebung: extended; + letzterWert,verschiebung, + tmp: extended; + tmpPoint: tExtPoint; i,schritte: longint; integriere,iWaag: boolean; tmpValues: tKnownValues; + rand: array[0..3] of tGerade; begin result:=false; warteAufBeendigungDesLeseThreads; @@ -6061,6 +6064,18 @@ begin ab['x']:=extPoint(0,0); ab['y']:=extPoint(_xSteps-1,_tSiz-1); + for i:=0 to 3 do + rand[i]:= + gerade( + extPoint( + byte(i in [1,2])*(_xSteps-1), + byte(i in [2,3])*(_tSiz-1) + ), + extPoint( + byte(odd(i+1)), + byte(odd(i)) + ) + ); skalierung:='1'; verschiebung:=0; @@ -6117,6 +6132,30 @@ begin iWaag:=false; continue; end; + if istDasBefehl('Aufpunkt und Richtung:',s,bekannteBefehle,true) then begin + tmp:=kont2disk('x',exprToFloat(sT,erstesArgument(s,','))); + tmpPoint:=extPoint(tmp,kont2disk('y',exprToFloat(sT,erstesArgument(s,',')))); + if sT then + tmpPoint:=extPoint(_xSteps/2,_tSiz/2); + tmp:=exprToFloat(sT,s); + ab['x']:= + naechsterSchnittpunkt( + gerade( + tmpPoint, + extPoint(-cos(tmp),-sin(tmp)) + ), + rand + ); + ab['y']:= + naechsterSchnittpunkt( + gerade( + tmpPoint, + extPoint(cos(tmp),sin(tmp)) + ), + rand + ); + continue; + end; if istDasBefehl('von',s,bekannteBefehle,true) then begin ab['x','x']:=kont2disk('x',exprToFloat(sT,erstesArgument(s,';'))); ab['x','y']:=kont2disk('y',exprToFloat(sT,s)); |