summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-09-27 10:45:26 +0200
committerErich Eckner <git@eckner.net>2017-09-27 10:45:26 +0200
commit668ed643687a9dff8a5a99c2630e45c48ccdf960 (patch)
tree8af7c2ca249fd7d2904c7a3bda309c82eeadf07e
parentbeedc7da5a5bd083fdef1d784bdd06592432d0a5 (diff)
downloadepost-668ed643687a9dff8a5a99c2630e45c48ccdf960.tar.xz
epostunit.pas: sinnvollere Standardwerte für tStart und tStop für Andor-Inputdateien
-rw-r--r--epost.lps178
-rw-r--r--epostunit.pas4
2 files changed, 92 insertions, 90 deletions
diff --git a/epost.lps b/epost.lps
index ba837d9..5b30bdc 100644
--- a/epost.lps
+++ b/epost.lps
@@ -24,8 +24,8 @@
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="1766"/>
- <CursorPos X="108" Y="1797"/>
+ <TopLine Value="1679"/>
+ <CursorPos X="15" Y="1708"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit2>
@@ -49,8 +49,7 @@
<Filename Value="typenunit.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="11"/>
- <TopLine Value="809"/>
- <CursorPos X="24" Y="748"/>
+ <CursorPos X="7" Y="11"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit5>
@@ -81,270 +80,269 @@
<Loaded Value="True"/>
</Unit8>
<Unit9>
+ <Filename Value="werteunit.inc"/>
+ <IsPartOfProject Value="True"/>
+ <EditorIndex Value="9"/>
+ <TopLine Value="113"/>
+ <CursorPos Y="107"/>
+ <UsageCount Value="25"/>
+ <Loaded Value="True"/>
+ </Unit9>
+ <Unit10>
<Filename Value="../fpGUI/src/corelib/render/software/agg_scanline_storage_aa.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="1612"/>
<CursorPos X="2" Y="1675"/>
<UsageCount Value="3"/>
- </Unit9>
- <Unit10>
+ </Unit10>
+ <Unit11>
<Filename Value="../units/mystringlistunit.pas"/>
<EditorIndex Value="7"/>
<TopLine Value="488"/>
<CursorPos X="23" Y="442"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
- </Unit10>
- <Unit11>
+ </Unit11>
+ <Unit12>
<Filename Value="../units/lowlevelunit.pas"/>
<EditorIndex Value="6"/>
<TopLine Value="47"/>
<CursorPos X="63" Y="65"/>
<UsageCount Value="98"/>
<Loaded Value="True"/>
- </Unit11>
- <Unit12>
+ </Unit12>
+ <Unit13>
<Filename Value="../units/randomunit.pas"/>
<EditorIndex Value="-1"/>
<UsageCount Value="3"/>
- </Unit12>
- <Unit13>
+ </Unit13>
+ <Unit14>
<Filename Value="../units/matheunit.pas"/>
<EditorIndex Value="5"/>
<TopLine Value="769"/>
<CursorPos X="15" Y="801"/>
<UsageCount Value="72"/>
<Loaded Value="True"/>
- </Unit13>
- <Unit14>
+ </Unit14>
+ <Unit15>
<Filename Value="../units/systemunit.pas"/>
<EditorIndex Value="2"/>
<TopLine Value="126"/>
<CursorPos X="7" Y="147"/>
<UsageCount Value="27"/>
<Loaded Value="True"/>
- </Unit14>
- <Unit15>
+ </Unit15>
+ <Unit16>
<Filename Value="/usr/lib/fpc/src/rtl/inc/objpash.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="182"/>
<CursorPos X="21" Y="202"/>
<UsageCount Value="6"/>
- </Unit15>
- <Unit16>
+ </Unit16>
+ <Unit17>
<Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovlh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="61"/>
<CursorPos X="10" Y="99"/>
<UsageCount Value="4"/>
- </Unit16>
- <Unit17>
+ </Unit17>
+ <Unit18>
<Filename Value="/usr/lib/fpc/src/rtl/unix/baseunix.pp"/>
<UnitName Value="BaseUnix"/>
<EditorIndex Value="-1"/>
<TopLine Value="61"/>
<UsageCount Value="4"/>
- </Unit17>
- <Unit18>
+ </Unit18>
+ <Unit19>
<Filename Value="/usr/lib/fpc/src/rtl/unix/bunxovl.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="414"/>
<CursorPos X="20" Y="434"/>
<UsageCount Value="4"/>
- </Unit18>
- <Unit19>
+ </Unit19>
+ <Unit20>
<Filename Value="/usr/lib/fpc/src/rtl/linux/bunxsysc.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="16"/>
<UsageCount Value="4"/>
- </Unit19>
- <Unit20>
+ </Unit20>
+ <Unit21>
<Filename Value="/usr/lib/fpc/src/rtl/unix/bunxh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="74"/>
<CursorPos X="15" Y="102"/>
<UsageCount Value="4"/>
- </Unit20>
- <Unit21>
+ </Unit21>
+ <Unit22>
<Filename Value="/usr/lib/fpc/src/packages/fcl-image/src/fpimage.pp"/>
<UnitName Value="FPimage"/>
<EditorIndex Value="-1"/>
<TopLine Value="10"/>
<CursorPos X="3" Y="30"/>
<UsageCount Value="4"/>
- </Unit21>
- <Unit22>
+ </Unit22>
+ <Unit23>
<Filename Value="../fpGUI/src/corelib/render/software/agg_basics.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="327"/>
<CursorPos X="12" Y="347"/>
<UsageCount Value="7"/>
- </Unit22>
- <Unit23>
+ </Unit23>
+ <Unit24>
<Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="673"/>
<CursorPos X="42" Y="705"/>
<UsageCount Value="7"/>
- </Unit23>
- <Unit24>
+ </Unit24>
+ <Unit25>
<Filename Value="/usr/lib/fpc/src/rtl/objpas/math.pp"/>
<EditorIndex Value="-1"/>
<TopLine Value="166"/>
<CursorPos X="10" Y="183"/>
<UsageCount Value="5"/>
- </Unit24>
- <Unit25>
+ </Unit25>
+ <Unit26>
<Filename Value="GTIWebServerTestAggActionHandlerUnit.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="53"/>
<CursorPos X="49" Y="82"/>
<UsageCount Value="5"/>
- </Unit25>
- <Unit26>
+ </Unit26>
+ <Unit27>
<Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/sysstrh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="204"/>
<CursorPos X="18" Y="222"/>
<UsageCount Value="7"/>
- </Unit26>
- <Unit27>
+ </Unit27>
+ <Unit28>
<Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/osutilsh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="9"/>
<CursorPos X="10" Y="26"/>
<UsageCount Value="7"/>
- </Unit27>
- <Unit28>
- <Filename Value="werteunit.inc"/>
- <IsPartOfProject Value="True"/>
- <EditorIndex Value="9"/>
- <TopLine Value="113"/>
- <CursorPos Y="107"/>
- <UsageCount Value="25"/>
- <Loaded Value="True"/>
</Unit28>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="epostunit.pas"/>
- <Caret Line="1686" Column="42" TopLine="1658"/>
+ <Caret Line="1738" Column="45" TopLine="1710"/>
</Position1>
<Position2>
<Filename Value="epostunit.pas"/>
- <Caret Line="1688" Column="64" TopLine="1660"/>
+ <Caret Line="1739" Column="44" TopLine="1711"/>
</Position2>
<Position3>
<Filename Value="epostunit.pas"/>
- <Caret Line="1702" Column="42" TopLine="1674"/>
+ <Caret Line="1746" Column="45" TopLine="1718"/>
</Position3>
<Position4>
<Filename Value="epostunit.pas"/>
- <Caret Line="1703" Column="42" TopLine="1675"/>
+ <Caret Line="1747" Column="45" TopLine="1719"/>
</Position4>
<Position5>
<Filename Value="epostunit.pas"/>
- <Caret Line="1706" Column="54" TopLine="1678"/>
+ <Caret Line="1748" Column="44" TopLine="1720"/>
</Position5>
<Position6>
<Filename Value="epostunit.pas"/>
- <Caret Line="1709" Column="64" TopLine="1681"/>
+ <Caret Line="1750" Column="47" TopLine="1722"/>
</Position6>
<Position7>
<Filename Value="epostunit.pas"/>
- <Caret Line="1710" Column="64" TopLine="1682"/>
+ <Caret Line="1751" Column="47" TopLine="1723"/>
</Position7>
<Position8>
<Filename Value="epostunit.pas"/>
- <Caret Line="1711" Column="64" TopLine="1683"/>
+ <Caret Line="1752" Column="46" TopLine="1724"/>
</Position8>
<Position9>
<Filename Value="epostunit.pas"/>
- <Caret Line="1725" Column="42" TopLine="1697"/>
+ <Caret Line="1763" Column="42" TopLine="1735"/>
</Position9>
<Position10>
<Filename Value="epostunit.pas"/>
- <Caret Line="1726" Column="42" TopLine="1698"/>
+ <Caret Line="1764" Column="49" TopLine="1736"/>
</Position10>
<Position11>
<Filename Value="epostunit.pas"/>
- <Caret Line="1727" Column="42" TopLine="1699"/>
+ <Caret Line="1776" Column="28" TopLine="1766"/>
</Position11>
<Position12>
<Filename Value="epostunit.pas"/>
- <Caret Line="1728" Column="42" TopLine="1700"/>
+ <Caret Line="2412" TopLine="2395"/>
</Position12>
<Position13>
<Filename Value="epostunit.pas"/>
- <Caret Line="1729" Column="42" TopLine="1701"/>
+ <Caret Line="5481" TopLine="5464"/>
</Position13>
<Position14>
<Filename Value="epostunit.pas"/>
- <Caret Line="1730" Column="42" TopLine="1702"/>
+ <Caret Line="5533" Column="86" TopLine="5516"/>
</Position14>
<Position15>
<Filename Value="epostunit.pas"/>
- <Caret Line="1731" Column="42" TopLine="1703"/>
+ <Caret Line="1794" Column="34" TopLine="1773"/>
</Position15>
<Position16>
<Filename Value="epostunit.pas"/>
- <Caret Line="1732" Column="42" TopLine="1704"/>
+ <Caret Line="1255" Column="57" TopLine="1238"/>
</Position16>
<Position17>
<Filename Value="epostunit.pas"/>
- <Caret Line="1733" Column="42" TopLine="1705"/>
</Position17>
<Position18>
<Filename Value="epostunit.pas"/>
- <Caret Line="1734" Column="42" TopLine="1706"/>
+ <Caret Line="1255" Column="57" TopLine="1227"/>
</Position18>
<Position19>
<Filename Value="epostunit.pas"/>
- <Caret Line="1735" Column="42" TopLine="1707"/>
+ <Caret Line="1639" Column="42" TopLine="1632"/>
</Position19>
<Position20>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1736" Column="42" TopLine="1708"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="756" Column="41" TopLine="724"/>
</Position20>
<Position21>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1738" Column="45" TopLine="1710"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="31" Column="34" TopLine="13"/>
</Position21>
<Position22>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1739" Column="44" TopLine="1711"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="24" Column="28" TopLine="13"/>
</Position22>
<Position23>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1746" Column="45" TopLine="1718"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="31" Column="58" TopLine="13"/>
</Position23>
<Position24>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1747" Column="45" TopLine="1719"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="39" Column="63" TopLine="13"/>
</Position24>
<Position25>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1748" Column="44" TopLine="1720"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="40" Column="58" TopLine="13"/>
</Position25>
<Position26>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1750" Column="47" TopLine="1722"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="44" Column="62" TopLine="15"/>
</Position26>
<Position27>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1751" Column="47" TopLine="1723"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="45" Column="58" TopLine="16"/>
</Position27>
<Position28>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1752" Column="46" TopLine="1724"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="67" Column="58" TopLine="38"/>
</Position28>
<Position29>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1763" Column="42" TopLine="1735"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="91" Column="58" TopLine="62"/>
</Position29>
<Position30>
- <Filename Value="epostunit.pas"/>
- <Caret Line="1764" Column="49" TopLine="1736"/>
+ <Filename Value="typenunit.pas"/>
+ <Caret Line="529" Column="29" TopLine="536"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/epostunit.pas b/epostunit.pas
index c386e69..f36215b 100644
--- a/epostunit.pas
+++ b/epostunit.pas
@@ -1684,6 +1684,10 @@ begin
s:=trim(s);
(dateien[i] as tAndorInputDateiInfo).detektorGroesze['x']:=strToInt64(erstesArgument(s,' ',false));
(dateien[i] as tAndorInputDateiInfo).detektorGroesze['y']:=strToInt64(erstesArgument(s,' ',false));
+ if (dateien[i].tStart=-myInf) and (dateien[i].tStop=myInf) then begin
+ dateien[i].tStart:=0;
+ dateien[i].tStop:=(dateien[i] as tAndorInputDateiInfo).detektorGroesze['y']-1;
+ end;
try
readAnAndorString(f,(dateien[i] as tAndorInputDateiInfo).dateiName,strToInt64(s),true);
except