From 2e55c7768702ade1395b0b9c687d70459b579531 Mon Sep 17 00:00:00 2001 From: Steve Greedy Date: Thu, 16 Aug 2018 21:29:44 +0100 Subject: [PATCH] SW1_GUI Updates --- GUI/SW1/SRC/BUNDLEBLDR.cpp | 24 +++++++++++++++++++++++- GUI/SW1/SRC/BUNDLEBLDR.h | 1 + GUI/SW1/SRC/PLACE_CABLE.cpp | 22 ++++++++++++++++++++-- GUI/SW1/SRC/PLACE_CABLE.h | 7 ++++++- GUI/SW1/SRC/SW1_GUI.depend | 83 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------- 5 files changed, 93 insertions(+), 44 deletions(-) diff --git a/GUI/SW1/SRC/BUNDLEBLDR.cpp b/GUI/SW1/SRC/BUNDLEBLDR.cpp index b8a0722..dfcbf28 100644 --- a/GUI/SW1/SRC/BUNDLEBLDR.cpp +++ b/GUI/SW1/SRC/BUNDLEBLDR.cpp @@ -353,7 +353,7 @@ void BUNDLEBLDR::OnListboxRDown(wxMouseEvent& event) } else - wxMessageBox(_T("Listbox right clicked but no item clicked upon"),_("No item selected")); + wxMessageBox(_T("No Cable SELECTED"),_("Remove Cable Component")); event.Skip(); } @@ -362,6 +362,8 @@ void BUNDLEBLDR::PopulateListControl(void) { ListBox1->Clear(); + Button1->Enable(); + Bundle *Current = bundle_root; while ( Current->next != NULL ) @@ -369,6 +371,8 @@ void BUNDLEBLDR::PopulateListControl(void) ListBox1->Append(Current->CableType); Current = Current->next; } + DrawPanel(); + DrawBundleCsection(); } void BUNDLEBLDR::removeElement(int ItemIndex) @@ -398,6 +402,8 @@ void BUNDLEBLDR::removeElement(int ItemIndex) delete Current; + Button1->Enable(); + } @@ -462,6 +468,8 @@ void BUNDLEBLDR::OnTreeSelectionChanged(wxTreeEvent& evt) ListBox1->Append(File_FullName); + Button1->Enable(); + DrawBundleCsection(); } @@ -487,6 +495,19 @@ void BUNDLEBLDR::OnCheckListBox1Toggled(wxCommandEvent& event) void BUNDLEBLDR::OnPanel1Paint(wxPaintEvent& event) { +// double maxDimension; +// +// wxString maxXY = TextCtrl8->GetValue(); +// +// maxXY.ToDouble(&maxDimension); +// +// FormatPanel(maxDimension); + + DrawPanel(); +} + +void BUNDLEBLDR::DrawPanel() +{ double maxDimension; wxString maxXY = TextCtrl8->GetValue(); @@ -1615,3 +1636,4 @@ void BUNDLEBLDR::OnSpinButton1ChangeDown(wxSpinEvent& event) DrawBundleCsection(); } + diff --git a/GUI/SW1/SRC/BUNDLEBLDR.h b/GUI/SW1/SRC/BUNDLEBLDR.h index 7cd50ba..2ed6d0c 100644 --- a/GUI/SW1/SRC/BUNDLEBLDR.h +++ b/GUI/SW1/SRC/BUNDLEBLDR.h @@ -115,6 +115,7 @@ class BUNDLEBLDR: public wxDialog void DrawBundleCable(wxString, wxString, wxString, wxString); void ConstructBundleCsection(wxString, wxString, wxString); + void DrawPanel(); void DrawBundleCsection(); void WriteBundleFile(wxString); diff --git a/GUI/SW1/SRC/PLACE_CABLE.cpp b/GUI/SW1/SRC/PLACE_CABLE.cpp index 37d9659..7a5372a 100644 --- a/GUI/SW1/SRC/PLACE_CABLE.cpp +++ b/GUI/SW1/SRC/PLACE_CABLE.cpp @@ -92,7 +92,9 @@ PLACE_CABLE::PLACE_CABLE(wxWindow* parent,wxWindowID id,const wxPoint& pos,const StaticBoxSizer1->Fit(this); StaticBoxSizer1->SetSizeHints(this); - Connect(ID_TEXTCTRL1,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnbundleXText); + Connect(ID_TEXTCTRL1,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnTextCtrl1Text); + Connect(ID_TEXTCTRL2,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnTextCtrl2Text); + Connect(ID_TEXTCTRL3,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnTextCtrl3Text); Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PLACE_CABLE::OnButton1Click); Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PLACE_CABLE::OnButton2Click); //*) @@ -118,6 +120,22 @@ void PLACE_CABLE::OnButton2Click(wxCommandEvent& event) } -void PLACE_CABLE::OnbundleXText(wxCommandEvent& event) +void PLACE_CABLE::OnTextCtrl1Text(wxCommandEvent& event) { + int IsError = 0; + check_is_numeric_list(TextCtrl1, &IsError); } + +void PLACE_CABLE::OnTextCtrl2Text(wxCommandEvent& event) +{ + int IsError = 0; + check_is_numeric_list(TextCtrl2, &IsError); +} + +void PLACE_CABLE::OnTextCtrl3Text(wxCommandEvent& event) +{ + int IsError = 0; + check_is_numeric_list(TextCtrl3, &IsError); +} + + diff --git a/GUI/SW1/SRC/PLACE_CABLE.h b/GUI/SW1/SRC/PLACE_CABLE.h index 7154db2..cce0daa 100644 --- a/GUI/SW1/SRC/PLACE_CABLE.h +++ b/GUI/SW1/SRC/PLACE_CABLE.h @@ -50,6 +50,9 @@ #include //*) +// Application Includes +#include "UTILITIES.h" + class PLACE_CABLE: public wxDialog { public: @@ -88,7 +91,9 @@ class PLACE_CABLE: public wxDialog //(*Handlers(PLACE_CABLE) void OnButton2Click(wxCommandEvent& event); void OnButton1Click(wxCommandEvent& event); - void OnbundleXText(wxCommandEvent& event); + void OnTextCtrl2Text(wxCommandEvent& event); + void OnTextCtrl3Text(wxCommandEvent& event); + void OnTextCtrl1Text(wxCommandEvent& event); //*) DECLARE_EVENT_TABLE() diff --git a/GUI/SW1/SRC/SW1_GUI.depend b/GUI/SW1/SRC/SW1_GUI.depend index 9972a6a..777db91 100644 --- a/GUI/SW1/SRC/SW1_GUI.depend +++ b/GUI/SW1/SRC/SW1_GUI.depend @@ -5541,7 +5541,7 @@ -1533748199 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.cpp +1534176979 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.cpp "ABOUT.h" @@ -5549,26 +5549,28 @@ -1533746579 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.h +1534156874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.h -1530874924 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp "BUNDLE_SCHEMATIC.h" -1502693582 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h +1533919879 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h + + -1533124608 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.cpp +1534453396 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.cpp "BUNDLEBLDR.h" "PLACE_CABLE.h" "MESH_LAPLACE.h" @@ -5583,7 +5585,7 @@ -1530739988 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.h +1534453477 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.h @@ -5612,13 +5614,13 @@ "wx/dirdlg.h" "wx/choice.h" -1502693568 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.h -1502693576 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.h @@ -5638,7 +5640,7 @@ "UTILITIES.h" -1502693574 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.h +1534156874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.h @@ -5647,17 +5649,18 @@ -1502693576 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.h +1534454450 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.h + "UTILITIES.h" -1530399132 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.cpp +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.cpp "CABLE_SCHEMATIC.h" -1502693580 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.h @@ -5665,7 +5668,7 @@ -1533825182 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.cpp +1533918833 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.cpp "COAXIAL.h" @@ -5692,7 +5695,7 @@ -1530719644 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.h @@ -5711,7 +5714,7 @@ -1533825320 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.cpp +1533918802 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.cpp "CYLINDRICAL.h" @@ -5734,13 +5737,13 @@ -1533829935 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.cpp +1533918900 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.cpp "DCONN.h" -1533829856 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.h +1533831264 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.h @@ -5759,12 +5762,12 @@ -1530874672 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.cpp +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.cpp "EXPORT_SPICE.h" -1508706152 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.h @@ -5774,20 +5777,20 @@ -1530719662 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.cpp +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.cpp "FD_ESR.h" -1530724392 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.cpp +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.cpp "FD_ESR_SW.h" "UTILITIES.h" -1530724366 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.h +1534156874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.h @@ -5837,7 +5840,7 @@ "dos.h" -1530802204 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp "MESH_LAPLACE.h" 1530714886 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp @@ -5846,13 +5849,13 @@ -1531159069 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.cpp +1533918913 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.cpp "OVERSHIELD.h" -1533829967 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.h +1533830894 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.h @@ -5868,7 +5871,7 @@ -1502693576 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.cpp +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.cpp "PLACE_CABLE.h" @@ -5876,12 +5879,12 @@ 1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\resource.rc "wx/msw/wx.rc" -1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.cpp +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.cpp "RUN_STATUS.h" -1533827895 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.cpp +1533918874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.cpp "SPACEWIRE.h" @@ -5908,7 +5911,7 @@ -1533827776 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.cpp +1533922218 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.cpp "SPICEMODEL.h" @@ -5921,7 +5924,7 @@ -1533827724 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h @@ -5941,15 +5944,15 @@ "RUN_STATUS.h" "UTILITIES.h" -1502693570 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.cpp +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.cpp "SW1_GUIApp.h" "SW1_GUIMain.h" -1502693570 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h +1534156874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h -1533743085 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.h +1534156874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.h @@ -6051,7 +6054,7 @@ -1533827985 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h +1534156875 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h @@ -6073,34 +6076,34 @@ -1533810128 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp +1534431660 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp "SW1_GUIMain.h" -1533826466 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp +1533918852 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp "TP.h" -1533827512 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp +1533918863 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp "TWINAX.h" -1502693568 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp +1534435968 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp "UTILITIES.h" -1533825916 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.cpp +1533918843 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.cpp "UTP.h" -1533829809 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.cpp +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.cpp "FLEXCABLE.h" -- libgit2 0.21.2