werteunit.pas: schreibeWert(): ignoriere Werte außerhalb (setze sie =0)

2 files changed, 78 insertions, 74 deletions

diff --git a/epost.lps b/epost.lps
index a305e15..22d2484 100644
--- a/epost.lps
+++ b/epost.lps
@@ -23,8 +23,8 @@
         <Filename Value="epostunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="6121"/>
-        <CursorPos Y="6125"/>
+        <TopLine Value="2512"/>
+        <CursorPos Y="2529"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -32,8 +32,8 @@
         <Filename Value="werteunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="5"/>
-        <TopLine Value="2237"/>
-        <CursorPos X="72" Y="2261"/>
+        <TopLine Value="66"/>
+        <CursorPos X="264" Y="71"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit3>
@@ -42,8 +42,8 @@
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="10"/>
-        <TopLine Value="2520"/>
-        <CursorPos X="22" Y="2538"/>
+        <TopLine Value="2526"/>
+        <CursorPos X="105" Y="2532"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -86,7 +86,7 @@
         <EditorIndex Value="7"/>
         <TopLine Value="86"/>
         <CursorPos X="26" Y="115"/>
-        <UsageCount Value="88"/>
+        <UsageCount Value="94"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -94,21 +94,21 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="8"/>
         <CursorPos X="3" Y="2"/>
-        <UsageCount Value="84"/>
+        <UsageCount Value="90"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
         <Filename Value="fileunit.pas"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="204"/>
-        <UsageCount Value="190"/>
+        <UsageCount Value="189"/>
       </Unit11>
       <Unit12>
         <Filename Value="../units/mystringlistunit.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="712"/>
         <CursorPos X="22" Y="735"/>
-        <UsageCount Value="90"/>
+        <UsageCount Value="89"/>
       </Unit12>
       <Unit13>
         <Filename Value="../units/lowlevelunit.pas"/>
@@ -129,48 +129,48 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="190"/>
         <CursorPos X="22" Y="195"/>
-        <UsageCount Value="94"/>
+        <UsageCount Value="93"/>
       </Unit15>
       <Unit16>
         <Filename Value="/usr/lib/fpc/src/rtl/inc/objpash.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="176"/>
         <CursorPos X="23" Y="194"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit16>
       <Unit17>
         <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovlh.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="61"/>
         <CursorPos X="10" Y="99"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit17>
       <Unit18>
         <Filename Value="/usr/lib/fpc/src/rtl/unix/baseunix.pp"/>
         <UnitName Value="BaseUnix"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="61"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit18>
       <Unit19>
         <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovl.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="414"/>
         <CursorPos X="20" Y="434"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit19>
       <Unit20>
         <Filename Value="/usr/lib/fpc/src/rtl/linux/bunxsysc.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="16"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit20>
       <Unit21>
         <Filename Value="/usr/lib/fpc/src/rtl/unix/bunxh.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="74"/>
         <CursorPos X="15" Y="102"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit21>
       <Unit22>
         <Filename Value="/usr/lib/fpc/src/packages/fcl-image/src/fpimage.pp"/>
@@ -178,155 +178,155 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="10"/>
         <CursorPos X="3" Y="30"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
       </Unit22>
       <Unit23>
         <Filename Value="../units/protokollunit.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="18"/>
         <CursorPos X="3" Y="18"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="38"/>
       </Unit23>
       <Unit24>
         <Filename Value="../fpGUI/src/corelib/render/software/agg_2D.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="2116"/>
         <CursorPos X="2" Y="2134"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
       </Unit24>
       <Unit25>
         <Filename Value="../units/randomunit.pas"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="19" Y="11"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
       </Unit25>
       <Unit26>
         <Filename Value="epost.lpi"/>
         <EditorIndex Value="-1"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
         <DefaultSyntaxHighlighter Value="XML"/>
       </Unit26>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="461" Column="27" TopLine="444"/>
+        <Caret Line="2233" Column="66" TopLine="2204"/>
       </Position1>
       <Position2>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2647" Column="46" TopLine="2624"/>
+        <Caret Line="2239" Column="82" TopLine="2210"/>
       </Position2>
       <Position3>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="385" Column="26" TopLine="368"/>
+        <Caret Line="2245" Column="43" TopLine="2216"/>
       </Position3>
       <Position4>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2230" Column="82" TopLine="2201"/>
+        <Caret Line="2248" Column="88" TopLine="2219"/>
       </Position4>
       <Position5>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2232" Column="39" TopLine="2203"/>
+        <Caret Line="2251" Column="39" TopLine="2222"/>
       </Position5>
       <Position6>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2233" Column="66" TopLine="2204"/>
+        <Caret Line="2252" Column="71" TopLine="2223"/>
       </Position6>
       <Position7>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2239" Column="82" TopLine="2210"/>
+        <Caret Line="2325" Column="74" TopLine="2296"/>
       </Position7>
       <Position8>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2245" Column="43" TopLine="2216"/>
+        <Caret Line="2327" Column="39" TopLine="2298"/>
       </Position8>
       <Position9>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="2248" Column="88" TopLine="2219"/>
+        <Caret Line="2328" Column="59" TopLine="2299"/>
       </Position9>
       <Position10>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2251" Column="39" TopLine="2222"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="6146" TopLine="6130"/>
       </Position10>
       <Position11>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2252" Column="71" TopLine="2223"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="124" Column="31" TopLine="102"/>
       </Position11>
       <Position12>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2325" Column="74" TopLine="2296"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2584" Column="52" TopLine="2568"/>
       </Position12>
       <Position13>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2327" Column="39" TopLine="2298"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="5483" Column="36" TopLine="5462"/>
       </Position13>
       <Position14>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2328" Column="59" TopLine="2299"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="6016" Column="36" TopLine="5995"/>
       </Position14>
       <Position15>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6146" TopLine="6130"/>
+        <Caret Line="6129" Column="44" TopLine="6112"/>
       </Position15>
       <Position16>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="124" Column="31" TopLine="102"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="7142" Column="63" TopLine="7130"/>
       </Position16>
       <Position17>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="2584" Column="52" TopLine="2568"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="187" Column="41" TopLine="171"/>
       </Position17>
       <Position18>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5483" Column="36" TopLine="5462"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="2538" Column="18" TopLine="2519"/>
       </Position18>
       <Position19>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6016" Column="36" TopLine="5995"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="439" Column="21" TopLine="421"/>
       </Position19>
       <Position20>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6129" Column="44" TopLine="6112"/>
+        <Caret Line="6176" Column="54" TopLine="6143"/>
       </Position20>
       <Position21>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="7142" Column="63" TopLine="7130"/>
+        <Filename Value="epost.lpr"/>
+        <Caret Line="198" Column="37" TopLine="261"/>
       </Position21>
       <Position22>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="187" Column="41" TopLine="171"/>
+        <Caret Line="7155" Column="35" TopLine="7127"/>
       </Position22>
       <Position23>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2538" Column="18" TopLine="2519"/>
+        <Filename Value="epost.lpr"/>
+        <Caret Line="657" TopLine="576"/>
       </Position23>
       <Position24>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="439" Column="21" TopLine="421"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="7029" TopLine="6997"/>
       </Position24>
       <Position25>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6176" Column="54" TopLine="6143"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="2538" Column="79" TopLine="2530"/>
       </Position25>
       <Position26>
-        <Filename Value="epost.lpr"/>
-        <Caret Line="198" Column="37" TopLine="261"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="6125" TopLine="6189"/>
       </Position26>
       <Position27>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="7155" Column="35" TopLine="7127"/>
+        <Caret Line="7029" Column="146" TopLine="7068"/>
       </Position27>
       <Position28>
-        <Filename Value="epost.lpr"/>
-        <Caret Line="657" TopLine="576"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="72" Column="152" TopLine="55"/>
       </Position28>
       <Position29>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="7029" TopLine="6997"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="927" Column="110" TopLine="918"/>
       </Position29>
       <Position30>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2538" Column="79" TopLine="2530"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="7026" Column="86" TopLine="7017"/>
       </Position30>
     </JumpHistory>
     <RunParams>
diff --git a/werteunit.pas b/werteunit.pas
index 0f397e0..e4e79e3 100644
--- a/werteunit.pas
+++ b/werteunit.pas
@@ -929,11 +929,15 @@ begin
   else begin
     tmp:=verschiebung;
     for i:=0 to linienIntegral.schritte-1 do
-      tmp:=
-        tmp+
-        werte[
-          round(x+linienIntegral.von['x']+i*linienIntegral.schritt['x'])+
-          round(y+linienIntegral.von['y']+i*linienIntegral.schritt['y'])*params.xSteps];
+      if (round(x+linienIntegral.von['x']+i*linienIntegral.schritt['x'])>=0) and
+        (round(x+linienIntegral.von['x']+i*linienIntegral.schritt['x'])<params.xSteps) and
+        (round(y+linienIntegral.von['y']+i*linienIntegral.schritt['y'])>=0) and
+        (round(y+linienIntegral.von['y']+i*linienIntegral.schritt['y'])<params.tSiz) then
+        tmp:=
+          tmp+
+          werte[
+            round(x+linienIntegral.von['x']+i*linienIntegral.schritt['x'])+
+            round(y+linienIntegral.von['y']+i*linienIntegral.schritt['y'])*params.xSteps];
   end;
   if isNaN(letzterWert) or (entspringen<0) then
     letzterWert:=tmp;