diff options
| -rw-r--r-- | epost.lps | 126 | ||||
| -rw-r--r-- | epostunit.pas | 1 | ||||
| -rw-r--r-- | typenunit.pas | 17 | ||||
| -rw-r--r-- | werteunit.pas | 6 |
4 files changed, 86 insertions, 64 deletions
@@ -22,10 +22,9 @@ <Unit2> <Filename Value="epostunit.pas"/> <IsPartOfProject Value="True"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="1970"/> - <CursorPos X="30" Y="2000"/> + <TopLine Value="1355"/> + <CursorPos X="60" Y="1370"/> <UsageCount Value="201"/> <Loaded Value="True"/> </Unit2> @@ -33,19 +32,20 @@ <Filename Value="werteunit.pas"/> <IsPartOfProject Value="True"/> <EditorIndex Value="9"/> - <TopLine Value="1967"/> - <CursorPos X="112" Y="1994"/> - <FoldState Value=" T3k80{D4L2/"/> + <TopLine Value="629"/> + <CursorPos Y="646"/> + <FoldState Value=" T3k80{D4L1Y"/> <UsageCount Value="200"/> <Loaded Value="True"/> </Unit3> <Unit4> <Filename Value="typenunit.pas"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="12"/> - <TopLine Value="54"/> - <CursorPos X="43" Y="84"/> - <FoldState Value=" T3vQ0IE piak403A16[B4mD0C9[94jP09[T4djb068]9XjK06B[95O08]akOlD06[s4ZjC06F[95U0AC[95S0JA pj6k40WC[{K5G0I9]I1k00p3]9AkQ0V]IiXk2058 pibjJ0B7]R0jR0A[R4YjP]9[{05O0Q8[95c0AG pkDlM042]j5jF0K2U"/> + <TopLine Value="852"/> + <CursorPos X="58" Y="877"/> + <FoldState Value=" T3vV0IE piak403A16]BcmH0C9[K4jP09F pj0k0068]IXjK06B[95O08]akOlD06[s4ZjC06F[95U0AC[95S0JA]+6k40WC[{K5G0I9]I1k00p3]9AkQ0V]IiXk2058 pibjJ0B7]R0jR0A[R4YjP]9[{05O0Q8[95c0AG pkDlM042]j5jF0K2="/> <UsageCount Value="200"/> <Loaded Value="True"/> </Unit4> @@ -81,7 +81,7 @@ <EditorIndex Value="10"/> <TopLine Value="142"/> <CursorPos X="17" Y="170"/> - <UsageCount Value="155"/> + <UsageCount Value="156"/> <Loaded Value="True"/> </Unit8> <Unit9> @@ -196,121 +196,123 @@ </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> - <Filename Value="epostunit.pas"/> - <Caret Line="1934" Column="44" TopLine="1906"/> + <Filename Value="typenunit.pas"/> + <Caret Line="100" Column="55" TopLine="82"/> </Position1> <Position2> - <Filename Value="epostunit.pas"/> - <Caret Line="1941" Column="45" TopLine="1913"/> + <Filename Value="typenunit.pas"/> + <Caret Line="29" Column="28" TopLine="11"/> </Position2> <Position3> - <Filename Value="epostunit.pas"/> - <Caret Line="1942" Column="45" TopLine="1914"/> + <Filename Value="typenunit.pas"/> + <Caret Line="36" Column="58" TopLine="11"/> </Position3> <Position4> - <Filename Value="epostunit.pas"/> - <Caret Line="1943" Column="44" TopLine="1915"/> + <Filename Value="typenunit.pas"/> + <Caret Line="44" Column="63" TopLine="15"/> </Position4> <Position5> - <Filename Value="epostunit.pas"/> - <Caret Line="1945" Column="47" TopLine="1917"/> + <Filename Value="typenunit.pas"/> + <Caret Line="45" Column="58" TopLine="16"/> </Position5> <Position6> - <Filename Value="epostunit.pas"/> - <Caret Line="1946" Column="47" TopLine="1918"/> + <Filename Value="typenunit.pas"/> + <Caret Line="49" Column="62" TopLine="20"/> </Position6> <Position7> - <Filename Value="epostunit.pas"/> - <Caret Line="1947" Column="46" TopLine="1919"/> + <Filename Value="typenunit.pas"/> + <Caret Line="50" Column="58" TopLine="21"/> </Position7> <Position8> - <Filename Value="epostunit.pas"/> - <Caret Line="1948" Column="42" TopLine="1929"/> + <Filename Value="typenunit.pas"/> + <Caret Line="54" Column="58" TopLine="25"/> </Position8> <Position9> - <Filename Value="epostunit.pas"/> - <Caret Line="1959" Column="42" TopLine="1940"/> + <Filename Value="typenunit.pas"/> + <Caret Line="56" Column="58" TopLine="27"/> </Position9> <Position10> - <Filename Value="epostunit.pas"/> - <Caret Line="1960" Column="49" TopLine="1940"/> + <Filename Value="typenunit.pas"/> + <Caret Line="60" Column="59" TopLine="31"/> </Position10> <Position11> - <Filename Value="epostunit.pas"/> - <Caret Line="1990" Column="40" TopLine="1962"/> + <Filename Value="typenunit.pas"/> + <Caret Line="129" Column="47" TopLine="128"/> </Position11> <Position12> - <Filename Value="epostunit.pas"/> - <Caret Line="2000" Column="40" TopLine="1993"/> + <Filename Value="typenunit.pas"/> + <Caret Line="128" Column="26" TopLine="112"/> </Position12> <Position13> - <Filename Value="epostunit.pas"/> + <Filename Value="typenunit.pas"/> + <Caret Line="178" Column="24" TopLine="150"/> </Position13> <Position14> - <Filename Value="epostunit.pas"/> - <Caret Line="1372" Column="57" TopLine="1344"/> + <Filename Value="typenunit.pas"/> + <Caret Line="1167" Column="35" TopLine="1097"/> </Position14> <Position15> - <Filename Value="epostunit.pas"/> - <Caret Line="1756" Column="42" TopLine="1728"/> + <Filename Value="typenunit.pas"/> + <Caret Line="1162" Column="15" TopLine="1031"/> </Position15> <Position16> - <Filename Value="epostunit.pas"/> - <Caret Line="1779" Column="44" TopLine="1751"/> + <Filename Value="typenunit.pas"/> + <Caret Line="110" Column="34" TopLine="93"/> </Position16> <Position17> - <Filename Value="epostunit.pas"/> - <Caret Line="1788" Column="44" TopLine="1760"/> + <Filename Value="typenunit.pas"/> + <Caret Line="1161" TopLine="1139"/> </Position17> <Position18> - <Filename Value="epostunit.pas"/> - <Caret Line="1674" Column="44" TopLine="1665"/> + <Filename Value="typenunit.pas"/> + <Caret Line="1154" Column="14" TopLine="1062"/> </Position18> <Position19> - <Filename Value="epostunit.pas"/> + <Filename Value="typenunit.pas"/> </Position19> <Position20> - <Filename Value="epostunit.pas"/> - <Caret Line="1372" Column="57" TopLine="1344"/> + <Filename Value="typenunit.pas"/> + <Caret Line="110" Column="16" TopLine="81"/> </Position20> <Position21> - <Filename Value="epostunit.pas"/> - <Caret Line="1870" Column="25" TopLine="1866"/> + <Filename Value="typenunit.pas"/> + <Caret Line="176" Column="23" TopLine="148"/> </Position21> <Position22> - <Filename Value="epostunit.pas"/> - <Caret Line="1871" Column="11" TopLine="1864"/> + <Filename Value="typenunit.pas"/> + <Caret Line="996" Column="3" TopLine="961"/> </Position22> <Position23> - <Filename Value="epostunit.pas"/> - <Caret Line="1974" Column="7" TopLine="1947"/> + <Filename Value="typenunit.pas"/> + <Caret Line="1011" Column="3" TopLine="961"/> </Position23> <Position24> <Filename Value="typenunit.pas"/> - <Caret Line="78" Column="19" TopLine="64"/> + <Caret Line="1171" Column="5" TopLine="1034"/> </Position24> <Position25> <Filename Value="typenunit.pas"/> - <Caret Line="135" Column="44" TopLine="107"/> + <Caret Line="129" Column="25" TopLine="121"/> </Position25> <Position26> - <Filename Value="epostunit.pas"/> - <Caret Line="1983" Column="35" TopLine="1962"/> + <Filename Value="typenunit.pas"/> + <Caret Line="189" Column="23" TopLine="161"/> </Position26> <Position27> <Filename Value="epostunit.pas"/> - <Caret Line="1985" TopLine="1952"/> + <Caret Line="1370" Column="60" TopLine="1355"/> </Position27> <Position28> - <Filename Value="epostunit.pas"/> - <Caret Line="1991" Column="64" TopLine="1969"/> + <Filename Value="typenunit.pas"/> + <Caret Line="190" Column="14" TopLine="175"/> </Position28> <Position29> <Filename Value="typenunit.pas"/> - <Caret Line="863" Column="22" TopLine="859"/> + <Caret Line="130" Column="30" TopLine="113"/> </Position29> <Position30> <Filename Value="typenunit.pas"/> + <Caret Line="192" Column="28" TopLine="164"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/epostunit.pas b/epostunit.pas index cd8c07e..660a6de 100644 --- a/epostunit.pas +++ b/epostunit.pas @@ -1367,6 +1367,7 @@ begin continue; end; if istDasBefehl('Andor-Datei:',s,bekannteBefehle,true) then begin + vorlagen.istHintergrund:=startetMit('Hintergrund',s); if fileExists(s) then begin setLength(dateien,length(dateien)+1); dateien[length(dateien)-1]:=tAndorInputDateiInfo.create(vorlagen.andorVorlage); diff --git a/typenunit.pas b/typenunit.pas index c17199d..8c04e7a 100644 --- a/typenunit.pas +++ b/typenunit.pas @@ -89,7 +89,7 @@ type bildBereich,rahmenBereich: t2x2Longint; shutterZeit: tExtPoint; xAchse: array[0..2] of extended; - hatHintergrund: boolean; + hatHintergrund,istHintergrund: boolean; constructor create(vorlage: tGenerischeInputDateiInfo); overload; constructor create; overload; destructor destroy; override; @@ -108,6 +108,7 @@ type _bytesPerSample,_feldNummer: longint; _analysator: string; _Kodierung: tKodierung; + _istHintergrung: boolean; _params: tExtraInfos; procedure wFehlerbehebungskommando(f: string); procedure wName(n: string); @@ -126,6 +127,7 @@ type procedure wAnalysator(a: string); procedure wBytesPerSample(b: longint); procedure wKodierung(k: tKodierung); + procedure wIstHintergrund(ih: boolean); procedure wParams(p: tExtraInfos); public phaseSpaceVorlage: tPhaseSpaceInputDateiInfo; @@ -185,6 +187,9 @@ type property Kodierung: tKodierung read _Kodierung write wKodierung; + property istHintergrund: boolean + read _istHintergrung + write wIstHintergrund; property params: tExtraInfos read _params write wParams; @@ -869,6 +874,7 @@ begin bildBereich:=(vorlage as tAndorInputDateiInfo).bildBereich; rahmenBereich:=(vorlage as tAndorInputDateiInfo).rahmenBereich; hatHintergrund:=(vorlage as tAndorInputDateiInfo).hatHintergrund; + istHintergrund:=(vorlage as tAndorInputDateiInfo).istHintergrund; end else begin temperatur:=0; @@ -891,6 +897,7 @@ begin bildBereich:=_2x2Longint(0,0,0,0); rahmenBereich:=_2x2Longint(0,0,0,0); hatHintergrund:=false; + istHintergrund:=false; end; end; @@ -917,6 +924,7 @@ begin bildBereich:=_2x2Longint(0,0,0,0); rahmenBereich:=_2x2Longint(0,0,0,0); hatHintergrund:=false; + istHintergrund:=false; end; destructor tAndorInputDateiInfo.destroy; @@ -985,6 +993,7 @@ begin _xStart:=spaceTimeVorlage.xStart; _xStop:=spaceTimeVorlage.xStop; _t0abs:=spaceTimeVorlage.t0Abs; + _istHintergrung:=andorVorlage.istHintergrund; end; destructor tInputDateiInfoVorlagen.destroy; @@ -1162,6 +1171,12 @@ begin pipeVorlage.Kodierung:=k; end; +procedure tInputDateiInfoVorlagen.wIstHintergrund(ih: boolean); +begin + _istHintergrung:=ih; + andorVorlage.istHintergrund:=ih; +end; + function tInputDateiInfoVorlagen.genauigkeitFromStr(s: string): boolean; begin result:=strToGen(_genauigkeit,s); diff --git a/werteunit.pas b/werteunit.pas index e7b8f67..6d82c07 100644 --- a/werteunit.pas +++ b/werteunit.pas @@ -643,7 +643,11 @@ begin assign(f,dateien[i].name); reset(f,1); - seek(f,(dateien[i] as tAndorInputDateiInfo).datenStart); + writeln((dateien[i] as tAndorInputDateiInfo).hintergrundStart,' ',(dateien[i] as tAndorInputDateiInfo).datenStart,' ',(dateien[i] as tAndorInputDateiInfo).istHintergrund); + if (dateien[i] as tAndorInputDateiInfo).istHintergrund then + seek(f,(dateien[i] as tAndorInputDateiInfo).hintergrundStart) + else + seek(f,(dateien[i] as tAndorInputDateiInfo).datenStart); tmpI:=wertGroesze(dateien[i].genauigkeit); if tmpI = sizeOf(wGen) then blockread(f,werte[0],dateien[i].xSteps*dateien[i].tSiz*tmpI) |