summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2016-01-07 12:59:44 +0100
committerErich Eckner <git@eckner.net>2016-01-07 12:59:44 +0100
commit50716e0e0c005bbaa47529dc856ddbbebfaeb28d (patch)
treee9cd4b23235bc952a3b7221183863a1e1211f69f
parent43403a82e041024c68f0980d86c4ecfde4f27696 (diff)
downloadepost-50716e0e0c005bbaa47529dc856ddbbebfaeb28d.tar.xz
beendeExterneBefehleWennFertig neu
-rw-r--r--epost.lpr3
-rw-r--r--epost.lps148
-rw-r--r--epostunit.pas17
3 files changed, 135 insertions, 33 deletions
diff --git a/epost.lpr b/epost.lpr
index 820cd96..b6fcd3f 100644
--- a/epost.lpr
+++ b/epost.lpr
@@ -69,6 +69,9 @@ begin
gibAus('Syntaxtest bestanden!',3);
inf.rewind;
while inf.metaReadln(s,false) do begin
+ for i:=0 to length(wertes)-1 do
+ wertes[i].beendeLeseThreadWennFertig;
+ beendeExterneBefehleWennFertig;
if s='streng warnen' then begin
Warnstufe:=wsStreng;
continue;
diff --git a/epost.lps b/epost.lps
index 8c52cdd..c44bcaf 100644
--- a/epost.lps
+++ b/epost.lps
@@ -9,6 +9,7 @@
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<CursorPos X="65" Y="13"/>
+ <FoldState Value=" T0iVV373231221151511111313[442[C42121[85]Y_"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit0>
@@ -23,7 +24,8 @@
<Filename Value="epostunit.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="1"/>
- <FoldState Value=" T3pA0D5 piejM078]9XjF0G7[94]IH411 T0knZ0{16"/>
+ <TopLine Value="5150"/>
+ <CursorPos X="15" Y="5126"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit2>
@@ -37,7 +39,7 @@
<Unit4>
<Filename Value="werteunit.pas"/>
<IsPartOfProject Value="True"/>
- <EditorIndex Value="2"/>
+ <EditorIndex Value="4"/>
<TopLine Value="25"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
@@ -45,8 +47,9 @@
<Unit5>
<Filename Value="typenunit.pas"/>
<IsPartOfProject Value="True"/>
- <EditorIndex Value="3"/>
- <TopLine Value="379"/>
+ <EditorIndex Value="5"/>
+ <TopLine Value="143"/>
+ <CursorPos X="5" Y="163"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit5>
@@ -55,26 +58,27 @@
<EditorIndex Value="-1"/>
<TopLine Value="1612"/>
<CursorPos X="2" Y="1675"/>
- <UsageCount Value="8"/>
+ <UsageCount Value="7"/>
</Unit6>
<Unit7>
<Filename Value="../units/mystringlistunit.pas"/>
<EditorIndex Value="-1"/>
- <TopLine Value="273"/>
- <CursorPos X="32" Y="291"/>
- <UsageCount Value="20"/>
+ <TopLine Value="344"/>
+ <CursorPos X="17" Y="344"/>
+ <UsageCount Value="19"/>
</Unit7>
<Unit8>
<Filename Value="../units/lowlevelunit.pas"/>
- <EditorIndex Value="-1"/>
- <TopLine Value="744"/>
- <CursorPos X="39" Y="836"/>
- <UsageCount Value="19"/>
+ <EditorIndex Value="3"/>
+ <TopLine Value="468"/>
+ <CursorPos X="21" Y="483"/>
+ <UsageCount Value="25"/>
+ <Loaded Value="True"/>
</Unit8>
<Unit9>
<Filename Value="../units/randomunit.pas"/>
<EditorIndex Value="-1"/>
- <UsageCount Value="8"/>
+ <UsageCount Value="7"/>
</Unit9>
<Unit10>
<Filename Value="../units/matheunit.pas"/>
@@ -82,54 +86,134 @@
<TopLine Value="544"/>
<CursorPos X="53" Y="567"/>
<FoldState Value=" T3q50{m012A"/>
- <UsageCount Value="20"/>
+ <UsageCount Value="19"/>
</Unit10>
<Unit11>
<Filename Value="../units/systemunit.pas"/>
- <EditorIndex Value="-1"/>
- <TopLine Value="115"/>
- <CursorPos Y="155"/>
+ <EditorIndex Value="2"/>
+ <TopLine Value="65"/>
+ <CursorPos X="26" Y="80"/>
<UsageCount Value="17"/>
+ <Loaded Value="True"/>
</Unit11>
<Unit12>
<Filename Value="../fpGUI/src/corelib/render/software/agg_2D.pas"/>
<EditorIndex Value="-1"/>
- <TopLine Value="1860"/>
- <CursorPos X="43" Y="1874"/>
+ <TopLine Value="807"/>
+ <CursorPos Y="818"/>
<UsageCount Value="10"/>
</Unit12>
</Units>
- <JumpHistory Count="8" HistoryIndex="7">
+ <JumpHistory Count="28" HistoryIndex="27">
<Position1>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1515" Column="27" TopLine="1458"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="963" TopLine="947"/>
</Position1>
<Position2>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1485" Column="69" TopLine="1470"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="163" Column="5" TopLine="143"/>
</Position2>
<Position3>
<Filename Value="epostunit.pas"/>
+ <Caret Line="5156" TopLine="5065"/>
</Position3>
<Position4>
- <Filename Value="werteunit.pas"/>
- <Caret Line="1113" TopLine="1078"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3707" TopLine="3687"/>
</Position4>
<Position5>
- <Filename Value="typenunit.pas"/>
- <Caret Line="960" Column="97" TopLine="942"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3699" TopLine="3678"/>
</Position5>
<Position6>
<Filename Value="epostunit.pas"/>
+ <Caret Line="5154" TopLine="5063"/>
</Position6>
<Position7>
- <Filename Value="epost.lpr"/>
- <Caret Line="46" Column="58" TopLine="34"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3946" Column="60" TopLine="3931"/>
</Position7>
<Position8>
- <Filename Value="epost.lpr"/>
- <Caret Line="50" Column="58" TopLine="37"/>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="295" Column="16" TopLine="275"/>
</Position8>
+ <Position9>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="348" Column="43" TopLine="315"/>
+ </Position9>
+ <Position10>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3701" Column="28" TopLine="3668"/>
+ </Position10>
+ <Position11>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3702" Column="40" TopLine="3669"/>
+ </Position11>
+ <Position12>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3703" Column="40" TopLine="3670"/>
+ </Position12>
+ <Position13>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3704" Column="42" TopLine="3671"/>
+ </Position13>
+ <Position14>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3705" Column="45" TopLine="3672"/>
+ </Position14>
+ <Position15>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3711" Column="26" TopLine="3676"/>
+ </Position15>
+ <Position16>
+ <Filename Value="epostunit.pas"/>
+ </Position16>
+ <Position17>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5173" Column="45" TopLine="5153"/>
+ </Position17>
+ <Position18>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="352" Column="22" TopLine="333"/>
+ </Position18>
+ <Position19>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="5175" Column="28" TopLine="5144"/>
+ </Position19>
+ <Position20>
+ <Filename Value="../units/systemunit.pas"/>
+ <Caret Line="13" Column="26"/>
+ </Position20>
+ <Position21>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="3701" Column="102" TopLine="3678"/>
+ </Position21>
+ <Position22>
+ <Filename Value="epostunit.pas"/>
+ </Position22>
+ <Position23>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="184" Column="22" TopLine="151"/>
+ </Position23>
+ <Position24>
+ <Filename Value="epostunit.pas"/>
+ </Position24>
+ <Position25>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="297" Column="24" TopLine="264"/>
+ </Position25>
+ <Position26>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="1004" Column="38" TopLine="999"/>
+ </Position26>
+ <Position27>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="1027" Column="19" TopLine="1017"/>
+ </Position27>
+ <Position28>
+ <Filename Value="epostunit.pas"/>
+ <Caret Line="1079" Column="78" TopLine="1057"/>
+ </Position28>
</JumpHistory>
</ProjectSession>
</CONFIG>
diff --git a/epostunit.pas b/epostunit.pas
index 8abd761..b0feb83 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -341,6 +341,7 @@ function findeWerte(s: String; f: tMyStringlist; pws: pTWerteArray; Kont: pTKont
function findeKontur(s: String; f: tMyStringlist; pks: pTKonturenArray; darfErstellen: boolean): integer;
function externerBefehl(st: boolean; s: string): boolean;
procedure warte_auf_externeBefehle;
+procedure beendeExterneBefehleWennFertig;
var Paletten: array of tPalette;
behalteLogs: boolean;
@@ -348,7 +349,7 @@ var Paletten: array of tPalette;
implementation
-uses math;
+uses math, systemunit;
// tWerte **********************************************************************
@@ -5882,6 +5883,20 @@ begin
setlength(externeBefehle,0);
end;
+procedure beendeExterneBefehleWennFertig;
+var
+ i,j: longint;
+begin
+ for i:=length(externeBefehle)-1 downto 0 do
+ if assigned(externeBefehle) then
+ if externeBefehle[i].fertig then begin
+ externeBefehle[i].free;
+ for j:=i+1 to length(externeBefehle)-1 do
+ externeBefehle[j-1]:=externeBefehle[j];
+ setlength(externeBefehle,length(externeBefehle)-1);
+ end;
+end;
+
begin
setlength(externeBefehle,0);