Resolve Merge Errors in SW1

Steve Greedy
1 parent 56875dd0
Showing 5 changed files with 24 additions and 41 deletions Show diff stats
GUI/SW1/SRC/COAXIAL.cpp
GUI/SW1/SRC/CYLINDRICAL.cpp
GUI/SW1/SRC/DCONN.cpp
GUI/SW1/SRC/TP.cpp
GUI/SW1/SRC/TWINAX.cpp
@@ -307,11 +307,8 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp;
 	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);
-<<<<<<< HEAD
-=======
 	Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&COAXIAL::OnInit);
 	Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPaint);
->>>>>>> v4
 	//*)
 }
@@ -336,6 +333,11 @@ void COAXIAL::OnInit(wxInitDialogEvent&amp; event)
     Logger::instance().log("Create Coaxial Cable Model", Logger::kLogLevelInfo);
 }
+void COAXIAL::OnPaint(wxPaintEvent& event)
+{
+    if (EDIT_EXISTING==true) EditExistingCable();
+}
+
 void COAXIAL::SetPathToMOD(wxString Path, wxString Name)
 {
     pathToMOD << Path;
@@ -894,11 +896,7 @@ void COAXIAL::OnCheckBox2Click(wxCommandEvent&amp; event)
     }
 }
-<<<<<<< HEAD
-
-=======
 void COAXIAL::EditExistingCable()
 {
     Close();
 }
->>>>>>> v4
@@ -165,11 +165,8 @@ CYLINDRICAL::CYLINDRICAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; 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);
-<<<<<<< HEAD
-=======
 	Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&CYLINDRICAL::OnInit);
 	Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPaint);
->>>>>>> v4
 	//*)
 }
@@ -180,8 +177,6 @@ CYLINDRICAL::~CYLINDRICAL()
 }
-<<<<<<< HEAD
-=======
 void CYLINDRICAL::OnInit(wxInitDialogEvent& event)
 {
     TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
@@ -198,7 +193,6 @@ void CYLINDRICAL::OnPaint(wxPaintEvent&amp; event)
     if (EDIT_EXISTING==true) EditExistingCable();
 }
->>>>>>> v4
 void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name)
 {
     pathToMOD << Path;
@@ -207,6 +201,9 @@ void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name)
 void CYLINDRICAL::OnButton1Click(wxCommandEvent& event)
 {
+
+    if (EDIT_EXISTING==true) EditExistingCable();
+
     int IsError = 0;
     wxString fileName = TextCtrl1->GetValue();
@@ -492,11 +489,8 @@ void CYLINDRICAL::OnPanel1LeftDClick(wxMouseEvent&amp; event)
 {
     cylindricalSchematic();
 }
-<<<<<<< HEAD
-=======
 void CYLINDRICAL::EditExistingCable()
 {
     Close();
 }
->>>>>>> v4
@@ -166,11 +166,8 @@ DCONN::DCONN(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; 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);
-<<<<<<< HEAD
-=======
 	Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&DCONN::OnInit);
 	Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPaint);
->>>>>>> v4
 	//*)
 }
@@ -180,8 +177,6 @@ DCONN::~DCONN()
 	//*)
 }
-<<<<<<< HEAD
-=======
 void DCONN::OnInit(wxInitDialogEvent& event)
 {
@@ -197,7 +192,6 @@ void DCONN::OnPaint(wxPaintEvent&amp; event)
     if (EDIT_EXISTING==true) EditExistingCable();
 }
->>>>>>> v4
 void DCONN::SetPathToMOD(wxString Path, wxString Name)
 {
@@ -603,3 +597,8 @@ void DCONN::OnCheckBox2Click(wxCommandEvent&amp; event)
     }
     WriteCableFile (TextCtrl1->GetValue());
 }
+
+void DCONN::EditExistingCable()
+{
+    Close();
+}
@@ -215,7 +215,7 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; 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/m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26"));
+	StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries)"), 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,11 +326,8 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; 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);
-<<<<<<< HEAD
-=======
 	Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&TP::OnInit);
 	Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPaint);
->>>>>>> v4
 	//*)
 }
@@ -355,21 +352,12 @@ void TP::OnInit(wxInitDialogEvent&amp; event)
     CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
 }
-<<<<<<< HEAD
-TP::~TP()
-{
-	//(*Destroy(TP)
-	//*)
-}
-
-=======
 void TP::OnPaint(wxPaintEvent& event)
 {
     if (EDIT_EXISTING==true) EditExistingCable();
 }
->>>>>>> v4
 void TP::SetPathToMOD(wxString Path, wxString Name)
 {
@@ -1206,3 +1194,8 @@ void TP::OnCheckBox4Click(wxCommandEvent&amp; event)
 }
+
+void TP::EditExistingCable()
+{
+    Close();
+}
@@ -334,11 +334,8 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; 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);
-<<<<<<< HEAD
-=======
 	Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&TWINAX::OnInit);
 	Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPaint);
->>>>>>> v4
 	//*)
 }
@@ -364,6 +361,11 @@ void TWINAX::OnInit(wxInitDialogEvent&amp; event)
 }
+void TWINAX::OnPaint(wxPaintEvent& event)
+{
+    if (EDIT_EXISTING==true) EditExistingCable();
+}
+
 void TWINAX::SetPathToMOD(wxString Path, wxString Name)
 {
@@ -1187,11 +1189,8 @@ void TWINAX::OnCheckBox4Click(wxCommandEvent&amp; event)
     }
 }
-<<<<<<< HEAD
-=======
 void TWINAX::EditExistingCable()
 {
     Close();
 }
->>>>>>> v4