diff options
| -rw-r--r-- | epost.lpi | 2 | ||||
| -rw-r--r-- | epost.lps | 167 | ||||
| -rw-r--r-- | epostunit.pas | 8 | ||||
| -rw-r--r-- | werteunit.pas | 12 |
4 files changed, 99 insertions, 90 deletions
@@ -31,7 +31,7 @@ <local> <FormatVersion Value="1"/> <CommandLineParams Value="input.epost"/> - <WorkingDirectory Value="/home_raid/erich/Dokumente/Experimente/zweifarben_atto_streaking"/> + <WorkingDirectory Value="/home_raid/erich/Dokumente/Paper/xrom/simulationen/"/> </local> </RunParams> <RequiredPackages Count="1"> @@ -7,9 +7,8 @@ <Unit0> <Filename Value="epost.lpr"/> <IsPartOfProject Value="True"/> - <IsVisibleTab Value="True"/> - <TopLine Value="33"/> - <CursorPos X="66" Y="73"/> + <TopLine Value="65"/> + <CursorPos X="49" Y="73"/> <UsageCount Value="202"/> <Loaded Value="True"/> </Unit0> @@ -23,10 +22,10 @@ <Unit2> <Filename Value="epostunit.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="3"/> - <TopLine Value="800"/> - <CursorPos Y="820"/> - <FoldState Value=" T0/5m$0C1."/> + <EditorIndex Value="1"/> + <TopLine Value="4524"/> + <CursorPos X="180" Y="4518"/> + <FoldState Value=" T0/Dm$0C16"/> <UsageCount Value="201"/> <Loaded Value="True"/> </Unit2> @@ -40,18 +39,18 @@ <Unit4> <Filename Value="werteunit.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="5"/> - <TopLine Value="580"/> - <CursorPos Y="619"/> + <IsVisibleTab Value="True"/> + <EditorIndex Value="2"/> + <TopLine Value="949"/> + <CursorPos X="43" Y="961"/> <UsageCount Value="200"/> <Loaded Value="True"/> </Unit4> <Unit5> <Filename Value="typenunit.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="6"/> - <TopLine Value="1026"/> - <CursorPos X="39" Y="1059"/> + <EditorIndex Value="3"/> + <TopLine Value="433"/> <UsageCount Value="200"/> <Loaded Value="True"/> </Unit5> @@ -61,7 +60,7 @@ <EditorIndex Value="-1"/> <TopLine Value="162"/> <CursorPos X="56" Y="177"/> - <UsageCount Value="79"/> + <UsageCount Value="84"/> </Unit6> <Unit7> <Filename Value="../units/fftunit.inc"/> @@ -69,7 +68,7 @@ <EditorIndex Value="-1"/> <TopLine Value="10"/> <CursorPos X="22" Y="10"/> - <UsageCount Value="76"/> + <UsageCount Value="81"/> </Unit7> <Unit8> <Filename Value="../fpGUI/src/corelib/render/software/agg_scanline_storage_aa.pas"/> @@ -80,16 +79,16 @@ </Unit8> <Unit9> <Filename Value="../units/mystringlistunit.pas"/> - <EditorIndex Value="1"/> - <TopLine Value="299"/> - <CursorPos X="21" Y="314"/> - <UsageCount Value="14"/> - <Loaded Value="True"/> + <EditorIndex Value="-1"/> + <TopLine Value="257"/> + <CursorPos X="6" Y="257"/> + <UsageCount Value="15"/> </Unit9> <Unit10> <Filename Value="../units/lowlevelunit.pas"/> <EditorIndex Value="-1"/> - <CursorPos Y="29"/> + <TopLine Value="496"/> + <CursorPos X="34" Y="513"/> <UsageCount Value="35"/> </Unit10> <Unit11> @@ -99,19 +98,17 @@ </Unit11> <Unit12> <Filename Value="../units/matheunit.pas"/> - <EditorIndex Value="4"/> - <TopLine Value="401"/> + <EditorIndex Value="-1"/> + <TopLine Value="410"/> <CursorPos X="35" Y="449"/> - <UsageCount Value="26"/> - <Loaded Value="True"/> + <UsageCount Value="28"/> </Unit12> <Unit13> <Filename Value="../units/systemunit.pas"/> - <EditorIndex Value="2"/> - <TopLine Value="107"/> - <CursorPos X="26" Y="139"/> + <EditorIndex Value="-1"/> + <TopLine Value="186"/> + <CursorPos Y="161"/> <UsageCount Value="20"/> - <Loaded Value="True"/> </Unit13> <Unit14> <Filename Value="../fpGUI/src/corelib/render/software/agg_2D.pas"/> @@ -180,122 +177,130 @@ <JumpHistory Count="30" HistoryIndex="29"> <Position1> <Filename Value="epostunit.pas"/> - <Caret Line="1003" Column="30" TopLine="971"/> + <Caret Line="4540" Column="32" TopLine="4507"/> </Position1> <Position2> <Filename Value="epostunit.pas"/> + <Caret Line="4541" Column="24" TopLine="4508"/> </Position2> <Position3> <Filename Value="epostunit.pas"/> - <Caret Line="88" Column="30" TopLine="55"/> + <Caret Line="4542" Column="22" TopLine="4509"/> </Position3> <Position4> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="16" Column="11"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4556" Column="107" TopLine="4541"/> </Position4> <Position5> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="17" Column="12"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4557" Column="107" TopLine="4541"/> </Position5> <Position6> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="16" Column="22"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4558" Column="107" TopLine="4541"/> </Position6> <Position7> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="17" Column="22"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4562" Column="19" TopLine="4551"/> </Position7> <Position8> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="134" Column="32" TopLine="100"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4574" Column="61" TopLine="4557"/> </Position8> <Position9> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="133" Column="10" TopLine="113"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3545" Column="114" TopLine="3528"/> </Position9> <Position10> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="144" Column="19" TopLine="113"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3539" TopLine="3518"/> </Position10> <Position11> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="138" Column="18" TopLine="118"/> + <Filename Value="epostunit.pas"/> + <Caret Line="226" Column="16" TopLine="214"/> </Position11> <Position12> - <Filename Value="../units/systemunit.pas"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3259" Column="64" TopLine="3227"/> </Position12> <Position13> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="18" Column="44"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3540" Column="36" TopLine="3508"/> </Position13> <Position14> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="17" Column="42"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4663" Column="24" TopLine="4638"/> </Position14> <Position15> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="133" Column="20" TopLine="100"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3520" Column="32" TopLine="3497"/> </Position15> <Position16> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="147" Column="55" TopLine="114"/> + <Filename Value="epostunit.pas"/> + <Caret Line="226" Column="16" TopLine="206"/> </Position16> <Position17> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="157" Column="44" TopLine="124"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3179" Column="64" TopLine="3146"/> </Position17> <Position18> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="8" Column="58"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3520" Column="36" TopLine="3488"/> </Position18> <Position19> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="138" TopLine="118"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4503" Column="4" TopLine="4542"/> </Position19> <Position20> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="146" Column="27" TopLine="126"/> + <Filename Value="werteunit.pas"/> + <Caret Line="60" Column="27" TopLine="42"/> </Position20> <Position21> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="149" TopLine="128"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4537" Column="102" TopLine="4518"/> </Position21> <Position22> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="158" Column="19" TopLine="147"/> + <Filename Value="epostunit.pas"/> </Position22> <Position23> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="154" Column="28" TopLine="140"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4546" Column="19" TopLine="4523"/> </Position23> <Position24> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="178" Column="19" TopLine="159"/> + <Filename Value="epostunit.pas"/> + <Caret Line="226" Column="16" TopLine="206"/> </Position24> <Position25> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="200" TopLine="179"/> + <Filename Value="epostunit.pas"/> + <Caret Line="3448" Column="43" TopLine="3429"/> </Position25> <Position26> - <Filename Value="../units/systemunit.pas"/> - <Caret Line="208" Column="54" TopLine="188"/> + <Filename Value="epostunit.pas"/> + <Caret Line="4484" Column="21" TopLine="4478"/> </Position26> <Position27> <Filename Value="epostunit.pas"/> - <Caret Line="792" Column="21" TopLine="783"/> + <Caret Line="226" Column="16" TopLine="206"/> </Position27> <Position28> <Filename Value="epostunit.pas"/> - <Caret Line="793" TopLine="777"/> + <Caret Line="3179" Column="64" TopLine="3146"/> </Position28> <Position29> <Filename Value="epostunit.pas"/> - <Caret Line="796" Column="23" TopLine="776"/> + <Caret Line="3520" Column="70" TopLine="3494"/> </Position29> <Position30> - <Filename Value="epostunit.pas"/> - <Caret Line="801" TopLine="781"/> + <Filename Value="werteunit.pas"/> + <Caret Line="984" Column="60" TopLine="947"/> </Position30> </JumpHistory> </ProjectSession> + <Debugging> + <Watches Count="1"> + <Item1> + <Expression Value="s"/> + </Item1> + </Watches> + </Debugging> </CONFIG> diff --git a/epostunit.pas b/epostunit.pas index 97906a6..94af43d 100644 --- a/epostunit.pas +++ b/epostunit.pas @@ -3417,8 +3417,8 @@ begin tmax:=min(tmax,_tsiz-1); gibAus('('+inttostr(xmin)+'-'+inttostr(xmax)+'x'+inttostr(tmin)+'-'+inttostr(tmax)+')',3); gibAus(' ('+floattostr(Transformationen.xstart)+'-'+floattostr(Transformationen.xstop)+' x '+floattostr(Transformationen.tstart)+'-'+floattostr(Transformationen.tstop)+')',3); - breite:=round((xmax-xmin)*xzoom)+1; - hoehe:=round((tmax-tmin)*yzoom)+1; + breite:=round((xmax-xmin+1)*xzoom); + hoehe:=round((tmax-tmin+1)*yzoom); Ausschnitt:=tKoordinatenAusschnitt.create(Transformationen,xmin,xmax,tmin,tmax); @@ -4452,9 +4452,9 @@ begin // wbreite:=max(gesbreite div mt,byte(nummer=mt-1)*(gesbreite-(gesbreite div mt)*(mt-1))); // breite:=wbreite+lof*byte(nummer=0)+rof*byte(nummer=mt-1); hoehe:=oof+whoehe+uof; - gibAus('Werte: '+inttostr(xmi)+'-'+inttostr(xma)+'x'+inttostr(tmi)+'-'+inttostr(tma)+', Pixel: '+inttostr(xpmi)+'-'+inttostr(xpma),1); + gibAus('Werte: '+inttostr(xmi)+'-'+inttostr(xma)+'x'+inttostr(tmi)+'-'+inttostr(tma)+' ('+inttostr(wbreite)+'), Pixel: '+inttostr(xpmi)+'-'+inttostr(xpma)+' ('+inttostr(breite)+')',1); gibAus('Thread '+inttostr(nummer)+': hole ' - +inttostr(round(((sizeof(extended)+sizeof(longint))*whoehe*wbreite+ + +inttostr(round(((sizeof(extended)+sizeof(longint))*length(wes)*whoehe*wbreite+ sizeof(tRGB)*hoehe*breite)/1024/1024))+'MB RAM ...',1); setlength(wertes,length(wes)); setlength(anzahlens,length(wes)); diff --git a/werteunit.pas b/werteunit.pas index 3150061..5f8dda4 100644 --- a/werteunit.pas +++ b/werteunit.pas @@ -966,12 +966,16 @@ begin tv:=min(params.tsiz-1,max(0,ceil((j-1/2)/yz+tmi))); tb:=min(params.tsiz-1,max(0,ceil((j+1/2)/yz+tmi-1))); if xv>xb then begin - xv:=xv-byte((i>0) or (xpmi>0)); - xb:=xb+byte((xpmi<0) or ((i=0) and (xpmi=0))); + if (i>0) or (xpmi>0) then + dec(xv) + else + inc(xb); end; if tv>tb then begin - tv:=tv-byte(j>0); - tb:=tb+byte(j=0); + if j>0 then + dec(tv) + else + inc(tb); end; if (xv>xb) or (tv>tb) then begin gibAus('Keine Inputwerte für Position '+inttostr(i)+':'+inttostr(j)+'!',1); |