From 5948ef0e482ff18fa661058be447607b17536483 Mon Sep 17 00:00:00 2001 From: karlmichaelschindler <karlmichaelschindler@7e267752-d5d8-41c0-93cd-a7fa012602f9> Date: Tue, 15 Sep 2020 16:43:05 +0000 Subject: [PATCH] add ClearButton in DiagrammForm git-svn-id: svn+ssh://michael-ep3.physik.uni-halle.de/Users/Shared/EELS2@104 7e267752-d5d8-41c0-93cd-a7fa012602f9 --- source/Lazarus-GUI/EELS.lps | 90 ++++++++++++++++---------------- source/Lazarus-GUI/UDiagramm.lfm | 11 +++- source/Lazarus-GUI/UDiagramm.pas | 7 +++ 3 files changed, 62 insertions(+), 46 deletions(-) diff --git a/source/Lazarus-GUI/EELS.lps b/source/Lazarus-GUI/EELS.lps index 5269db0..60970f6 100644 --- a/source/Lazarus-GUI/EELS.lps +++ b/source/Lazarus-GUI/EELS.lps @@ -16,9 +16,8 @@ <ComponentName Value="MainForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="352"/> + <TopLine Value="351"/> <CursorPos X="64" Y="335"/> <UsageCount Value="202"/> <Loaded Value="True"/> @@ -30,7 +29,7 @@ <EditorIndex Value="3"/> <TopLine Value="45"/> <CursorPos Y="74"/> - <UsageCount Value="172"/> + <UsageCount Value="173"/> <Loaded Value="True"/> </Unit2> <Unit3> @@ -39,7 +38,7 @@ <EditorIndex Value="4"/> <TopLine Value="61"/> <CursorPos X="32" Y="69"/> - <UsageCount Value="120"/> + <UsageCount Value="121"/> <Loaded Value="True"/> </Unit3> <Unit4> @@ -47,7 +46,7 @@ <IsPartOfProject Value="True"/> <EditorIndex Value="5"/> <CursorPos Y="189"/> - <UsageCount Value="47"/> + <UsageCount Value="48"/> <Loaded Value="True"/> <DefaultSyntaxHighlighter Value="None"/> </Unit4> @@ -56,7 +55,7 @@ <IsPartOfProject Value="True"/> <EditorIndex Value="6"/> <CursorPos X="91"/> - <UsageCount Value="52"/> + <UsageCount Value="53"/> <Loaded Value="True"/> <DefaultSyntaxHighlighter Value="None"/> </Unit5> @@ -66,10 +65,11 @@ <ComponentName Value="DiagrammForm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="2"/> - <TopLine Value="22"/> - <CursorPos X="28" Y="46"/> - <UsageCount Value="21"/> + <TopLine Value="25"/> + <CursorPos X="33" Y="45"/> + <UsageCount Value="22"/> <Loaded Value="True"/> <LoadedDesigner Value="True"/> </Unit6> @@ -122,115 +122,115 @@ </Position2> <Position3> <Filename Value="UMainForm.pas"/> - <Caret Line="478" TopLine="465"/> + <Caret Line="491" Column="22" TopLine="473"/> </Position3> <Position4> <Filename Value="UMainForm.pas"/> - <Caret Line="481" TopLine="465"/> + <Caret Line="494" TopLine="473"/> </Position4> <Position5> <Filename Value="UMainForm.pas"/> - <Caret Line="491" Column="22" TopLine="473"/> + <Caret Line="493" TopLine="473"/> </Position5> <Position6> - <Filename Value="UMainForm.pas"/> - <Caret Line="494" TopLine="473"/> + <Filename Value="../f90/doboson.f90"/> + <Caret Line="50" TopLine="36"/> </Position6> <Position7> - <Filename Value="UMainForm.pas"/> - <Caret Line="493" TopLine="473"/> + <Filename Value="../f90/doboson.f90"/> + <Caret Line="112" TopLine="98"/> </Position7> <Position8> <Filename Value="../f90/doboson.f90"/> - <Caret Line="50" TopLine="36"/> + <Caret Line="113" TopLine="98"/> </Position8> <Position9> <Filename Value="../f90/doboson.f90"/> - <Caret Line="112" TopLine="98"/> + <Caret Line="115" TopLine="98"/> </Position9> <Position10> <Filename Value="../f90/doboson.f90"/> - <Caret Line="113" TopLine="98"/> + <Caret Line="149" Column="29" TopLine="142"/> </Position10> <Position11> <Filename Value="../f90/doboson.f90"/> - <Caret Line="115" TopLine="98"/> + <Caret Column="90"/> </Position11> <Position12> <Filename Value="../f90/doboson.f90"/> - <Caret Line="149" Column="29" TopLine="142"/> + <Caret Line="22" Column="9"/> </Position12> <Position13> <Filename Value="../f90/doboson.f90"/> - <Caret Column="90"/> + <Caret Line="35" Column="60" TopLine="11"/> </Position13> <Position14> <Filename Value="../f90/doboson.f90"/> - <Caret Line="22" Column="9"/> + <Caret Line="36" Column="34" TopLine="12"/> </Position14> <Position15> <Filename Value="../f90/doboson.f90"/> - <Caret Line="35" Column="60" TopLine="11"/> + <Caret Line="236" Column="7" TopLine="212"/> </Position15> <Position16> <Filename Value="../f90/doboson.f90"/> - <Caret Line="36" Column="34" TopLine="12"/> + <Caret Line="247" Column="18" TopLine="223"/> </Position16> <Position17> <Filename Value="../f90/doboson.f90"/> - <Caret Line="236" Column="7" TopLine="212"/> + <Caret Line="248" Column="16" TopLine="224"/> </Position17> <Position18> <Filename Value="../f90/doboson.f90"/> - <Caret Line="247" Column="18" TopLine="223"/> + <Caret Line="249" Column="16" TopLine="225"/> </Position18> <Position19> <Filename Value="../f90/doboson.f90"/> - <Caret Line="248" Column="16" TopLine="224"/> + <Caret Line="263" Column="22" TopLine="239"/> </Position19> <Position20> <Filename Value="../f90/doboson.f90"/> - <Caret Line="249" Column="16" TopLine="225"/> + <Caret Line="264" Column="20" TopLine="240"/> </Position20> <Position21> - <Filename Value="../f90/doboson.f90"/> - <Caret Line="263" Column="22" TopLine="239"/> + <Filename Value="UMainForm.pas"/> + <Caret Line="493" Column="14" TopLine="468"/> </Position21> <Position22> - <Filename Value="../f90/doboson.f90"/> - <Caret Line="264" Column="20" TopLine="240"/> + <Filename Value="UMainForm.pas"/> + <Caret Line="478" TopLine="468"/> </Position22> <Position23> <Filename Value="UMainForm.pas"/> - <Caret Line="493" Column="14" TopLine="468"/> + <Caret Line="475" Column="34" TopLine="470"/> </Position23> <Position24> - <Filename Value="UMainForm.pas"/> - <Caret Line="478" TopLine="468"/> + <Filename Value="UDiagramm.pas"/> + <Caret Line="19" Column="30"/> </Position24> <Position25> - <Filename Value="UMainForm.pas"/> - <Caret Line="475" Column="34" TopLine="470"/> + <Filename Value="UDiagramm.pas"/> + <Caret Line="24" Column="30"/> </Position25> <Position26> - <Filename Value="UDiagramm.pas"/> - <Caret Line="19" Column="30"/> + <Filename Value="UMainForm.pas"/> + <Caret Line="496" Column="31" TopLine="472"/> </Position26> <Position27> <Filename Value="UDiagramm.pas"/> - <Caret Line="24" Column="30"/> + <Caret Line="34" Column="33" TopLine="10"/> </Position27> <Position28> - <Filename Value="UMainForm.pas"/> - <Caret Line="496" Column="31" TopLine="472"/> + <Filename Value="UDiagramm.pas"/> + <Caret Line="9" Column="23" TopLine="9"/> </Position28> <Position29> <Filename Value="UDiagramm.pas"/> - <Caret Line="34" Column="33" TopLine="10"/> + <Caret Line="46" Column="28" TopLine="22"/> </Position29> <Position30> <Filename Value="UDiagramm.pas"/> - <Caret Line="9" Column="23" TopLine="9"/> + <Caret Line="53" Column="28" TopLine="25"/> </Position30> </JumpHistory> <RunParams> diff --git a/source/Lazarus-GUI/UDiagramm.lfm b/source/Lazarus-GUI/UDiagramm.lfm index f429f70..e4b5dea 100644 --- a/source/Lazarus-GUI/UDiagramm.lfm +++ b/source/Lazarus-GUI/UDiagramm.lfm @@ -9,7 +9,7 @@ object DiagrammForm: TDiagrammForm OnShow = FormShow LCLVersion = '2.0.10.0' object CloseButton: TButton - Left = 296 + Left = 48 Height = 25 Top = 488 Width = 75 @@ -46,4 +46,13 @@ object DiagrammForm: TDiagrammForm object SpectrumChartLineSeries: TLineSeries end end + object ClearButton: TButton + Left = 48 + Height = 25 + Top = 456 + Width = 75 + Caption = 'Clear' + OnClick = ClearButtonClick + TabOrder = 2 + end end diff --git a/source/Lazarus-GUI/UDiagramm.pas b/source/Lazarus-GUI/UDiagramm.pas index df5956d..a591569 100644 --- a/source/Lazarus-GUI/UDiagramm.pas +++ b/source/Lazarus-GUI/UDiagramm.pas @@ -13,9 +13,11 @@ type { TDiagrammForm } TDiagrammForm = class(TForm) + ClearButton: TButton; SpectrumChart: TChart; CloseButton: TButton; SpectrumChartLineSeries: TLineSeries; + procedure ClearButtonClick(Sender: TObject); procedure CloseButtonClick(Sender: TObject); procedure FormShow(Sender: TObject); private @@ -38,6 +40,11 @@ begin DiagrammForm.Visible := false; end; +procedure TDiagrammForm.ClearButtonClick(Sender: TObject); +begin + SpectrumChartLineSeries.Clear; +end; + procedure TDiagrammForm.FormShow(Sender: TObject); var i: Integer; -- GitLab