diff options
| -rw-r--r-- | epost.lps | 93 | ||||
| -rw-r--r-- | epostunit.pas | 36 | ||||
| -rw-r--r-- | typenunit.pas | 2 |
3 files changed, 70 insertions, 61 deletions
@@ -24,8 +24,8 @@ <IsPartOfProject Value="True"/> <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="1876"/> - <CursorPos X="44" Y="1881"/> + <TopLine Value="5515"/> + <CursorPos X="56" Y="5536"/> <UsageCount Value="201"/> <Loaded Value="True"/> </Unit2> @@ -42,8 +42,8 @@ <Filename Value="typenunit.pas"/> <IsPartOfProject Value="True"/> <EditorIndex Value="12"/> - <TopLine Value="905"/> - <CursorPos X="12" Y="936"/> + <TopLine Value="2038"/> + <CursorPos X="48" Y="2065"/> <UsageCount Value="200"/> <Loaded Value="True"/> </Unit4> @@ -194,124 +194,123 @@ </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> - <Filename Value="typenunit.pas"/> - <Caret Line="296" Column="30" TopLine="278"/> + <Filename Value="epostunit.pas"/> + <Caret Line="65" Column="8" TopLine="53"/> </Position1> <Position2> - <Filename Value="typenunit.pas"/> - <Caret Line="297" Column="30" TopLine="278"/> + <Filename Value="epostunit.pas"/> + <Caret Line="53" Column="10" TopLine="35"/> </Position2> <Position3> - <Filename Value="typenunit.pas"/> - <Caret Line="1624" Column="42" TopLine="1616"/> + <Filename Value="epostunit.pas"/> + <Caret Line="54" Column="36" TopLine="35"/> </Position3> <Position4> - <Filename Value="typenunit.pas"/> - <Caret Line="1626" Column="18" TopLine="1616"/> + <Filename Value="epostunit.pas"/> + <Caret Line="65" Column="10" TopLine="51"/> </Position4> <Position5> - <Filename Value="typenunit.pas"/> - <Caret Line="1627" Column="18" TopLine="1616"/> + <Filename Value="epostunit.pas"/> + <Caret Line="225" Column="29" TopLine="214"/> </Position5> <Position6> - <Filename Value="typenunit.pas"/> - <Caret Line="1630" Column="42" TopLine="1616"/> + <Filename Value="epostunit.pas"/> + <Caret Line="227" Column="68" TopLine="214"/> </Position6> <Position7> - <Filename Value="typenunit.pas"/> - <Caret Line="1976" Column="71" TopLine="1945"/> + <Filename Value="epostunit.pas"/> + <Caret Line="356" Column="27" TopLine="327"/> </Position7> <Position8> <Filename Value="epostunit.pas"/> - <Caret Line="5575" Column="22" TopLine="5564"/> + <Caret Line="358" Column="34" TopLine="329"/> </Position8> <Position9> <Filename Value="epostunit.pas"/> - <Caret Line="5934" Column="43" TopLine="5923"/> + <Caret Line="6528" Column="26" TopLine="6499"/> </Position9> <Position10> <Filename Value="epostunit.pas"/> - <Caret Line="1444" Column="22" TopLine="1427"/> + <Caret Line="222" Column="22" TopLine="204"/> </Position10> <Position11> <Filename Value="epostunit.pas"/> - <Caret Line="2277" TopLine="2261"/> </Position11> <Position12> <Filename Value="epostunit.pas"/> - <Caret Line="97" Column="43" TopLine="79"/> + <Caret Line="222" Column="22" TopLine="193"/> </Position12> <Position13> <Filename Value="epostunit.pas"/> - <Caret Line="1465" Column="43" TopLine="1506"/> + <Caret Line="227" Column="53" TopLine="198"/> </Position13> <Position14> <Filename Value="epostunit.pas"/> - <Caret Line="1147" Column="57" TopLine="1136"/> + <Caret Line="5331" Column="70" TopLine="5302"/> </Position14> <Position15> <Filename Value="epostunit.pas"/> - <Caret Line="1375" Column="76" TopLine="1355"/> + <Caret Line="5332" Column="61" TopLine="5303"/> </Position15> <Position16> <Filename Value="epostunit.pas"/> - <Caret Line="95" Column="30" TopLine="77"/> + <Caret Line="5385" Column="36" TopLine="5357"/> </Position16> <Position17> <Filename Value="epostunit.pas"/> - <Caret Line="1101" Column="33" TopLine="1066"/> + <Caret Line="5529" Column="59" TopLine="5511"/> </Position17> <Position18> <Filename Value="epostunit.pas"/> - <Caret Line="1316" Column="30" TopLine="1288"/> + <Caret Line="7402" TopLine="7385"/> </Position18> <Position19> <Filename Value="epostunit.pas"/> - <Caret Line="1329" Column="30" TopLine="1301"/> + <Caret Line="7554" TopLine="7536"/> </Position19> <Position20> - <Filename Value="epostunit.pas"/> - <Caret Line="1342" Column="30" TopLine="1314"/> + <Filename Value="typenunit.pas"/> + <Caret Line="936" Column="12" TopLine="905"/> </Position20> <Position21> <Filename Value="epostunit.pas"/> - <Caret Line="1382" Column="31" TopLine="1365"/> + <Caret Line="2145" TopLine="2127"/> </Position21> <Position22> <Filename Value="epostunit.pas"/> - <Caret Line="2276" Column="8" TopLine="2261"/> + <Caret Line="7402" TopLine="7384"/> </Position22> <Position23> <Filename Value="epostunit.pas"/> - <Caret Line="97" Column="43" TopLine="79"/> + <Caret Line="7551" Column="7" TopLine="7537"/> </Position23> <Position24> <Filename Value="epostunit.pas"/> - <Caret Line="1881" Column="63" TopLine="1864"/> + <Caret Line="5484" Column="40" TopLine="5473"/> </Position24> <Position25> - <Filename Value="typenunit.pas"/> - <Caret Line="94" Column="31" TopLine="77"/> + <Filename Value="epostunit.pas"/> + <Caret Line="222" Column="22" TopLine="204"/> </Position25> <Position26> <Filename Value="epostunit.pas"/> - <Caret Line="1899" Column="19" TopLine="1873"/> + <Caret Line="227" Column="53" TopLine="204"/> </Position26> <Position27> - <Filename Value="../units/lowlevelunit.pas"/> - <Caret Line="149" Column="20" TopLine="132"/> + <Filename Value="epostunit.pas"/> + <Caret Line="5331" Column="61" TopLine="5303"/> </Position27> <Position28> - <Filename Value="typenunit.pas"/> - <Caret Line="937" Column="21" TopLine="908"/> + <Filename Value="epostunit.pas"/> + <Caret Line="5332" Column="15" TopLine="5303"/> </Position28> <Position29> - <Filename Value="typenunit.pas"/> - <Caret Line="933" Column="31" TopLine="915"/> + <Filename Value="epostunit.pas"/> + <Caret Line="5359" Column="15" TopLine="5331"/> </Position29> <Position30> - <Filename Value="typenunit.pas"/> - <Caret Line="95" Column="32" TopLine="76"/> + <Filename Value="epostunit.pas"/> + <Caret Line="5385" Column="15" TopLine="5378"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/epostunit.pas b/epostunit.pas index 17331f0..f440c8b 100644 --- a/epostunit.pas +++ b/epostunit.pas @@ -5522,17 +5522,18 @@ begin gibAus('Unerwartetes Dateiende in '''+paramstr(1)+'''!',3); exit; end; - if s='Ende' then + bekannteBefehle.clear; + if istDasBefehl('Ende',s,bekannteBefehle,false) then break; - if startetMit('Dicke:',s) then begin + if istDasBefehl('Dicke:',s,bekannteBefehle,true) then begin musterKontur.dicke:=exprToFloat(sT,s); continue; end; - if startetMit('Deckkraft:',s) then begin + if istDasBefehl('Deckkraft:',s,bekannteBefehle,true) then begin musterKontur.deckKraft:=exprToFloat(sT,s); continue; end; - if startetMit('Farbe:',s) then begin + if istDasBefehl('Farbe:',s,bekannteBefehle,true) then begin if strToTRGB(s,musterKontur.farbe) then continue; gibAus(''''+s+''' ist keine gültige Farbe!',3); exit; @@ -5541,7 +5542,8 @@ begin setLength(verwKonturen,length(verwKonturen)+1); i:=findeKontur(erstesArgument(s),nil,wertes,konturen,false); if (i<0) or (i>=length(konturen^)) then begin - gibAus('Die Kontur '''+s+''' gibt es nicht!',3); + bekannteBefehle.sort; + gibAus('Die Kontur '''+s+''' gibt es nicht!'#10+bekannteBefehle.text,3); aufraeumen; exit; end; @@ -7546,14 +7548,22 @@ begin i:=findeWerte(erstesArgument(s),nil,w,nil,false); if i<0 then exit; schwelle:=w^[i].exprToFloat(false,s); - if _xmin='' then xMi:=1 - else xMi:=max(1,w^[i].kont2disk('x',w^[i].exprToFloat(sT,_xmin))); - if _xmax='' then xMa:=w^[i]._xSteps-1 - else xMa:=max(1,w^[i].kont2disk('x',w^[i].exprToFloat(sT,_xmax))); - if _tmin='' then tMi:=1 - else tMi:=max(1,w^[i].kont2disk('t',w^[i].exprToFloat(sT,_tmin))); - if _tmax='' then tMa:=w^[i]._tSiz-1 - else tMa:=max(1,w^[i].kont2disk('x',w^[i].exprToFloat(sT,_tmax))); + if _xmin='' then + xMi:=1 + else + xMi:=max(1,w^[i].kont2disk('x',w^[i].exprToFloat(sT,_xmin))); + if _xmax='' then + xMa:=w^[i]._xSteps-1 + else + xMa:=max(1,w^[i].kont2disk('x',w^[i].exprToFloat(sT,_xmax))); + if _tmin='' then + tMi:=1 + else + tMi:=max(1,w^[i].kont2disk('t',w^[i].exprToFloat(sT,_tmin))); + if _tmax='' then + tMa:=w^[i]._tSiz-1 + else + tMa:=max(1,w^[i].kont2disk('x',w^[i].exprToFloat(sT,_tmax))); if sT then begin result:=true; exit; diff --git a/typenunit.pas b/typenunit.pas index 304a98f..428d0bd 100644 --- a/typenunit.pas +++ b/typenunit.pas @@ -2062,7 +2062,7 @@ begin p:=transformiereKoordinatenEinzeln(p,auszerhalbIstFehler); // und in Anteile zurückzurechnen - result:=p[c]/(outXSTS[c]-1); + result:=p[c]/(outXSTS[c]-1+byte(outXSTS[c]=1)); if auszerhalbIstFehler then testeAuszerhalb(false,true,l,result); end; |