From f5f47a745c2433337e601da947db65928ee7fe8a Mon Sep 17 00:00:00 2001 From: steve.greedy Date: Mon, 25 Jun 2018 11:02:53 +0100 Subject: [PATCH] Update Branch Master --- GUI/SW1/SRC/COAXIAL.cpp | 12 ------------ GUI/SW1/SRC/CYLINDRICAL.cpp | 16 ---------------- GUI/SW1/SRC/DCONN.cpp | 11 ----------- GUI/SW1/SRC/TP.cpp | 14 +------------- GUI/SW1/SRC/TWINAX.cpp | 13 ------------- 5 files changed, 1 insertion(+), 65 deletions(-) diff --git a/GUI/SW1/SRC/COAXIAL.cpp b/GUI/SW1/SRC/COAXIAL.cpp index eb7357e..c0212a0 100644 --- a/GUI/SW1/SRC/COAXIAL.cpp +++ b/GUI/SW1/SRC/COAXIAL.cpp @@ -307,7 +307,6 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize& Connect(ID_coaxCLOSE,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&COAXIAL::OncoaxCLOSEClick); Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPanel1Paint,0,this); Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&COAXIAL::OnPanel1LeftDClick,0,this); - Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPaint); //*) TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this); @@ -327,11 +326,6 @@ COAXIAL::~COAXIAL() //*) } -void COAXIAL::OnPaint(wxPaintEvent& event) -{ - if (EDIT_EXISTING==true) EditExistingCable(); -} - void COAXIAL::SetPathToMOD(wxString Path, wxString Name) { pathToMOD << Path; @@ -887,10 +881,4 @@ void COAXIAL::OnCheckBox2Click(wxCommandEvent& event) } } -void COAXIAL::EditExistingCable() -{ - Close(); -} - - diff --git a/GUI/SW1/SRC/CYLINDRICAL.cpp b/GUI/SW1/SRC/CYLINDRICAL.cpp index 774d4a0..b654d7d 100644 --- a/GUI/SW1/SRC/CYLINDRICAL.cpp +++ b/GUI/SW1/SRC/CYLINDRICAL.cpp @@ -165,7 +165,6 @@ CYLINDRICAL::CYLINDRICAL(wxWindow* parent,wxWindowID id,const wxPoint& pos,const Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&CYLINDRICAL::OnButton3Click); Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1Paint,0,this); Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1LeftDClick,0,this); - Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPaint); //*) TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this); @@ -184,11 +183,6 @@ CYLINDRICAL::~CYLINDRICAL() } -void CYLINDRICAL::OnPaint(wxPaintEvent& event) -{ - if (EDIT_EXISTING==true) EditExistingCable(); -} - void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name) { pathToMOD << Path; @@ -197,9 +191,6 @@ void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name) void CYLINDRICAL::OnButton1Click(wxCommandEvent& event) { - - if (EDIT_EXISTING==true) EditExistingCable(); - int IsError = 0; wxString fileName = TextCtrl1->GetValue(); @@ -543,10 +534,3 @@ void CYLINDRICAL::OnPanel1LeftDClick(wxMouseEvent& event) { cylindricalSchematic(); } - -void CYLINDRICAL::EditExistingCable() -{ - Close(); -} - - diff --git a/GUI/SW1/SRC/DCONN.cpp b/GUI/SW1/SRC/DCONN.cpp index 36814fe..6498650 100644 --- a/GUI/SW1/SRC/DCONN.cpp +++ b/GUI/SW1/SRC/DCONN.cpp @@ -166,7 +166,6 @@ DCONN::DCONN(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize& siz Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton3Click); Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPanel1Paint,0,this); Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&DCONN::OnPanel1LeftDClick,0,this); - Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPaint); //*) TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this); @@ -182,11 +181,6 @@ DCONN::~DCONN() //*) } -void DCONN::OnPaint(wxPaintEvent& event) -{ - if (EDIT_EXISTING==true) EditExistingCable(); -} - void DCONN::SetPathToMOD(wxString Path, wxString Name) { @@ -592,8 +586,3 @@ void DCONN::OnCheckBox2Click(wxCommandEvent& event) } WriteCableFile (TextCtrl1->GetValue()); } - -void DCONN::EditExistingCable() -{ - Close(); -} diff --git a/GUI/SW1/SRC/TP.cpp b/GUI/SW1/SRC/TP.cpp index de6dbec..0b3da5b 100644 --- a/GUI/SW1/SRC/TP.cpp +++ b/GUI/SW1/SRC/TP.cpp @@ -215,7 +215,7 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize& size) FlexGridSizer8->Add(StaticText25, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); TextCtrl17 = new wxTextCtrl(Panel3, ID_TEXTCTRL17, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL17")); FlexGridSizer8->Add(TextCtrl17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); - StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26")); + StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries/m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26")); FlexGridSizer8->Add(StaticText26, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); TextCtrl18 = new wxTextCtrl(Panel3, ID_TEXTCTRL18, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL18")); FlexGridSizer8->Add(TextCtrl18, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -326,7 +326,6 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize& size) Panel4->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPanel4Paint,0,this); Panel4->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TP::OnPanel4LeftDClick,0,this); Panel4->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&TP::OnPanel4MouseWheel,0,this); - Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPaint); //*) TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this); @@ -348,12 +347,6 @@ TP::~TP() //*) } -void TP::OnPaint(wxPaintEvent& event) -{ - if (EDIT_EXISTING==true) EditExistingCable(); -} - - void TP::SetPathToMOD(wxString Path, wxString Name) { @@ -1196,8 +1189,3 @@ void TP::OnCheckBox4Click(wxCommandEvent& event) } - -void TP::EditExistingCable() -{ - Close(); -} diff --git a/GUI/SW1/SRC/TWINAX.cpp b/GUI/SW1/SRC/TWINAX.cpp index 9bfef16..a82a10e 100644 --- a/GUI/SW1/SRC/TWINAX.cpp +++ b/GUI/SW1/SRC/TWINAX.cpp @@ -334,7 +334,6 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize& s Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TWINAX::OnButton2Click); Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPanel1Paint,0,this); Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TWINAX::OnPanel1LeftDClick,0,this); - Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPaint); //*) TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this); @@ -356,11 +355,6 @@ TWINAX::~TWINAX() //*) } -void TWINAX::OnPaint(wxPaintEvent& event) -{ - if (EDIT_EXISTING==true) EditExistingCable(); -} - void TWINAX::SetPathToMOD(wxString Path, wxString Name) { @@ -1177,10 +1171,3 @@ void TWINAX::OnCheckBox4Click(wxCommandEvent& event) } } - -void TWINAX::EditExistingCable() -{ - Close(); -} - - -- libgit2 0.21.2