epostunit.pas: findeZweitDominantestenPunkt(): x/y-Skalierung sollte kont2diskFak statt kont2disk verwenden

2 files changed, 63 insertions, 73 deletions

diff --git a/epost.lps b/epost.lps
index 667f933..8ba1305 100644
--- a/epost.lps
+++ b/epost.lps
@@ -22,19 +22,19 @@
       <Unit2>
         <Filename Value="epostunit.pas"/>
         <IsPartOfProject Value="True"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="7382"/>
-        <CursorPos Y="7398"/>
+        <TopLine Value="7366"/>
+        <CursorPos X="62" Y="7435"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="werteunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="5"/>
-        <TopLine Value="1526"/>
-        <CursorPos X="35" Y="1552"/>
+        <TopLine Value="1544"/>
+        <CursorPos Y="1558"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit3>
@@ -86,7 +86,7 @@
         <EditorIndex Value="7"/>
         <TopLine Value="86"/>
         <CursorPos X="26" Y="115"/>
-        <UsageCount Value="59"/>
+        <UsageCount Value="61"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -94,7 +94,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="8"/>
         <CursorPos X="3" Y="2"/>
-        <UsageCount Value="55"/>
+        <UsageCount Value="57"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
@@ -113,16 +113,14 @@
       <Unit13>
         <Filename Value="../units/lowlevelunit.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="451"/>
-        <CursorPos Y="466"/>
+        <TopLine Value="386"/>
+        <CursorPos X="27" Y="403"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
         <Filename Value="../units/matheunit.pas"/>
         <EditorIndex Value="4"/>
-        <TopLine Value="665"/>
-        <CursorPos X="39" Y="693"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
       </Unit14>
@@ -209,125 +207,117 @@
         <DefaultSyntaxHighlighter Value="XML"/>
       </Unit26>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5549" Column="30" TopLine="5521"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1553" Column="99" TopLine="1542"/>
       </Position1>
       <Position2>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5564" Column="32" TopLine="5536"/>
+        <Filename Value="werteunit.pas"/>
       </Position2>
       <Position3>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6765" Column="65" TopLine="6737"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="255" Column="34" TopLine="226"/>
       </Position3>
       <Position4>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6775" Column="65" TopLine="6747"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="265" Column="24" TopLine="236"/>
       </Position4>
       <Position5>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6802" Column="43" TopLine="6774"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1556" Column="59" TopLine="1528"/>
       </Position5>
       <Position6>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8645" Column="23" TopLine="8542"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="466" TopLine="451"/>
       </Position6>
       <Position7>
-        <Filename Value="epostunit.pas"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
       </Position7>
       <Position8>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="4742" Column="49" TopLine="4714"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="91" Column="27" TopLine="62"/>
       </Position8>
       <Position9>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5375" Column="50" TopLine="5346"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="92" Column="27" TopLine="63"/>
       </Position9>
       <Position10>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5549" Column="30" TopLine="5521"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1554" Column="121" TopLine="1537"/>
       </Position10>
       <Position11>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5564" Column="32" TopLine="5536"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1555" Column="104" TopLine="1538"/>
       </Position11>
       <Position12>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6765" Column="65" TopLine="6737"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="23" Column="31" TopLine="4"/>
       </Position12>
       <Position13>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6775" Column="65" TopLine="6747"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="151" Column="36" TopLine="137"/>
       </Position13>
       <Position14>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6802" Column="43" TopLine="6789"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1512" Column="43" TopLine="1512"/>
       </Position14>
       <Position15>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8645" Column="23" TopLine="8617"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="78" Column="43" TopLine="62"/>
       </Position15>
       <Position16>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8708" Column="10" TopLine="8667"/>
+        <Filename Value="werteunit.pas"/>
       </Position16>
       <Position17>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="80" Column="31" TopLine="62"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="78" Column="43" TopLine="50"/>
       </Position17>
       <Position18>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8677" Column="23" TopLine="8649"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1512" Column="48" TopLine="1484"/>
       </Position18>
       <Position19>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8984" Column="21" TopLine="8958"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2120" Column="40" TopLine="2105"/>
       </Position19>
       <Position20>
-        <Filename Value="epostunit.pas"/>
+        <Filename Value="werteunit.pas"/>
       </Position20>
       <Position21>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="80" Column="31" TopLine="51"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="78" Column="116" TopLine="50"/>
       </Position21>
       <Position22>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="8677" Column="23" TopLine="8667"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="1537" Column="32" TopLine="1520"/>
       </Position22>
       <Position23>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="94" Column="31" TopLine="77"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="2128" Column="10" TopLine="2095"/>
       </Position23>
       <Position24>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="469" Column="25" TopLine="434"/>
+        <Filename Value="werteunit.pas"/>
       </Position24>
       <Position25>
-        <Filename Value="../units/lowlevelunit.pas"/>
-        <Caret Line="466" Column="64" TopLine="442"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="78" Column="43" TopLine="50"/>
       </Position25>
       <Position26>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="30" Column="5" TopLine="12"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="7435" Column="79" TopLine="7378"/>
       </Position26>
       <Position27>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="8695" Column="86" TopLine="8667"/>
       </Position27>
       <Position28>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="1546" Column="9" TopLine="1522"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="201" Column="42" TopLine="173"/>
       </Position28>
       <Position29>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="1549" TopLine="1532"/>
+        <Filename Value="epostunit.pas"/>
+        <Caret Line="7288" Column="45" TopLine="7259"/>
       </Position29>
-      <Position30>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="192" Column="21" TopLine="177"/>
-      </Position30>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>
diff --git a/epostunit.pas b/epostunit.pas
index 127f2bc..fda8aa9 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -7340,12 +7340,12 @@ begin
       continue;
     end;
     if istDasBefehl('x-Skalierung:',s,bekannteBefehle,true) then begin
-      xFak:=kont2disk('x',exprToFloat(sT,s));
+      xFak:=kont2diskFak('x',exprToFloat(sT,s));
       continue;
     end;
     if istDasBefehl('y-Skalierung:',s,bekannteBefehle,true) or
       istDasBefehl('t-Skalierung:',s,bekannteBefehle,true) then begin
-      tFak:=kont2disk('t',exprToFloat(sT,s));
+      tFak:=kont2diskFak('t',exprToFloat(sT,s));
       continue;
     end;
     if istDasBefehl('toroidal',s,bekannteBefehle,false) then begin