pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

V0.1.2.0 Bugfix to earlier bugfix..

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5594 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2017-01-05 10:38:36 +00:00
parent 4319fe2d9f
commit 82145142ee
5 changed files with 69 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
applications/foobot/monitor/foobotmonitor.lps
View File

@ -10,7 +10,7 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="11"/> <EditorIndex Value="11"/>
<CursorPos X="33" Y="25"/> <CursorPos X="33" Y="25"/>
<UsageCount Value="86"/> <UsageCount Value="87"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
@ -19,9 +19,10 @@
<ComponentName Value="mainform"/> <ComponentName Value="mainform"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<TopLine Value="417"/> <IsVisibleTab Value="True"/>
<CursorPos X="29" Y="424"/> <TopLine Value="200"/>
<UsageCount Value="86"/> <CursorPos X="23" Y="227"/>
<UsageCount Value="87"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit1> </Unit1>
@ -33,7 +34,7 @@
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<EditorIndex Value="5"/> <EditorIndex Value="5"/>
<CursorPos X="2" Y="20"/> <CursorPos X="2" Y="20"/>
<UsageCount Value="76"/> <UsageCount Value="77"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
@ -43,7 +44,7 @@
<WindowIndex Value="-1"/> <WindowIndex Value="-1"/>
<TopLine Value="-1"/> <TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/> <CursorPos X="-1" Y="-1"/>
<UsageCount Value="68"/> <UsageCount Value="69"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="..\foobot_objects.pas"/> <Filename Value="..\foobot_objects.pas"/>
@ -52,7 +53,7 @@
<WindowIndex Value="-1"/> <WindowIndex Value="-1"/>
<TopLine Value="-1"/> <TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/> <CursorPos X="-1" Y="-1"/>
<UsageCount Value="68"/> <UsageCount Value="69"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="..\foobot_utility.pas"/> <Filename Value="..\foobot_utility.pas"/>
@ -60,7 +61,7 @@
<EditorIndex Value="8"/> <EditorIndex Value="8"/>
<TopLine Value="34"/> <TopLine Value="34"/>
<CursorPos X="18" Y="83"/> <CursorPos X="18" Y="83"/>
<UsageCount Value="86"/> <UsageCount Value="87"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit5> </Unit5>
<Unit6> <Unit6>
@ -70,16 +71,15 @@
<WindowIndex Value="-1"/> <WindowIndex Value="-1"/>
<TopLine Value="-1"/> <TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/> <CursorPos X="-1" Y="-1"/>
<UsageCount Value="68"/> <UsageCount Value="69"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="foobot_sensors.pas"/> <Filename Value="foobot_sensors.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="309"/> <TopLine Value="299"/>
<CursorPos X="6" Y="292"/> <CursorPos X="14" Y="321"/>
<UsageCount Value="20"/> <UsageCount Value="21"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
@ -230,119 +230,127 @@
<OtherDefines Count="1"> <OtherDefines Count="1">
<Define0 Value="DEBUGMODE"/> <Define0 Value="DEBUGMODE"/>
</OtherDefines> </OtherDefines>
<JumpHistory Count="28" HistoryIndex="27"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="374" Column="71" TopLine="344"/> <Caret Line="373" Column="11" TopLine="351"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="373" Column="11" TopLine="351"/> <Caret Line="292" Column="24" TopLine="248"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="292" Column="24" TopLine="248"/> <Caret Line="286" Column="21" TopLine="283"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="286" Column="21" TopLine="283"/> <Caret Line="58" Column="29" TopLine="35"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="58" Column="29" TopLine="35"/> <Caret Line="347" Column="40" TopLine="311"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="umainform.pas"/>
<Caret Line="347" Column="40" TopLine="311"/>
</Position6>
<Position7>
<Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/> <Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/>
<Caret Line="795" Column="28" TopLine="781"/> <Caret Line="795" Column="28" TopLine="781"/>
</Position6>
<Position7>
<Filename Value="umainform.pas"/>
<Caret Line="646" Column="114" TopLine="641"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="646" Column="114" TopLine="641"/> <Caret Line="434" Column="3" TopLine="434"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="434" Column="3" TopLine="434"/> <Caret Line="48" Column="11" TopLine="34"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="48" Column="11" TopLine="34"/> <Caret Line="79" Column="15" TopLine="59"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="79" Column="15" TopLine="59"/> <Caret Line="434" Column="3" TopLine="432"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="434" Column="3" TopLine="432"/> <Caret Line="435" Column="3" TopLine="433"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="435" Column="3" TopLine="433"/> <Caret Line="436" Column="3" TopLine="434"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="436" Column="3" TopLine="434"/> <Caret Line="443" TopLine="441"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="443" TopLine="441"/> <Caret Line="179" Column="43" TopLine="156"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="179" Column="43" TopLine="156"/> <Caret Line="180" Column="60" TopLine="167"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="180" Column="60" TopLine="167"/> <Caret Line="648" TopLine="627"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="648" TopLine="627"/> <Caret Line="669" Column="41" TopLine="664"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="669" Column="41" TopLine="664"/> <Caret Line="188" Column="29" TopLine="166"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="188" Column="29" TopLine="166"/> <Caret Line="425" Column="3" TopLine="423"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="425" Column="3" TopLine="423"/> <Caret Line="415" Column="5" TopLine="413"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="415" Column="5" TopLine="413"/> <Caret Line="439" Column="3" TopLine="437"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="439" Column="3" TopLine="437"/> <Caret Line="548" Column="26" TopLine="546"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="548" Column="26" TopLine="546"/> <Caret Line="563" TopLine="534"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="umainform.pas"/>
<Caret Line="563" TopLine="534"/>
</Position25>
<Position26>
<Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/> <Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/>
<Caret Line="795" Column="28" TopLine="781"/> <Caret Line="795" Column="28" TopLine="781"/>
</Position26> </Position25>
<Position27> <Position26>
<Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/> <Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/>
<Caret Line="154" TopLine="111"/> <Caret Line="154" TopLine="111"/>
</Position26>
<Position27>
<Filename Value="umainform.pas"/>
<Caret Line="563" Column="28" TopLine="561"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="563" Column="28" TopLine="561"/> <Caret Line="424" Column="29" TopLine="195"/>
</Position28> </Position28>
<Position29>
<Filename Value="umainform.pas"/>
<Caret Line="223" Column="66" TopLine="219"/>
</Position29>
<Position30>
<Filename Value="umainform.pas"/>
<Caret Line="342" Column="24" TopLine="319"/>
</Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>
</CONFIG> </CONFIG>

BIN
applications/foobot/monitor/innosetup/setup_foobotmonitor.exe
View File

Binary file not shown.

BIN
applications/foobot/monitor/linuxbinaries/foobotmonitor.zip
View File

Binary file not shown.

7
applications/foobot/monitor/umainform.lfm
View File

@ -419,37 +419,44 @@ object mainform: Tmainform
AutoCheck = True AutoCheck = True
Caption = 'Half-Hour' Caption = 'Half-Hour'
GroupIndex = 1 GroupIndex = 1
RadioItem = True
OnClick = mnu_SampleEveryHalfHourClick OnClick = mnu_SampleEveryHalfHourClick
end end
object mnu_SampleEvery1Hour: TMenuItem object mnu_SampleEvery1Hour: TMenuItem
AutoCheck = True AutoCheck = True
Caption = 'Hour (default)' Caption = 'Hour (default)'
Checked = True Checked = True
Default = True
GroupIndex = 1 GroupIndex = 1
RadioItem = True
OnClick = mnu_SampleEvery1HourClick OnClick = mnu_SampleEvery1HourClick
end end
object mnu_SampleEvery2Hours: TMenuItem object mnu_SampleEvery2Hours: TMenuItem
AutoCheck = True AutoCheck = True
Caption = '2 Hours' Caption = '2 Hours'
GroupIndex = 1 GroupIndex = 1
RadioItem = True
OnClick = mnu_SampleEvery2HoursClick OnClick = mnu_SampleEvery2HoursClick
end end
object mnu_SampleEvery4Hours: TMenuItem object mnu_SampleEvery4Hours: TMenuItem
AutoCheck = True AutoCheck = True
Caption = '4 Hours' Caption = '4 Hours'
GroupIndex = 1 GroupIndex = 1
RadioItem = True
OnClick = mnu_SampleEvery4HoursClick OnClick = mnu_SampleEvery4HoursClick
end end
object mnu_SampleEvery8Hours: TMenuItem object mnu_SampleEvery8Hours: TMenuItem
AutoCheck = True AutoCheck = True
Caption = '8 Hours' Caption = '8 Hours'
GroupIndex = 1 GroupIndex = 1
RadioItem = True
OnClick = mnu_SampleEvery8HoursClick OnClick = mnu_SampleEvery8HoursClick
end end
object mnu_SampleEvery24Hours: TMenuItem object mnu_SampleEvery24Hours: TMenuItem
AutoCheck = True AutoCheck = True
Caption = '24 Hours' Caption = '24 Hours'
GroupIndex = 1 GroupIndex = 1
RadioItem = True
OnClick = mnu_SampleEvery24HoursClick OnClick = mnu_SampleEvery24HoursClick
end end
end end

10
applications/foobot/monitor/umainform.pas
View File

@ -220,11 +220,13 @@ begin
end; end;
INI.SectionHashing := False; INI.SectionHashing := False;
ResetHighLows; ResetHighLows;
iFudgeFactor := 20; // only needed if height set here iFudgeFactor := 20; // only needed if height set in form.create
bDisplayGuagesOnly := False; bDisplayGuagesOnly := False;
bDisplayYellowLines := False; INI.PlainTextMode:=TRUE;
bDisplayYellowLines := INI.ReadBool('Config','DisplayYellowLines',False);
bDisplayRedLines := INI.ReadBool('Config','DisplayRedLines',False);
INI.PlainTextMode:=FALSE;
SetYellowRecommendedLevels; SetYellowRecommendedLevels;
bDisplayRedLines := False;
SetRedSessionMax; SetRedSessionMax;
TrayIcon1.Icon := Application.Icon; TrayIcon1.Icon := Application.Icon;
TrayIcon1.Hint := Application.Title; TrayIcon1.Hint := Application.Title;
@ -336,6 +338,8 @@ begin
INI.WriteFloat('Config', 'vocMaxValue', as_voc.ValueMax); INI.WriteFloat('Config', 'vocMaxValue', as_voc.ValueMax);
INI.WriteFloat('Config', 'allpolluMinValue', as_allpollu.ValueMin); INI.WriteFloat('Config', 'allpolluMinValue', as_allpollu.ValueMin);
INI.WriteFloat('Config', 'allpolluMaxValue', as_allpollu.ValueMax); INI.WriteFloat('Config', 'allpolluMaxValue', as_allpollu.ValueMax);
INI.WriteBool('Config','DisplayYellowLines',bDisplayYellowLines);
INI.WriteBool('Config','DisplayRedLines',bDisplayRedLines);
INI.PlainTextMode := False; INI.PlainTextMode := False;
end; end;