epostunit.pas: findeMaximum sollte standardmäßig Achsenkoordinaten speichern, kann nun aber per Option weiterhin die Indizes speichern

2 files changed, 71 insertions, 61 deletions

diff --git a/epost.lps b/epost.lps
index 51c0adc..e7f357d 100644
--- a/epost.lps
+++ b/epost.lps
@@ -24,8 +24,8 @@
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="1787"/>
-        <CursorPos X="24" Y="1804"/>
+        <TopLine Value="6195"/>
+        <CursorPos X="85" Y="6212"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -49,8 +49,8 @@
         <Filename Value="typenunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="11"/>
-        <TopLine Value="893"/>
-        <CursorPos X="14" Y="915"/>
+        <TopLine Value="2183"/>
+        <CursorPos X="22" Y="2199"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit5>
@@ -86,7 +86,7 @@
         <EditorIndex Value="9"/>
         <TopLine Value="407"/>
         <CursorPos X="114" Y="425"/>
-        <UsageCount Value="112"/>
+        <UsageCount Value="113"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -94,7 +94,7 @@
         <EditorIndex Value="7"/>
         <TopLine Value="542"/>
         <CursorPos X="49" Y="566"/>
-        <UsageCount Value="56"/>
+        <UsageCount Value="57"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
@@ -118,7 +118,7 @@
         <EditorIndex Value="2"/>
         <TopLine Value="126"/>
         <CursorPos X="7" Y="147"/>
-        <UsageCount Value="70"/>
+        <UsageCount Value="71"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
@@ -187,124 +187,121 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2562" TopLine="2545"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="849" Column="30" TopLine="816"/>
       </Position1>
       <Position2>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="477" Column="169" TopLine="458"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="109" Column="21" TopLine="100"/>
       </Position2>
       <Position3>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2561" TopLine="2543"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="824" Column="24" TopLine="795"/>
       </Position3>
       <Position4>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2588" Column="130" TopLine="2565"/>
+        <Filename Value="epostunit.pas"/>
       </Position4>
       <Position5>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2571" Column="116" TopLine="2548"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="103" Column="19" TopLine="80"/>
       </Position5>
       <Position6>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="2582" Column="19" TopLine="2564"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="203" TopLine="176"/>
       </Position6>
       <Position7>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4663" Column="77" TopLine="4642"/>
+        <Caret Line="5835" Column="3" TopLine="5808"/>
       </Position7>
       <Position8>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4665" Column="26" TopLine="4646"/>
+        <Caret Line="174" Column="22" TopLine="158"/>
       </Position8>
       <Position9>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4679" Column="45" TopLine="4653"/>
+        <Caret Line="4559" Column="66" TopLine="4537"/>
       </Position9>
       <Position10>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="106" Column="31" TopLine="78"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="5838" Column="137" TopLine="5810"/>
       </Position10>
       <Position11>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="2013" Column="57" TopLine="1981"/>
+        <Filename Value="epostunit.pas"/>
       </Position11>
       <Position12>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4673" TopLine="4647"/>
+        <Caret Line="5838" Column="32" TopLine="5810"/>
       </Position12>
       <Position13>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="339" Column="14" TopLine="323"/>
+        <Filename Value="epostunit.pas"/>
       </Position13>
       <Position14>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4660" TopLine="4647"/>
+        <Caret Line="174" Column="22" TopLine="147"/>
       </Position14>
       <Position15>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="467" Column="17" TopLine="450"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="4587" Column="59" TopLine="4577"/>
       </Position15>
       <Position16>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="330" Column="17" TopLine="313"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="462" Column="25" TopLine="444"/>
       </Position16>
       <Position17>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4673" Column="10" TopLine="4647"/>
+        <Caret Line="8693" Column="97" TopLine="8682"/>
       </Position17>
       <Position18>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6117" Column="11" TopLine="6088"/>
+        <Caret Line="4599" Column="174" TopLine="4576"/>
       </Position18>
       <Position19>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6132" Column="11" TopLine="6103"/>
+        <Caret Line="4590" Column="65" TopLine="4582"/>
       </Position19>
       <Position20>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6160" Column="30" TopLine="6153"/>
+        <Caret Line="192" Column="26" TopLine="176"/>
       </Position20>
       <Position21>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6161" Column="15" TopLine="6153"/>
+        <Caret Line="6221" Column="37" TopLine="6199"/>
       </Position21>
       <Position22>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6203" Column="38" TopLine="6191"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="351" Column="36" TopLine="336"/>
       </Position22>
       <Position23>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="97" Column="43" TopLine="82"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="393" Column="36" TopLine="364"/>
       </Position23>
       <Position24>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="1394" Column="53" TopLine="1387"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="416" Column="36" TopLine="387"/>
       </Position24>
       <Position25>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="1347" Column="57" TopLine="1330"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="480" Column="36" TopLine="451"/>
       </Position25>
       <Position26>
-        <Filename Value="epost.lpr"/>
-        <Caret Line="173" Column="34" TopLine="152"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="530" Column="36" TopLine="501"/>
       </Position26>
       <Position27>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="1801" Column="64" TopLine="1780"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="548" Column="36" TopLine="519"/>
       </Position27>
       <Position28>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="88" Column="31" TopLine="71"/>
+        <Caret Line="561" Column="36" TopLine="532"/>
       </Position28>
       <Position29>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="1803" Column="37" TopLine="1780"/>
+        <Caret Line="6212" Column="102" TopLine="6199"/>
       </Position29>
       <Position30>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="4099" TopLine="4070"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="2011" Column="72" TopLine="2020"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/epostunit.pas b/epostunit.pas
index 3ca06cb..16d686f 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -6122,7 +6122,7 @@ var
   datei,s,separator:   string;
   outF:                textfile;
   xMin,xMax,tMin,tMax: longint;
-  toroidal:            boolean;
+  toroidal,indizes:    boolean;
   Zeit:                extended;
   bekannteBefehle:     tMyStringList;
 begin
@@ -6138,6 +6138,7 @@ begin
   separator:=',';
   bekannteBefehle:=tMyStringList.create;
   toroidal:=false;
+  indizes:=false;
   repeat
     if not f.metaReadln(s,true) then begin
       gibAus('Unerwartetes Dateiende in '''+paramstr(1)+'''!',3);
@@ -6169,6 +6170,10 @@ begin
       toroidal:=true;
       continue;
     end;
+    if istDasBefehl('Indizes speichern',s,bekannteBefehle,false) then begin
+      indizes:=true;
+      continue;
+    end;
     if istDasBefehl('Separator:',s,bekannteBefehle,true) then begin
       if s='Leerzeichen' then begin
         separator:=' ';
@@ -6202,11 +6207,19 @@ begin
   else
     rewrite(outF);
   write(outF,
-    bezeichner + separator +
-    intToStr(_maxP['x']-_xSteps*byte(toroidal and (_maxP['x']*2>=_xSteps))) + separator +
-    intToStr(_maxP['y']-_tSiz*byte(toroidal and (_maxP['y']*2>=_tSiz))) + separator +
-    intToStr(_xSteps) + separator +
-    intToStr(_tSiz) + separator);
+    bezeichner + separator);
+  if indizes then
+    write(outF,
+      intToStr(_maxP['x']-_xSteps*byte(toroidal and (_maxP['x']*2>=_xSteps))) + separator +
+      intToStr(_maxP['y']-_tSiz*byte(toroidal and (_maxP['y']*2>=_tSiz))) + separator +
+      intToStr(_xSteps) + separator +
+      intToStr(_tSiz) + separator)
+  else
+    write(outF,
+      myFloatToStr(transformationen.positionAufAchseZuWert(lUnten,_maxP['x']/_xSteps) - (_xStop-_xStart) * (1 + 1/(_xSteps-1)) * byte(toroidal and (_maxP['x']*2>=_xSteps)) ) + separator +
+      myFloatToStr(transformationen.positionAufAchseZuWert(lLinks,_maxP['y']/_tSiz) - (_tStop-_tStart) * (1 + 1/(_tSiz-1)) * byte(toroidal and (_maxP['y']*2>=_tSiz)) ) + separator +
+      myFloatToStr((_xStop-_xStart) * (1 + 1/(_xSteps-1))) + separator +
+      myFloatToStr((_tStop-_tStart) * (1 + 1/(_tSiz-1))) + separator);
   case genauigkeit of
     gSingle:
       writeln(outF,