neue Pegelwarnstufe in Rothenstein "Radweg unter Wasser"

4 files changed, 79 insertions, 84 deletions

diff --git a/pegelunit.pas b/pegelunit.pas
index 77fb546..c2e4066 100644
--- a/pegelunit.pas
+++ b/pegelunit.pas
@@ -107,10 +107,10 @@ const
     ('Freienorla','',''));
   pegelStationsNummern: array[tPegelstation] of extended =
     (57021,57025,57026,57027,57028,57033,57170,57200,57201,57211,57211.5,57240);
-  pegelGrenzen: array[tPegelstation,0..3] of longint =
-    ((210,230,270,310),(195,210,225,240),(200,230,260,290),(150,180,210,240),
-    (250,290,330,370),(280,330,380,430),(180,200,220,240),(0,0,0,0),
-    (130,170,210,230),(200,230,260,290),(130,150,170,190),(0,0,0,0));
+  pegelGrenzen: array[tPegelstation,0..4] of longint =
+    ((0,210,230,270,310),(0,195,210,225,240),(0,200,230,260,290),(0,150,180,210,240),
+    (160,250,290,330,370),(0,280,330,380,430),(0,180,200,220,240),(0,0,0,0,0),
+    (0,130,170,210,230),(0,200,230,260,290),(0,130,150,170,190),(0,0,0,0,0));
   pegelFarben: array[tPegelstation] of tColor =
     ($000000,$000000,$000000,$FF0000,$7F0000,$000000,$000000,$000000,$000000,$000000,$000000,$000000);
 
@@ -629,7 +629,7 @@ begin
   for pS:=low(pS) to high(pS) do
     if pS in zuZeichnen then begin
       miMa:=werte[pS].minMaxY(startZeit,stopZeit);
-      for i:=0 to 3 do
+      for i:=0 to length(pegelGrenzen[pS])-1 do
         if (pegelGrenzen[pS,i]>=miMa.x) and (pegelGrenzen[pS,i]<=miMa.y) then begin
           bild.canvas.pen.color:=pegelFarben[pS];
           bild.canvas.moveTo(-10,wertZuY(pegelGrenzen[pS,i],miMa,bild.height));
diff --git a/unit1.lfm b/unit1.lfm
index efb3921..4240a0b 100644
--- a/unit1.lfm
+++ b/unit1.lfm
@@ -12,7 +12,7 @@ object Form1: TForm1
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
   OnShow = FormShow
-  LCLVersion = '1.4.4.0'
+  LCLVersion = '1.8.0.6'
   object Image1: TImage
     Left = 0
     Height = 208
diff --git a/wetter.lps b/wetter.lps
index 2fafbe5..41facc2 100644
--- a/wetter.lps
+++ b/wetter.lps
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectSession>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <BuildModes Active="Default"/>
     <Units Count="17">
       <Unit0>
@@ -9,7 +9,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="12" Y="6"/>
-        <UsageCount Value="59"/>
+        <UsageCount Value="60"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -18,9 +18,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <TopLine Value="280"/>
-        <CursorPos X="26" Y="201"/>
-        <UsageCount Value="59"/>
+        <TopLine Value="111"/>
+        <CursorPos Y="136"/>
+        <UsageCount Value="60"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -28,15 +28,15 @@
         <Filename Value="original/pegelunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
-        <UsageCount Value="59"/>
+        <UsageCount Value="60"/>
       </Unit2>
       <Unit3>
         <Filename Value="fhunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="3"/>
-        <TopLine Value="573"/>
-        <CursorPos X="18" Y="600"/>
-        <UsageCount Value="59"/>
+        <TopLine Value="504"/>
+        <CursorPos X="30" Y="540"/>
+        <UsageCount Value="60"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
@@ -45,7 +45,7 @@
         <EditorIndex Value="4"/>
         <TopLine Value="108"/>
         <CursorPos X="62" Y="128"/>
-        <UsageCount Value="28"/>
+        <UsageCount Value="29"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -59,9 +59,9 @@
         <Filename Value="pegelunit.pas"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="5"/>
-        <TopLine Value="478"/>
-        <CursorPos X="64" Y="508"/>
-        <UsageCount Value="28"/>
+        <TopLine Value="600"/>
+        <CursorPos X="64" Y="636"/>
+        <UsageCount Value="29"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
@@ -75,7 +75,7 @@
         <Filename Value="wetter.konf"/>
         <EditorIndex Value="2"/>
         <CursorPos X="35" Y="3"/>
-        <UsageCount Value="28"/>
+        <UsageCount Value="29"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit8>
@@ -133,132 +133,127 @@
       <Unit16>
         <Filename Value="../units/gitupdateunit.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="48"/>
-        <CursorPos X="17" Y="49"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="44"/>
+        <CursorPos X="17" Y="43"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit16>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="72" Column="70" TopLine="62"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="89" Column="22" TopLine="67"/>
       </Position1>
       <Position2>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="301" Column="19" TopLine="276"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="387" Column="33" TopLine="351"/>
       </Position2>
       <Position3>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="35"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="479" Column="50" TopLine="460"/>
       </Position3>
       <Position4>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="308" Column="19" TopLine="273"/>
+        <Filename Value="pegelunit.pas"/>
       </Position4>
       <Position5>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="305" Column="36" TopLine="272"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="81" Column="23" TopLine="45"/>
       </Position5>
       <Position6>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="608" Column="15" TopLine="576"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="359" Column="21" TopLine="323"/>
       </Position6>
       <Position7>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="30" Column="40" TopLine="3"/>
+        <Filename Value="unit1.pas"/>
       </Position7>
       <Position8>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="101" Column="42" TopLine="78"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="19" Column="42"/>
       </Position8>
       <Position9>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="25" Column="42" TopLine="18"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="33" Column="10"/>
       </Position9>
       <Position10>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="134" TopLine="96"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="96" Column="8" TopLine="82"/>
       </Position10>
       <Position11>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="46" Column="29" TopLine="21"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="119" Column="18" TopLine="102"/>
       </Position11>
       <Position12>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="84" Column="23" TopLine="53"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="136" TopLine="111"/>
       </Position12>
       <Position13>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="141" Column="7" TopLine="106"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="82" Column="20" TopLine="61"/>
       </Position13>
       <Position14>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="27" TopLine="20"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="583" Column="68" TopLine="544"/>
       </Position14>
       <Position15>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="133" Column="13" TopLine="110"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="54" Column="15" TopLine="32"/>
       </Position15>
       <Position16>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="31" TopLine="9"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="35" Column="19" TopLine="26"/>
       </Position16>
       <Position17>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="216" Column="11" TopLine="177"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="54" Column="19" TopLine="25"/>
       </Position17>
       <Position18>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="153" TopLine="147"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="136" TopLine="111"/>
       </Position18>
       <Position19>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="168" Column="18" TopLine="135"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="82" Column="20" TopLine="61"/>
       </Position19>
       <Position20>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="160" Column="21" TopLine="140"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="570" Column="46" TopLine="513"/>
       </Position20>
       <Position21>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="173" TopLine="143"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="136" TopLine="111"/>
       </Position21>
       <Position22>
         <Filename Value="pegelunit.pas"/>
-        <Caret Line="528" Column="18" TopLine="515"/>
+        <Caret Line="82" Column="15" TopLine="61"/>
       </Position22>
       <Position23>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="26" Column="62" TopLine="17"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="36" Column="38" TopLine="13"/>
       </Position23>
       <Position24>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="84" Column="72" TopLine="67"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="82" Column="20" TopLine="46"/>
       </Position24>
       <Position25>
-        <Filename Value="unit1.pas"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="113" Column="68" TopLine="107"/>
       </Position25>
       <Position26>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="258" Column="54" TopLine="221"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="110" Column="15" TopLine="102"/>
       </Position26>
       <Position27>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="203" TopLine="203"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="632" Column="20" TopLine="597"/>
       </Position27>
       <Position28>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="220" Column="36" TopLine="180"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="633" Column="58" TopLine="597"/>
       </Position28>
       <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="205" Column="64" TopLine="197"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="635" Column="54" TopLine="599"/>
       </Position29>
-      <Position30>
-        <Filename Value="../units/gitupdateunit.pas"/>
-        <Caret Line="33" Column="29" TopLine="30"/>
-      </Position30>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/wetter.res b/wetter.res
index e994dfa..877868c 100644
--- a/wetter.res
+++ b/wetter.res