UoN / SACAMOS

Commit f5f47a745c2433337e601da947db65928ee7fe8a

Authored by Steve Greedy
1 parent 9405ea1c
Exists in master and in 2 other branches nested_overshields, proximity_effects

Update Branch Master 

Udpate branch master.
Showing 5 changed files with 1 additions and 65 deletions   Show diff stats
Inline Side-by-side
GUI/SW1/SRC/COAXIAL.cpp
  Diff comments   View file @f5f47a7
... ... @@ -307,7 +307,6 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize&
307 307 Connect(ID_coaxCLOSE,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&COAXIAL::OncoaxCLOSEClick);
308 308 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPanel1Paint,0,this);
309 309 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&COAXIAL::OnPanel1LeftDClick,0,this);
310   - Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPaint);
311 310 //*)
312 311  
313 312 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this);
... ... @@ -327,11 +326,6 @@ COAXIAL::~COAXIAL()
327 326 //*)
328 327 }
329 328  
330   -void COAXIAL::OnPaint(wxPaintEvent& event)
331   -{
332   - if (EDIT_EXISTING==true) EditExistingCable();
333   -}
334   -
335 329 void COAXIAL::SetPathToMOD(wxString Path, wxString Name)
336 330 {
337 331 pathToMOD << Path;
... ... @@ -887,10 +881,4 @@ void COAXIAL::OnCheckBox2Click(wxCommandEvent&amp; event)
887 881 }
888 882 }
889 883  
890   -void COAXIAL::EditExistingCable()
891   -{
892   - Close();
893   -}
894   -
895   -
896 884  
... ...
GUI/SW1/SRC/CYLINDRICAL.cpp
  Diff comments   View file @f5f47a7
... ... @@ -165,7 +165,6 @@ CYLINDRICAL::CYLINDRICAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const
165 165 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&CYLINDRICAL::OnButton3Click);
166 166 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1Paint,0,this);
167 167 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1LeftDClick,0,this);
168   - Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPaint);
169 168 //*)
170 169  
171 170 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
... ... @@ -184,11 +183,6 @@ CYLINDRICAL::~CYLINDRICAL()
184 183  
185 184 }
186 185  
187   -void CYLINDRICAL::OnPaint(wxPaintEvent& event)
188   -{
189   - if (EDIT_EXISTING==true) EditExistingCable();
190   -}
191   -
192 186 void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name)
193 187 {
194 188 pathToMOD << Path;
... ... @@ -197,9 +191,6 @@ void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name)
197 191  
198 192 void CYLINDRICAL::OnButton1Click(wxCommandEvent& event)
199 193 {
200   -
201   - if (EDIT_EXISTING==true) EditExistingCable();
202   -
203 194 int IsError = 0;
204 195  
205 196 wxString fileName = TextCtrl1->GetValue();
... ... @@ -543,10 +534,3 @@ void CYLINDRICAL::OnPanel1LeftDClick(wxMouseEvent&amp; event)
543 534 {
544 535 cylindricalSchematic();
545 536 }
546   -
547   -void CYLINDRICAL::EditExistingCable()
548   -{
549   - Close();
550   -}
551   -
552   -
... ...
GUI/SW1/SRC/DCONN.cpp
  Diff comments   View file @f5f47a7
... ... @@ -166,7 +166,6 @@ DCONN::DCONN(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; siz
166 166 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton3Click);
167 167 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPanel1Paint,0,this);
168 168 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&DCONN::OnPanel1LeftDClick,0,this);
169   - Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPaint);
170 169 //*)
171 170  
172 171 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);
... ... @@ -182,11 +181,6 @@ DCONN::~DCONN()
182 181 //*)
183 182 }
184 183  
185   -void DCONN::OnPaint(wxPaintEvent& event)
186   -{
187   - if (EDIT_EXISTING==true) EditExistingCable();
188   -}
189   -
190 184 void DCONN::SetPathToMOD(wxString Path, wxString Name)
191 185 {
192 186  
... ... @@ -592,8 +586,3 @@ void DCONN::OnCheckBox2Click(wxCommandEvent&amp; event)
592 586 }
593 587 WriteCableFile (TextCtrl1->GetValue());
594 588 }
595   -
596   -void DCONN::EditExistingCable()
597   -{
598   - Close();
599   -}
... ...
GUI/SW1/SRC/TP.cpp
  Diff comments   View file @f5f47a7
... ... @@ -215,7 +215,7 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
215 215 FlexGridSizer8->Add(StaticText25, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
216 216 TextCtrl17 = new wxTextCtrl(Panel3, ID_TEXTCTRL17, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL17"));
217 217 FlexGridSizer8->Add(TextCtrl17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
218   - StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26"));
  218 + StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries/m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26"));
219 219 FlexGridSizer8->Add(StaticText26, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
220 220 TextCtrl18 = new wxTextCtrl(Panel3, ID_TEXTCTRL18, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL18"));
221 221 FlexGridSizer8->Add(TextCtrl18, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
... ... @@ -326,7 +326,6 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
326 326 Panel4->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPanel4Paint,0,this);
327 327 Panel4->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TP::OnPanel4LeftDClick,0,this);
328 328 Panel4->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&TP::OnPanel4MouseWheel,0,this);
329   - Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPaint);
330 329 //*)
331 330  
332 331 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
... ... @@ -348,12 +347,6 @@ TP::~TP()
348 347 //*)
349 348 }
350 349  
351   -void TP::OnPaint(wxPaintEvent& event)
352   -{
353   - if (EDIT_EXISTING==true) EditExistingCable();
354   -}
355   -
356   -
357 350 void TP::SetPathToMOD(wxString Path, wxString Name)
358 351 {
359 352  
... ... @@ -1196,8 +1189,3 @@ void TP::OnCheckBox4Click(wxCommandEvent&amp; event)
1196 1189  
1197 1190  
1198 1191 }
1199   -
1200   -void TP::EditExistingCable()
1201   -{
1202   - Close();
1203   -}
... ...
GUI/SW1/SRC/TWINAX.cpp
  Diff comments   View file @f5f47a7
... ... @@ -334,7 +334,6 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
334 334 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TWINAX::OnButton2Click);
335 335 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPanel1Paint,0,this);
336 336 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TWINAX::OnPanel1LeftDClick,0,this);
337   - Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPaint);
338 337 //*)
339 338  
340 339 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this);
... ... @@ -356,11 +355,6 @@ TWINAX::~TWINAX()
356 355 //*)
357 356 }
358 357  
359   -void TWINAX::OnPaint(wxPaintEvent& event)
360   -{
361   - if (EDIT_EXISTING==true) EditExistingCable();
362   -}
363   -
364 358 void TWINAX::SetPathToMOD(wxString Path, wxString Name)
365 359 {
366 360  
... ... @@ -1177,10 +1171,3 @@ void TWINAX::OnCheckBox4Click(wxCommandEvent&amp; event)
1177 1171 }
1178 1172  
1179 1173 }
1180   -
1181   -void TWINAX::EditExistingCable()
1182   -{
1183   - Close();
1184   -}
1185   -
1186   -
... ...