exportiereAchsen() als Prozedur extrahiert

2 files changed, 64 insertions, 58 deletions

diff --git a/epost.lps b/epost.lps
index 9c93976..d9aec3a 100644
--- a/epost.lps
+++ b/epost.lps
@@ -22,9 +22,10 @@
       <Unit2>
         <Filename Value="epostunit.pas"/>
         <IsPartOfProject Value="True"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
-        <TopLine Value="10166"/>
-        <CursorPos Y="10164"/>
+        <TopLine Value="6422"/>
+        <CursorPos X="28" Y="6448"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -40,9 +41,8 @@
       <Unit4>
         <Filename Value="typenunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="11"/>
-        <CursorPos X="13" Y="8"/>
+        <CursorPos X="34" Y="18"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -221,123 +221,121 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="1694" Column="26" TopLine="1687"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="6169" Column="44" TopLine="6169"/>
       </Position1>
       <Position2>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="188" TopLine="174"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10062" Column="38" TopLine="10042"/>
       </Position2>
       <Position3>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="1699" TopLine="1689"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10063" Column="28" TopLine="10042"/>
       </Position3>
       <Position4>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="1522" Column="8" TopLine="1504"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10064" Column="28" TopLine="10042"/>
       </Position4>
       <Position5>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="1525" Column="12" TopLine="1507"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10065" Column="28" TopLine="10042"/>
       </Position5>
       <Position6>
-        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
-        <Caret Line="89" Column="3" TopLine="63"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10066" Column="28" TopLine="10042"/>
       </Position6>
       <Position7>
-        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
-        <Caret Line="87" Column="13" TopLine="63"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10075" Column="69" TopLine="10069"/>
       </Position7>
       <Position8>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="1528" Column="24" TopLine="1507"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10077" Column="32" TopLine="10069"/>
       </Position8>
       <Position9>
-        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
-        <Caret Line="89" Column="3" TopLine="63"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10105" Column="51" TopLine="10081"/>
       </Position9>
       <Position10>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="1526" Column="36" TopLine="1510"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10109" Column="79" TopLine="10084"/>
       </Position10>
       <Position11>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="1531" Column="13" TopLine="1510"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="10125" Column="10" TopLine="10119"/>
       </Position11>
       <Position12>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="1540" Column="77" TopLine="1524"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="6293" Column="15" TopLine="6276"/>
       </Position12>
       <Position13>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6169" Column="44" TopLine="6169"/>
+        <Caret Line="6320" Column="27" TopLine="6306"/>
       </Position13>
       <Position14>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10062" Column="38" TopLine="10042"/>
+        <Caret Line="6321" Column="17" TopLine="6306"/>
       </Position14>
       <Position15>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10063" Column="28" TopLine="10042"/>
+        <Caret Line="6358" Column="15" TopLine="6346"/>
       </Position15>
       <Position16>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10064" Column="28" TopLine="10042"/>
+        <Caret Line="6601" Column="15" TopLine="6346"/>
       </Position16>
       <Position17>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10065" Column="28" TopLine="10042"/>
       </Position17>
       <Position18>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10066" Column="28" TopLine="10042"/>
+        <Caret Line="10164" TopLine="10166"/>
       </Position18>
       <Position19>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10075" Column="69" TopLine="10069"/>
       </Position19>
       <Position20>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10077" Column="32" TopLine="10069"/>
+        <Caret Line="6372" Column="12" TopLine="6344"/>
       </Position20>
       <Position21>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10105" Column="51" TopLine="10081"/>
+        <Caret Line="6280" Column="24" TopLine="6263"/>
       </Position21>
       <Position22>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10109" Column="79" TopLine="10084"/>
+        <Caret Line="6336" Column="14" TopLine="6309"/>
       </Position22>
       <Position23>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10125" Column="10" TopLine="10119"/>
+        <Caret Line="6372" Column="18" TopLine="6360"/>
       </Position23>
       <Position24>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6293" Column="15" TopLine="6276"/>
+        <Caret Line="6364" Column="31" TopLine="6354"/>
       </Position24>
       <Position25>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6320" Column="27" TopLine="6306"/>
+        <Caret Line="510" Column="24" TopLine="492"/>
       </Position25>
       <Position26>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6321" Column="17" TopLine="6306"/>
+        <Caret Line="6449" Column="28" TopLine="6422"/>
       </Position26>
       <Position27>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6358" Column="15" TopLine="6346"/>
+        <Caret Line="9978" Column="11" TopLine="9957"/>
       </Position27>
       <Position28>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="6601" Column="15" TopLine="6346"/>
       </Position28>
       <Position29>
         <Filename Value="epostunit.pas"/>
+        <Caret Line="509" Column="27" TopLine="482"/>
       </Position29>
       <Position30>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="10164" TopLine="10166"/>
+        <Caret Line="510" Column="24" TopLine="482"/>
       </Position30>
     </JumpHistory>
     <RunParams>
diff --git a/epostunit.pas b/epostunit.pas
index 8ba0af0..1b91760 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -506,6 +506,7 @@ function initBmpHeader(w,h: longint): tBmpHeader;
 procedure schreibeBmpHeader(var f: file; w,h: longint);
 function findePalette(out palette: tPalette; name: string): boolean;
 function dumpPalettenNamen: string;
+procedure exportiereAchsen(achsenDatei: string; achsen: t2x2Extended; breite, hoehe: int64);
 function erzeugeLegende(sT: boolean; f: tMyStringList; datei: string; qu: tWerte; minDichte,maxDichte: extended; nB: tTransformation; pal: tPalette): boolean;
 function findeWerte(s: string; f: tMyStringList; pws: pTWerteArray; kont: pTKonturenArray; darfErstellen: boolean): integer;
 function findeKontur(s: string; f: tMyStringList; pws: pTWerteArray; pks: pTKonturenArray; darfErstellen: boolean): integer;
@@ -6296,8 +6297,6 @@ var
   musterKontur:                          tZuZeichnendeKontur;
   quellen:                               tWerteArray;
   bekannteBefehle:                       tMyStringList;
-  achsenDateiHandle:                     textFile;
-  c:                                     char;
 
 procedure aufraeumen;
 var
@@ -6600,17 +6599,8 @@ begin
 
   fontRenderer:=tFontRenderer.create(schriftgroesze);
 
-  if achsenDatei<>'' then begin
-    assignFile(achsenDateiHandle,achsenDatei);
-    rewrite(achsenDateiHandle);
-    for c:='x' to 'y' do begin
-      writeln(achsenDateiHandle,c+'Start = '+myFloatToStr(Ausschnitt.achsen[c,'x']));
-      writeln(achsenDateiHandle,c+'Stopp = '+myFloatToStr(Ausschnitt.achsen[c,'y']));
-    end;
-    writeln(achsenDateiHandle,'xSteps = '+intToStr(breite));
-    writeln(achsenDateiHandle,'ySteps = '+intToStr(hoehe));
-    closeFile(achsenDateiHandle);
-  end;
+  if achsenDatei<>'' then
+    exportiereAchsen(achsenDatei,Ausschnitt.achsen,breite,hoehe);
 
   setLength(beschriftungen,0);
   for i:=0 to length(achsen)-1 do begin
@@ -9983,6 +9973,24 @@ begin
   delete(result,1,1);
 end;
 
+procedure exportiereAchsen(achsenDatei: string; achsen: t2x2Extended; breite, hoehe: int64);
+var
+  achsenDateiHandle: textFile;
+  c:                 char;
+begin
+  assignFile(achsenDateiHandle,achsenDatei);
+  rewrite(achsenDateiHandle);
+  for c:=char(ord('x')+byte(breite<=0)) to char(ord('y')-byte(hoehe<=0)) do begin
+    writeln(achsenDateiHandle,c+'Start = '+myFloatToStr(achsen[c,'x']));
+    writeln(achsenDateiHandle,c+'Stopp = '+myFloatToStr(achsen[c,'y']));
+  end;
+  if breite>=0 then
+    writeln(achsenDateiHandle,'xSteps = '+intToStr(breite));
+  if hoehe>=0 then
+    writeln(achsenDateiHandle,'ySteps = '+intToStr(hoehe));
+  closeFile(achsenDateiHandle);
+end;
+
 function erzeugeLegende(sT: boolean; f: tMyStringList; datei: string; qu: tWerte; minDichte,maxDichte: extended; nB: tTransformation; pal: tPalette): boolean;
 var
   s:                                  string;