summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-09-26 09:59:03 +0200
committerErich Eckner <git@eckner.net>2019-09-26 09:59:03 +0200
commitf1b047d60a449c0b3131e2fc0269228281c824e4 (patch)
tree9935163a076e21d65ab906f067440b09d6a6f14b
parent22d3172d65744c0e9754fbe7751203f7ab0968f0 (diff)
downloadepost-f1b047d60a449c0b3131e2fc0269228281c824e4.tar.xz
typenunit.pas: tGroeszenVerdopplungsTransformation bekommt im Konstruktor nun den Vorgänger übergeben
-rw-r--r--epost.lps133
-rw-r--r--epostunit.pas7
-rw-r--r--typenunit.pas9
3 files changed, 74 insertions, 75 deletions
diff --git a/epost.lps b/epost.lps
index b8a78ee..78ec623 100644
--- a/epost.lps
+++ b/epost.lps
@@ -7,9 +7,8 @@
<Unit0>
<Filename Value="epost.lpr"/>
<IsPartOfProject Value="True"/>
- <IsVisibleTab Value="True"/>
<TopLine Value="198"/>
- <CursorPos Y="220"/>
+ <CursorPos X="43" Y="210"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit0>
@@ -23,9 +22,10 @@
<Unit2>
<Filename Value="epostunit.pas"/>
<IsPartOfProject Value="True"/>
+ <IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
- <TopLine Value="162"/>
- <CursorPos X="14" Y="178"/>
+ <TopLine Value="5296"/>
+ <CursorPos Y="5323"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit2>
@@ -42,8 +42,8 @@
<Filename Value="typenunit.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="9"/>
- <TopLine Value="3640"/>
- <CursorPos X="47" Y="3670"/>
+ <TopLine Value="2839"/>
+ <CursorPos X="28" Y="2857"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit4>
@@ -85,7 +85,7 @@
<EditorIndex Value="6"/>
<TopLine Value="86"/>
<CursorPos X="26" Y="115"/>
- <UsageCount Value="46"/>
+ <UsageCount Value="47"/>
<Loaded Value="True"/>
</Unit9>
<Unit10>
@@ -93,7 +93,7 @@
<IsPartOfProject Value="True"/>
<EditorIndex Value="7"/>
<CursorPos X="3" Y="2"/>
- <UsageCount Value="42"/>
+ <UsageCount Value="43"/>
<Loaded Value="True"/>
</Unit10>
<Unit11>
@@ -210,121 +210,124 @@
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
- <Filename Value="epostunit.pas"/>
- <Caret Line="8189" Column="18" TopLine="8171"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="286" Column="23" TopLine="257"/>
</Position1>
<Position2>
- <Filename Value="epostunit.pas"/>
- <Caret Line="8195" Column="59" TopLine="8177"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="327" Column="23" TopLine="298"/>
</Position2>
<Position3>
- <Filename Value="werteunit.pas"/>
- <Caret Line="66" Column="37" TopLine="49"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="406" Column="23" TopLine="379"/>
</Position3>
<Position4>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1279" Column="42" TopLine="1262"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="566" Column="24" TopLine="537"/>
</Position4>
<Position5>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1312" Column="52" TopLine="1284"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="669" Column="23" TopLine="640"/>
</Position5>
<Position6>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1317" TopLine="1309"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="719" Column="45" TopLine="690"/>
</Position6>
<Position7>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1292" Column="45" TopLine="1276"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="833" Column="45" TopLine="804"/>
</Position7>
<Position8>
- <Filename Value="epostunit.pas"/>
- <Caret Line="8177" Column="76" TopLine="8156"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="875" Column="41" TopLine="846"/>
</Position8>
<Position9>
- <Filename Value="epostunit.pas"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="931" Column="19" TopLine="902"/>
</Position9>
<Position10>
- <Filename Value="epostunit.pas"/>
- <Caret Line="183" Column="39" TopLine="155"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="994" Column="40" TopLine="965"/>
</Position10>
<Position11>
- <Filename Value="epostunit.pas"/>
- <Caret Line="5956" TopLine="5944"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1140" Column="43" TopLine="1111"/>
</Position11>
<Position12>
- <Filename Value="epostunit.pas"/>
- <Caret Line="196" Column="30" TopLine="180"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1346" Column="28" TopLine="1317"/>
</Position12>
<Position13>
- <Filename Value="epostunit.pas"/>
- <Caret Line="5956" Column="18" TopLine="5928"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1368" Column="32" TopLine="1339"/>
</Position13>
<Position14>
- <Filename Value="epostunit.pas"/>
- <Caret Line="7227" Column="20" TopLine="7210"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1370" Column="19" TopLine="1341"/>
</Position14>
<Position15>
- <Filename Value="epostunit.pas"/>
- <Caret Line="8175" Column="17" TopLine="8158"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1412" Column="33" TopLine="1383"/>
</Position15>
<Position16>
- <Filename Value="epostunit.pas"/>
- <Caret Line="8177" Column="26" TopLine="8158"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1414" Column="19" TopLine="1385"/>
</Position16>
<Position17>
- <Filename Value="epostunit.pas"/>
- <Caret Line="8189" Column="24" TopLine="8175"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1438" Column="39" TopLine="1409"/>
</Position17>
<Position18>
- <Filename Value="epostunit.pas"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1443" Column="39" TopLine="1414"/>
</Position18>
<Position19>
- <Filename Value="epostunit.pas"/>
- <Caret Line="317" Column="16" TopLine="288"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1445" Column="19" TopLine="1416"/>
</Position19>
<Position20>
- <Filename Value="epostunit.pas"/>
- <Caret Line="7208" Column="32" TopLine="7194"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1484" Column="33" TopLine="1455"/>
</Position20>
<Position21>
- <Filename Value="epostunit.pas"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1486" Column="19" TopLine="1457"/>
</Position21>
<Position22>
- <Filename Value="epostunit.pas"/>
- <Caret Line="196" Column="30" TopLine="168"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1537" Column="31" TopLine="1508"/>
</Position22>
<Position23>
- <Filename Value="epostunit.pas"/>
- <Caret Line="5948" Column="64" TopLine="5937"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1539" Column="19" TopLine="1510"/>
</Position23>
<Position24>
- <Filename Value="epostunit.pas"/>
- <Caret Line="156" Column="26" TopLine="139"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1544" Column="43" TopLine="1515"/>
</Position24>
<Position25>
- <Filename Value="epostunit.pas"/>
- <Caret Line="2661" Column="10" TopLine="2662"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1553" Column="35" TopLine="1524"/>
</Position25>
<Position26>
- <Filename Value="epostunit.pas"/>
- <Caret Line="10481" TopLine="10428"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1574" Column="31" TopLine="1545"/>
</Position26>
<Position27>
- <Filename Value="epost.lpr"/>
- <Caret Line="531" Column="57" TopLine="483"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1682" Column="33" TopLine="1653"/>
</Position27>
<Position28>
- <Filename Value="epost.lpr"/>
- <Caret Line="210" Column="30" TopLine="192"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="1789" Column="35" TopLine="1760"/>
</Position28>
<Position29>
- <Filename Value="epostunit.pas"/>
- <Caret Line="178" Column="29" TopLine="161"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="2345" TopLine="2312"/>
</Position29>
<Position30>
- <Filename Value="epost.lpr"/>
- <Caret Line="210" Column="30" TopLine="198"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="2857" Column="28" TopLine="2839"/>
</Position30>
</JumpHistory>
<RunParams>
diff --git a/epostunit.pas b/epostunit.pas
index 158d2e8..b406798 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -5320,7 +5320,6 @@ var
wo: array['x'..'y'] of boolean;
rtg: char;
s: string;
- transformation: tGroeszenVerdopplungsTransformation;
begin
result:=false;
@@ -5366,11 +5365,7 @@ begin
exit;
end;
- transformation:=tGroeszenVerdopplungsTransformation.create;
- transformation.fuegeVorgaengerHinzu(transformationen);
- transformation.horizontal:=wo['x'];
- transformation.vertikal:=wo['y'];
- transformationen:=transformation;
+ transformationen:=tGroeszenVerdopplungsTransformation.create(transformationen,wo['x'],wo['y']);
if wo['x'] then
_xSteps:=_xSteps*2;
if wo['y'] then
diff --git a/typenunit.pas b/typenunit.pas
index bc5843d..8fbe9d8 100644
--- a/typenunit.pas
+++ b/typenunit.pas
@@ -502,7 +502,7 @@ type
procedure wHorizontal(h: boolean);
procedure wVertikal(v: boolean);
public
- constructor create;
+ constructor create(vorg: tTransformation; hor,ver: boolean);
property horizontal: boolean
read _horizontal
write wHorizontal;
@@ -2851,11 +2851,12 @@ end;
// tGroeszenVerdopplungsTransformation *****************************************
-constructor tGroeszenVerdopplungsTransformation.create;
+constructor tGroeszenVerdopplungsTransformation.create(vorg: tTransformation; hor,ver: boolean);
begin
inherited create;
- _horizontal:=false;
- _vertikal:=false;
+ fuegeVorgaengerHinzu(vorg);
+ _horizontal:=hor;
+ _vertikal:=ver;
end;
procedure tGroeszenVerdopplungsTransformation.wHorizontal(h: boolean);