UoN / SACAMOS

Commit 2a0d305e838c2fd15874efeae89359f544adb1f9

Authored by Steve Greedy
1 parent d58d17bb
Exists in master and in 3 other branches nested_overshields, proximity_effects, v4

Modifications to file path structure 

Modifications to file path structure
Showing 29 changed files with 1191 additions and 565 deletions   Show diff stats
Inline Side-by-side
GUI/SW1/SRC/ABOUT.cpp
  Diff comments   View file @2a0d305
@@ -45,16 +45,15 @@ @@ -45,16 +45,15 @@
45 #include <wx/hyperlink.h> 45 #include <wx/hyperlink.h>
46 46
47 //(*InternalHeaders(ABOUT) 47 //(*InternalHeaders(ABOUT)
48 -#include <wx/bitmap.h>  
49 #include <wx/intl.h> 48 #include <wx/intl.h>
50 -#include <wx/image.h>  
51 #include <wx/string.h> 49 #include <wx/string.h>
52 //*) 50 //*)
53 51
54 //(*IdInit(ABOUT) 52 //(*IdInit(ABOUT)
55 const long ABOUT::ID_STATICBITMAP1 = wxNewId(); 53 const long ABOUT::ID_STATICBITMAP1 = wxNewId();
56 -const long ABOUT::ID_TEXTCTRL2 = wxNewId(); 54 +const long ABOUT::ID_PANEL1 = wxNewId();
57 const long ABOUT::ID_TEXTCTRL1 = wxNewId(); 55 const long ABOUT::ID_TEXTCTRL1 = wxNewId();
  56 +const long ABOUT::ID_TEXTCTRL2 = wxNewId();
58 //*) 57 //*)
59 58
60 BEGIN_EVENT_TABLE(ABOUT,wxDialog) 59 BEGIN_EVENT_TABLE(ABOUT,wxDialog)
@@ -73,25 +72,30 @@ ABOUT::ABOUT(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; siz @@ -73,25 +72,30 @@ ABOUT::ABOUT(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; siz
73 Create(parent, wxID_ANY, _("ABOUT SACAMOS"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, _T("wxID_ANY")); 72 Create(parent, wxID_ANY, _("ABOUT SACAMOS"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, _T("wxID_ANY"));
74 FlexGridSizer1 = new wxFlexGridSizer(0, 1, 0, 0); 73 FlexGridSizer1 = new wxFlexGridSizer(0, 1, 0, 0);
75 BoxSizer1 = new wxBoxSizer(wxVERTICAL); 74 BoxSizer1 = new wxBoxSizer(wxVERTICAL);
76 - StaticBitmap1 = new wxStaticBitmap(this, ID_STATICBITMAP1, wxBitmap(wxImage(_T("resources//Sacamos_About.png"))), wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("ID_STATICBITMAP1"));  
77 - BoxSizer1->Add(StaticBitmap1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);  
78 - StaticBoxSizer1 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("BUILD"));  
79 - TextCtrl2 = new wxTextCtrl(this, ID_TEXTCTRL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_AUTO_URL, wxDefaultValidator, _T("ID_TEXTCTRL2"));  
80 - StaticBoxSizer1->Add(TextCtrl2, 1, wxALL|wxEXPAND, 5);  
81 - BoxSizer1->Add(StaticBoxSizer1, 1, wxALL|wxEXPAND, 5); 75 + Panel1 = new wxPanel(this, ID_PANEL1, wxDefaultPosition, wxSize(400,137), wxTAB_TRAVERSAL, _T("ID_PANEL1"));
  76 + StaticBitmap1 = new wxStaticBitmap(Panel1, ID_STATICBITMAP1, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("ID_STATICBITMAP1"));
  77 + BoxSizer1->Add(Panel1, 1, wxALL|wxEXPAND, 5);
82 StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("LICENSE")); 78 StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("LICENSE"));
83 TextCtrl1 = new wxTextCtrl(this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_AUTO_URL|wxTE_WORDWRAP, wxDefaultValidator, _T("ID_TEXTCTRL1")); 79 TextCtrl1 = new wxTextCtrl(this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_AUTO_URL|wxTE_WORDWRAP, wxDefaultValidator, _T("ID_TEXTCTRL1"));
84 StaticBoxSizer2->Add(TextCtrl1, 1, wxALL|wxEXPAND, 5); 80 StaticBoxSizer2->Add(TextCtrl1, 1, wxALL|wxEXPAND, 5);
85 BoxSizer1->Add(StaticBoxSizer2, 1, wxALL|wxEXPAND, 5); 81 BoxSizer1->Add(StaticBoxSizer2, 1, wxALL|wxEXPAND, 5);
  82 + StaticBoxSizer1 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("BUILD"));
  83 + TextCtrl2 = new wxTextCtrl(this, ID_TEXTCTRL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_AUTO_URL, wxDefaultValidator, _T("ID_TEXTCTRL2"));
  84 + StaticBoxSizer1->Add(TextCtrl2, 1, wxALL|wxEXPAND, 5);
  85 + BoxSizer1->Add(StaticBoxSizer1, 1, wxALL|wxEXPAND, 5);
86 FlexGridSizer1->Add(BoxSizer1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); 86 FlexGridSizer1->Add(BoxSizer1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
87 SetSizer(FlexGridSizer1); 87 SetSizer(FlexGridSizer1);
88 FlexGridSizer1->Fit(this); 88 FlexGridSizer1->Fit(this);
89 FlexGridSizer1->SetSizeHints(this); 89 FlexGridSizer1->SetSizeHints(this);
90 90
91 - Connect(ID_TEXTCTRL2,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&ABOUT::OnTextCtrl2Text);  
92 Connect(ID_TEXTCTRL1,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&ABOUT::OnTextCtrl1Text); 91 Connect(ID_TEXTCTRL1,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&ABOUT::OnTextCtrl1Text);
  92 + Connect(ID_TEXTCTRL2,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&ABOUT::OnTextCtrl2Text);
93 Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&ABOUT::OnInit); 93 Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&ABOUT::OnInit);
94 //*) 94 //*)
  95 +
  96 + StaticBitmap1->SetBitmap(wxBitmap(wxImage(_T("resources/Sacamos_About.png"))));
  97 +
  98 +
95 } 99 }
96 100
97 ABOUT::~ABOUT() 101 ABOUT::~ABOUT()
GUI/SW1/SRC/ABOUT.h
  Diff comments   View file @2a0d305
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 //(*Headers(ABOUT) 44 //(*Headers(ABOUT)
45 #include <wx/sizer.h> 45 #include <wx/sizer.h>
46 #include <wx/textctrl.h> 46 #include <wx/textctrl.h>
  47 +#include <wx/panel.h>
47 #include <wx/statbmp.h> 48 #include <wx/statbmp.h>
48 #include <wx/dialog.h> 49 #include <wx/dialog.h>
49 //*) 50 //*)
@@ -57,6 +58,7 @@ class ABOUT: public wxDialog @@ -57,6 +58,7 @@ class ABOUT: public wxDialog
57 58
58 //(*Declarations(ABOUT) 59 //(*Declarations(ABOUT)
59 wxStaticBitmap* StaticBitmap1; 60 wxStaticBitmap* StaticBitmap1;
  61 + wxPanel* Panel1;
60 wxTextCtrl* TextCtrl2; 62 wxTextCtrl* TextCtrl2;
61 wxTextCtrl* TextCtrl1; 63 wxTextCtrl* TextCtrl1;
62 //*) 64 //*)
@@ -68,8 +70,9 @@ class ABOUT: public wxDialog @@ -68,8 +70,9 @@ class ABOUT: public wxDialog
68 70
69 //(*Identifiers(ABOUT) 71 //(*Identifiers(ABOUT)
70 static const long ID_STATICBITMAP1; 72 static const long ID_STATICBITMAP1;
71 - static const long ID_TEXTCTRL2; 73 + static const long ID_PANEL1;
72 static const long ID_TEXTCTRL1; 74 static const long ID_TEXTCTRL1;
  75 + static const long ID_TEXTCTRL2;
73 //*) 76 //*)
74 77
75 private: 78 private:
GUI/SW1/SRC/BUNDLEBLDR.cpp
  Diff comments   View file @2a0d305
@@ -1433,9 +1433,21 @@ void BUNDLEBLDR::WriteBundleFile(wxString fileName) @@ -1433,9 +1433,21 @@ void BUNDLEBLDR::WriteBundleFile(wxString fileName)
1433 if (cableFile.is_open()) 1433 if (cableFile.is_open())
1434 { 1434 {
1435 cableFile << "#MOD_cable_lib_dir" << "\n"; 1435 cableFile << "#MOD_cable_lib_dir" << "\n";
1436 - cableFile <<"../"<< MODname <<"/CABLE/"<<"\n"; 1436 +
  1437 + #ifdef UNIX
  1438 + cableFile <<MODname <<"/CABLE/"<<"\n";
  1439 + #else
  1440 + cableFile <<"../"<< MODname <<"/CABLE/"<<"\n";
  1441 + #endif
  1442 +
1437 cableFile << "#MOD_cable_lib_dir" << "\n"; 1443 cableFile << "#MOD_cable_lib_dir" << "\n";
1438 - cableFile <<"../"<< MODname <<"/BUNDLE/"<<"\n"; 1444 +
  1445 + #ifdef UNIX
  1446 + cableFile <<MODname <<"/BUNDLE/"<<"\n";
  1447 + #else
  1448 + cableFile <<"../"<< MODname <<"/BUNDLE/"<<"\n";
  1449 + #endif
  1450 +
1439 cableFile << ListBox1->GetCount() << " #Number of cables in bundle, cable list follows\n"; 1451 cableFile << ListBox1->GetCount() << " #Number of cables in bundle, cable list follows\n";
1440 1452
1441 bundle_list = bundle_root; 1453 bundle_list = bundle_root;
@@ -1526,11 +1538,21 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event) @@ -1526,11 +1538,21 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event)
1526 1538
1527 WriteBundleFile (TextCtrl1->GetValue()); 1539 WriteBundleFile (TextCtrl1->GetValue());
1528 1540
  1541 + //std::stringstream stream;
  1542 +
  1543 + #ifdef UNIX
  1544 + std::stringstream stream;
  1545 + stream << "./cable_bundle_model_builder"
  1546 + << " "
  1547 + << MODname + "/BUNDLE/"
  1548 + << fileName ;
  1549 + #else
1529 std::stringstream stream; 1550 std::stringstream stream;
1530 stream << "\"..\\BIN\\cable_bundle_model_builder.exe\"" 1551 stream << "\"..\\BIN\\cable_bundle_model_builder.exe\""
1531 << " " 1552 << " "
1532 - << "..\\" + MODname + "\\BUNDLE\" 1553 + << "..\\" + MODname + "\\CABLE\"
1533 << fileName ; 1554 << fileName ;
  1555 + #endif
1534 1556
1535 system(stream.str().c_str()); 1557 system(stream.str().c_str());
1536 1558
GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp
  Diff comments   View file @2a0d305
@@ -116,6 +116,9 @@ void draw_bundle(wxPanel *Panel, wxString Path, wxString bundle_to_draw) @@ -116,6 +116,9 @@ void draw_bundle(wxPanel *Panel, wxString Path, wxString bundle_to_draw)
116 116
117 bundleFile >> xCoord; 117 bundleFile >> xCoord;
118 bundleFile >> yCoord; 118 bundleFile >> yCoord;
  119 +
  120 + yCoord = -1.0 * yCoord;
  121 +
119 std::getline(bundleFile, bundle_str); //Read to end of line 122 std::getline(bundleFile, bundle_str); //Read to end of line
120 123
121 std::ifstream cableFile; 124 std::ifstream cableFile;
GUI/SW1/SRC/COAXIAL.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -307,9 +307,19 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; @@ -307,9 +307,19 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp;
307 Connect(ID_coaxCLOSE,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&COAXIAL::OncoaxCLOSEClick); 307 Connect(ID_coaxCLOSE,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&COAXIAL::OncoaxCLOSEClick);
308 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPanel1Paint,0,this); 308 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPanel1Paint,0,this);
309 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&COAXIAL::OnPanel1LeftDClick,0,this); 309 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&COAXIAL::OnPanel1LeftDClick,0,this);
310 - //Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPaint); 310 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&COAXIAL::OnInit);
  311 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPaint);
311 //*) 312 //*)
  313 +}
312 314
  315 +COAXIAL::~COAXIAL()
  316 +{
  317 + //(*Destroy(COAXIAL)
  318 + //*)
  319 +}
  320 +
  321 +void COAXIAL::OnInit(wxInitDialogEvent& event)
  322 +{
313 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this); 323 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this);
314 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this); 324 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this);
315 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this); 325 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this);
@@ -321,19 +331,10 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; @@ -321,19 +331,10 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp;
321 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this); 331 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this);
322 } 332 }
323 333
324 -COAXIAL::~COAXIAL()  
325 -{  
326 - //(*Destroy(COAXIAL)  
327 - //*)  
328 -}  
329 -  
330 -/*  
331 void COAXIAL::OnPaint(wxPaintEvent& event) 334 void COAXIAL::OnPaint(wxPaintEvent& event)
332 { 335 {
333 if (EDIT_EXISTING==true) EditExistingCable(); 336 if (EDIT_EXISTING==true) EditExistingCable();
334 } 337 }
335 -*/  
336 -  
337 338
338 void COAXIAL::SetPathToMOD(wxString Path, wxString Name) 339 void COAXIAL::SetPathToMOD(wxString Path, wxString Name)
339 { 340 {
@@ -355,7 +356,6 @@ void COAXIAL::OnButton1Click(wxCommandEvent&amp; event) @@ -355,7 +356,6 @@ void COAXIAL::OnButton1Click(wxCommandEvent&amp; event)
355 return; 356 return;
356 } 357 }
357 358
358 -  
359 check_is_empty(TextCtrl4, &IsError); 359 check_is_empty(TextCtrl4, &IsError);
360 check_is_empty(TextCtrl5, &IsError); 360 check_is_empty(TextCtrl5, &IsError);
361 check_is_empty(TextCtrl6, &IsError); 361 check_is_empty(TextCtrl6, &IsError);
@@ -393,18 +393,18 @@ void COAXIAL::OnButton1Click(wxCommandEvent&amp; event) @@ -393,18 +393,18 @@ void COAXIAL::OnButton1Click(wxCommandEvent&amp; event)
393 void COAXIAL::OnButton2Click(wxCommandEvent& event) 393 void COAXIAL::OnButton2Click(wxCommandEvent& event)
394 { 394 {
395 wxString fileName = TextCtrl1->GetValue(); 395 wxString fileName = TextCtrl1->GetValue();
396 - wxString fullFileName;  
397 -  
398 - fullFileName = pathToMOD + "\\CABLE\\" + fileName; 396 + wxString command_line;
399 397
400 std::stringstream stream; 398 std::stringstream stream;
401 399
402 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 400 + stream << "cable_model_builder"
403 << " " 401 << " "
404 << "..\\" + MODname + "\\CABLE\\" 402 << "..\\" + MODname + "\\CABLE\\"
405 << fileName ; 403 << fileName ;
406 404
407 - system(stream.str().c_str()); 405 + command_line << stream.str().c_str();
  406 +
  407 + wxExecute (command_line);
408 408
409 // Display Run Status 409 // Display Run Status
410 RUN_STATUS *run_status = new RUN_STATUS(this); 410 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -560,7 +560,7 @@ void COAXIAL::WriteCableFile(wxString fileName) @@ -560,7 +560,7 @@ void COAXIAL::WriteCableFile(wxString fileName)
560 { 560 {
561 ofstream cableFile; 561 ofstream cableFile;
562 562
563 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 563 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
564 564
565 cableFile.open (fullFileName); 565 cableFile.open (fullFileName);
566 566
@@ -890,12 +890,7 @@ void COAXIAL::OnCheckBox2Click(wxCommandEvent&amp; event) @@ -890,12 +890,7 @@ void COAXIAL::OnCheckBox2Click(wxCommandEvent&amp; event)
890 } 890 }
891 } 891 }
892 892
893 -/*  
894 void COAXIAL::EditExistingCable() 893 void COAXIAL::EditExistingCable()
895 { 894 {
896 Close(); 895 Close();
897 } 896 }
898 -*/  
899 -  
900 -  
901 -  
GUI/SW1/SRC/COAXIAL.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -106,6 +106,9 @@ class COAXIAL: public wxDialog @@ -106,6 +106,9 @@ class COAXIAL: public wxDialog
106 106
107 void WriteCableFile(wxString); 107 void WriteCableFile(wxString);
108 108
  109 + void EditExistingCable();
  110 + bool EDIT_EXISTING;
  111 +
109 void paintNow(); 112 void paintNow();
110 void render(wxDC& dc); 113 void render(wxDC& dc);
111 void coaxialSchematic(); 114 void coaxialSchematic();
@@ -275,6 +278,8 @@ class COAXIAL: public wxDialog @@ -275,6 +278,8 @@ class COAXIAL: public wxDialog
275 void OnCheckBox2Click(wxCommandEvent& event); 278 void OnCheckBox2Click(wxCommandEvent& event);
276 void OnTextCtrl15Text(wxCommandEvent& event); 279 void OnTextCtrl15Text(wxCommandEvent& event);
277 void OnTextCtrl16Text(wxCommandEvent& event); 280 void OnTextCtrl16Text(wxCommandEvent& event);
  281 + void OnPaint(wxPaintEvent& event);
  282 + void OnInit(wxInitDialogEvent& event);
278 //*) 283 //*)
279 284
280 DECLARE_EVENT_TABLE() 285 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/CYLINDRICAL.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -165,16 +165,9 @@ CYLINDRICAL::CYLINDRICAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const @@ -165,16 +165,9 @@ CYLINDRICAL::CYLINDRICAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const
165 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&CYLINDRICAL::OnButton3Click); 165 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&CYLINDRICAL::OnButton3Click);
166 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1Paint,0,this); 166 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1Paint,0,this);
167 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1LeftDClick,0,this); 167 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1LeftDClick,0,this);
  168 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&CYLINDRICAL::OnInit);
168 Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPaint); 169 Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPaint);
169 //*) 170 //*)
170 -  
171 - TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);  
172 - TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);  
173 - TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);  
174 - TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);  
175 - CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);  
176 -  
177 -  
178 } 171 }
179 172
180 CYLINDRICAL::~CYLINDRICAL() 173 CYLINDRICAL::~CYLINDRICAL()
@@ -184,6 +177,15 @@ CYLINDRICAL::~CYLINDRICAL() @@ -184,6 +177,15 @@ CYLINDRICAL::~CYLINDRICAL()
184 177
185 } 178 }
186 179
  180 +void CYLINDRICAL::OnInit(wxInitDialogEvent& event)
  181 +{
  182 + TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
  183 + TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
  184 + TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
  185 + TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
  186 + CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
  187 +}
  188 +
187 void CYLINDRICAL::OnPaint(wxPaintEvent& event) 189 void CYLINDRICAL::OnPaint(wxPaintEvent& event)
188 { 190 {
189 if (EDIT_EXISTING==true) EditExistingCable(); 191 if (EDIT_EXISTING==true) EditExistingCable();
@@ -216,15 +218,7 @@ void CYLINDRICAL::OnButton1Click(wxCommandEvent&amp; event) @@ -216,15 +218,7 @@ void CYLINDRICAL::OnButton1Click(wxCommandEvent&amp; event)
216 check_is_empty(TextCtrl3, &IsError); 218 check_is_empty(TextCtrl3, &IsError);
217 check_is_empty(TextCtrl4, &IsError); 219 check_is_empty(TextCtrl4, &IsError);
218 220
219 - if (CheckBox1->GetValue()){  
220 -// check_is_empty(TextCtrl6, &IsError);  
221 -// check_is_empty(TextCtrl7, &IsError);  
222 -// check_is_empty(TextCtrl8, &IsError);  
223 -// check_is_empty(TextCtrl9, &IsError);  
224 -// check_is_empty(TextCtrl10, &IsError);  
225 - }  
226 - else  
227 - { 221 + if (!CheckBox1->GetValue()){
228 check_is_empty(TextCtrl5, &IsError); 222 check_is_empty(TextCtrl5, &IsError);
229 } 223 }
230 224
@@ -242,24 +236,24 @@ void CYLINDRICAL::OnButton2Click(wxCommandEvent&amp; event) @@ -242,24 +236,24 @@ void CYLINDRICAL::OnButton2Click(wxCommandEvent&amp; event)
242 { 236 {
243 237
244 wxString fileName = TextCtrl1->GetValue(); 238 wxString fileName = TextCtrl1->GetValue();
245 - wxString fineName = fileName; 239 + wxString command_line;
246 240
247 std::stringstream stream; 241 std::stringstream stream;
248 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 242 +
  243 + stream << "cable_model_builder"
249 << " " 244 << " "
250 << "..\\" + MODname + "\\CABLE\\" 245 << "..\\" + MODname + "\\CABLE\\"
251 << fileName ; 246 << fileName ;
252 - //<< "..\\MOD\\CABLE\\" // relative path to MOD  
253 247
  248 + command_line << stream.str().c_str();
254 249
255 - system(stream.str().c_str()); 250 + wxExecute (command_line);
256 251
257 // Display Run Status 252 // Display Run Status
258 RUN_STATUS *run_status = new RUN_STATUS(this); 253 RUN_STATUS *run_status = new RUN_STATUS(this);
259 run_status->ShowModal(); 254 run_status->ShowModal();
260 255
261 Button1->Enable(); 256 Button1->Enable();
262 -  
263 } 257 }
264 258
265 void CYLINDRICAL::OnButton3Click(wxCommandEvent& event) 259 void CYLINDRICAL::OnButton3Click(wxCommandEvent& event)
@@ -305,37 +299,6 @@ void CYLINDRICAL::OnTextCtrl5Text(wxCommandEvent&amp; event) @@ -305,37 +299,6 @@ void CYLINDRICAL::OnTextCtrl5Text(wxCommandEvent&amp; event)
305 check_is_positive (TextCtrl5, &IsError); 299 check_is_positive (TextCtrl5, &IsError);
306 } 300 }
307 301
308 -//void CYLINDRICAL::OnTextCtrl6Text(wxCommandEvent& event)  
309 -//{  
310 -// int IsError = 0;  
311 -// check_is_numeric(TextCtrl6, &IsError);  
312 -// check_is_positive (TextCtrl6, &IsError);  
313 -//}  
314 -//  
315 -//void CYLINDRICAL::OnTextCtrl7Text(wxCommandEvent& event)  
316 -//{  
317 -// int IsError = 0;  
318 -// check_is_numeric(TextCtrl7, &IsError);  
319 -//}  
320 -//  
321 -//void CYLINDRICAL::OnTextCtrl8Text(wxCommandEvent& event)  
322 -//{  
323 -// int IsError = 0;  
324 -// check_is_numeric_list(TextCtrl8, &IsError);  
325 -//}  
326 -//  
327 -//void CYLINDRICAL::OnTextCtrl9Text(wxCommandEvent& event)  
328 -//{  
329 -// int IsError = 0;  
330 -// check_is_numeric(TextCtrl9, &IsError);  
331 -//}  
332 -//  
333 -//void CYLINDRICAL::OnTextCtrl10Text(wxCommandEvent& event)  
334 -//{  
335 -// int IsError = 0;  
336 -// check_is_numeric_list(TextCtrl10, &IsError);  
337 -//}  
338 -  
339 void CYLINDRICAL::OnCheckBox1Click(wxCommandEvent& event) 302 void CYLINDRICAL::OnCheckBox1Click(wxCommandEvent& event)
340 { 303 {
341 if (CheckBox1->GetValue()) 304 if (CheckBox1->GetValue())
@@ -357,24 +320,6 @@ void CYLINDRICAL::OnCheckBox1Click(wxCommandEvent&amp; event) @@ -357,24 +320,6 @@ void CYLINDRICAL::OnCheckBox1Click(wxCommandEvent&amp; event)
357 } 320 }
358 winFD_ESR->Destroy(); 321 winFD_ESR->Destroy();
359 } 322 }
360 -// if (CheckBox1->GetValue())  
361 -// {  
362 -// TextCtrl5->Disable();  
363 -// TextCtrl6->Enable();  
364 -// TextCtrl7->Enable();  
365 -// TextCtrl8->Enable();  
366 -// TextCtrl9->Enable();  
367 -// TextCtrl10->Enable();  
368 -// }  
369 -// else  
370 -// {  
371 -// TextCtrl5->Enable();  
372 -// TextCtrl6->Disable();  
373 -// TextCtrl7->Disable();  
374 -// TextCtrl8->Disable();  
375 -// TextCtrl9->Disable();  
376 -// TextCtrl10->Disable();  
377 -// }  
378 } 323 }
379 324
380 void CYLINDRICAL::WriteCableFile (wxString fileName) 325 void CYLINDRICAL::WriteCableFile (wxString fileName)
@@ -382,7 +327,7 @@ void CYLINDRICAL::WriteCableFile (wxString fileName) @@ -382,7 +327,7 @@ void CYLINDRICAL::WriteCableFile (wxString fileName)
382 327
383 ofstream cableFile; 328 ofstream cableFile;
384 329
385 - wxString fullFileName = pathToMOD + "\\CABLE\\" + fileName + ".cable_spec"; 330 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
386 331
387 cableFile.open (fullFileName); 332 cableFile.open (fullFileName);
388 333
@@ -400,12 +345,6 @@ void CYLINDRICAL::WriteCableFile (wxString fileName) @@ -400,12 +345,6 @@ void CYLINDRICAL::WriteCableFile (wxString fileName)
400 cableFile <<"1 \t\t\t# number of frequency dependent parameters\n"; 345 cableFile <<"1 \t\t\t# number of frequency dependent parameters\n";
401 346
402 if (CheckBox1->GetValue()){ 347 if (CheckBox1->GetValue()){
403 -// cableFile << "# Dielectric relative permittivity model follows\n";  
404 -// cableFile << TextCtrl6->GetValue() <<" # w normalisation constant\n";  
405 -// cableFile << TextCtrl7->GetValue() <<" # a order, a coefficients follow below\n";  
406 -// cableFile << TextCtrl8->GetValue() <<" \n";  
407 -// cableFile << TextCtrl9->GetValue() <<" # b order, b coefficients follow below\n";  
408 -// cableFile << TextCtrl10->GetValue() <<" \n";  
409 cableFile << "# Dielectric relative permittivity model follows\n"; 348 cableFile << "# Dielectric relative permittivity model follows\n";
410 cableFile << FD_ESR6 <<"\t # w normalisation constant\n"; 349 cableFile << FD_ESR6 <<"\t # w normalisation constant\n";
411 cableFile << FD_ESR7 <<"\t # a order, a coefficients follow below\n"; 350 cableFile << FD_ESR7 <<"\t # a order, a coefficients follow below\n";
@@ -549,5 +488,3 @@ void CYLINDRICAL::EditExistingCable() @@ -549,5 +488,3 @@ void CYLINDRICAL::EditExistingCable()
549 { 488 {
550 Close(); 489 Close();
551 } 490 }
552 -  
553 -  
GUI/SW1/SRC/CYLINDRICAL.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -171,6 +171,7 @@ class CYLINDRICAL: public wxDialog @@ -171,6 +171,7 @@ class CYLINDRICAL: public wxDialog
171 void OnTextCtrl1Text(wxCommandEvent& event); 171 void OnTextCtrl1Text(wxCommandEvent& event);
172 void OnPanel1LeftDClick(wxMouseEvent& event); 172 void OnPanel1LeftDClick(wxMouseEvent& event);
173 void OnPaint(wxPaintEvent& event); 173 void OnPaint(wxPaintEvent& event);
  174 + void OnInit(wxInitDialogEvent& event);
174 //*) 175 //*)
175 176
176 DECLARE_EVENT_TABLE() 177 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/DCONN.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -164,22 +164,11 @@ DCONN::DCONN(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; siz @@ -164,22 +164,11 @@ DCONN::DCONN(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; siz
164 Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton1Click); 164 Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton1Click);
165 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton2Click); 165 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton2Click);
166 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton3Click); 166 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton3Click);
167 -/*  
168 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPanel1Paint,0,this); 167 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPanel1Paint,0,this);
169 -*/  
170 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&DCONN::OnPanel1LeftDClick,0,this); 168 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&DCONN::OnPanel1LeftDClick,0,this);
171 -  
172 -/* 169 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&DCONN::OnInit);
173 Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPaint); 170 Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPaint);
174 -*/  
175 -  
176 //*) 171 //*)
177 -  
178 - TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);  
179 - TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);  
180 - TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);  
181 - TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);  
182 -  
183 } 172 }
184 173
185 DCONN::~DCONN() 174 DCONN::~DCONN()
@@ -189,14 +178,20 @@ DCONN::~DCONN() @@ -189,14 +178,20 @@ DCONN::~DCONN()
189 } 178 }
190 179
191 180
192 -/* 181 +void DCONN::OnInit(wxInitDialogEvent& event)
  182 +{
  183 + TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);
  184 + TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);
  185 + TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);
  186 + TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);
  187 +}
  188 +
  189 +
193 void DCONN::OnPaint(wxPaintEvent& event) 190 void DCONN::OnPaint(wxPaintEvent& event)
194 { 191 {
195 if (EDIT_EXISTING==true) EditExistingCable(); 192 if (EDIT_EXISTING==true) EditExistingCable();
196 } 193 }
197 194
198 -*/  
199 -  
200 void DCONN::SetPathToMOD(wxString Path, wxString Name) 195 void DCONN::SetPathToMOD(wxString Path, wxString Name)
201 { 196 {
202 197
@@ -246,15 +241,17 @@ void DCONN::OnButton2Click(wxCommandEvent&amp; event) @@ -246,15 +241,17 @@ void DCONN::OnButton2Click(wxCommandEvent&amp; event)
246 241
247 //CABLE BUIDER 242 //CABLE BUIDER
248 wxString fileName = TextCtrl1->GetValue(); 243 wxString fileName = TextCtrl1->GetValue();
249 - wxString fineName = fileName; 244 + wxString command_line;
250 245
251 std::stringstream stream; 246 std::stringstream stream;
252 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 247 + stream << "cable_model_builder"
253 << " " 248 << " "
254 << "..\\" + MODname + "\\CABLE\\" 249 << "..\\" + MODname + "\\CABLE\\"
255 << fileName ; 250 << fileName ;
256 251
257 - system(stream.str().c_str()); 252 + command_line << stream.str().c_str();
  253 +
  254 + wxExecute (command_line);;
258 255
259 // Display Run Status 256 // Display Run Status
260 RUN_STATUS *run_status = new RUN_STATUS(this); 257 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -330,7 +327,7 @@ void DCONN::WriteCableFile(wxString fileName) @@ -330,7 +327,7 @@ void DCONN::WriteCableFile(wxString fileName)
330 { 327 {
331 ofstream cableFile; 328 ofstream cableFile;
332 329
333 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 330 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
334 331
335 cableFile.open (fullFileName); 332 cableFile.open (fullFileName);
336 333
@@ -595,10 +592,7 @@ void DCONN::OnCheckBox2Click(wxCommandEvent&amp; event) @@ -595,10 +592,7 @@ void DCONN::OnCheckBox2Click(wxCommandEvent&amp; event)
595 WriteCableFile (TextCtrl1->GetValue()); 592 WriteCableFile (TextCtrl1->GetValue());
596 } 593 }
597 594
598 -/*  
599 void DCONN::EditExistingCable() 595 void DCONN::EditExistingCable()
600 { 596 {
601 Close(); 597 Close();
602 } 598 }
603 -  
604 -*/  
GUI/SW1/SRC/DCONN.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -72,32 +72,6 @@ using namespace std; @@ -72,32 +72,6 @@ using namespace std;
72 72
73 #define PI 3.141592653589793 73 #define PI 3.141592653589793
74 74
75 -class dconnSchematicPane : public wxPanel  
76 -{  
77 -  
78 -public:  
79 - dconnSchematicPane(wxFrame* parent);  
80 -  
81 - void paintEvent(wxPaintEvent & evt);  
82 - void paintNow();  
83 -  
84 - void render(wxDC& dc);  
85 -  
86 - // some useful events  
87 - /*  
88 - void mouseMoved(wxMouseEvent& event);  
89 - void mouseDown(wxMouseEvent& event);  
90 - void mouseWheelMoved(wxMouseEvent& event);  
91 - void mouseReleased(wxMouseEvent& event);  
92 - void rightClick(wxMouseEvent& event);  
93 - void mouseLeftWindow(wxMouseEvent& event);  
94 - void keyPressed(wxKeyEvent& event);  
95 - void keyReleased(wxKeyEvent& event);  
96 - */  
97 -  
98 - DECLARE_EVENT_TABLE()  
99 -};  
100 -  
101 class DCONN: public wxDialog 75 class DCONN: public wxDialog
102 { 76 {
103 public: 77 public:
@@ -111,13 +85,12 @@ class DCONN: public wxDialog @@ -111,13 +85,12 @@ class DCONN: public wxDialog
111 85
112 void WriteCableFile(wxString); 86 void WriteCableFile(wxString);
113 87
114 - void paintNow();  
115 - void render(wxDC& dc); 88 + void EditExistingCable();
  89 + bool EDIT_EXISTING;
  90 +
116 void dconnSchematic(); 91 void dconnSchematic();
117 void OnHighlightSchematic(wxCommandEvent & event); 92 void OnHighlightSchematic(wxCommandEvent & event);
118 93
119 - dconnSchematicPane *drawPane;  
120 -  
121 wxString MESH_PARAM1; 94 wxString MESH_PARAM1;
122 wxString MESH_PARAM2; 95 wxString MESH_PARAM2;
123 96
@@ -183,6 +156,8 @@ class DCONN: public wxDialog @@ -183,6 +156,8 @@ class DCONN: public wxDialog
183 void OnPanel1LeftDClick(wxMouseEvent& event); 156 void OnPanel1LeftDClick(wxMouseEvent& event);
184 void OnComboBox1Selected(wxCommandEvent& event); 157 void OnComboBox1Selected(wxCommandEvent& event);
185 void OnCheckBox2Click(wxCommandEvent& event); 158 void OnCheckBox2Click(wxCommandEvent& event);
  159 + void OnPaint(wxPaintEvent& event);
  160 + void OnInit(wxInitDialogEvent& event);
186 //*) 161 //*)
187 162
188 DECLARE_EVENT_TABLE() 163 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/EXPORT_SPICE.cpp
  Diff comments   View file @2a0d305
@@ -172,9 +172,9 @@ void EXPORT_SPICE::OnButton1Click(wxCommandEvent&amp; event) @@ -172,9 +172,9 @@ void EXPORT_SPICE::OnButton1Click(wxCommandEvent&amp; event)
172 size_t i; 172 size_t i;
173 for (i = 0; i <file_to_edit.GetLineCount(); i++) 173 for (i = 0; i <file_to_edit.GetLineCount(); i++)
174 { 174 {
175 - if (file_to_edit[i] == ("file=PATH_TO_TRANSMISSION_LINE_SUB_CIRCUITS/" + file_name + "_NGspice.lib")) 175 + if (file_to_edit[i] == ("file=PATH_TO_TRANSMISSION_LINE_SUB_CIRCUITS/" + file_name + "_Ngspice.lib"))
176 { 176 {
177 - file_to_edit[i] = "file=" + pathToMOD + "\\SPICE\\" + file_name + "_NGspice.lib"; 177 + file_to_edit[i] = "file=" + pathToMOD + "\\SPICE\\" + file_name + "_Ngspice.lib";
178 } 178 }
179 file_to_edit.Write(); 179 file_to_edit.Write();
180 } 180 }
GUI/SW1/SRC/FLEXCABLE.cpp
  Diff comments   View file @2a0d305
@@ -218,15 +218,9 @@ FLEXCABLE::FLEXCABLE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS @@ -218,15 +218,9 @@ FLEXCABLE::FLEXCABLE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
218 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&FLEXCABLE::OnButton3Click); 218 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&FLEXCABLE::OnButton3Click);
219 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&FLEXCABLE::OnPanel1Paint,0,this); 219 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&FLEXCABLE::OnPanel1Paint,0,this);
220 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&FLEXCABLE::OnPanel1LeftDClick,0,this); 220 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&FLEXCABLE::OnPanel1LeftDClick,0,this);
  221 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&FLEXCABLE::OnInit);
221 Connect(wxEVT_PAINT,(wxObjectEventFunction)&FLEXCABLE::OnPaint); 222 Connect(wxEVT_PAINT,(wxObjectEventFunction)&FLEXCABLE::OnPaint);
222 //*) 223 //*)
223 -  
224 - TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);  
225 - TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);  
226 - TextCtrl12->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);  
227 - TextCtrl14->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);  
228 - CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);  
229 - Grid1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);  
230 } 224 }
231 225
232 226
@@ -236,6 +230,17 @@ FLEXCABLE::~FLEXCABLE() @@ -236,6 +230,17 @@ FLEXCABLE::~FLEXCABLE()
236 //*) 230 //*)
237 } 231 }
238 232
  233 +
  234 +void FLEXCABLE::OnInit(wxInitDialogEvent& event)
  235 +{
  236 + TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  237 + TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  238 + TextCtrl12->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  239 + TextCtrl14->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  240 + CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  241 + Grid1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  242 +}
  243 +
239 void FLEXCABLE::OnPaint(wxPaintEvent& event) 244 void FLEXCABLE::OnPaint(wxPaintEvent& event)
240 { 245 {
241 if (EDIT_EXISTING==true) EditExistingCable(); 246 if (EDIT_EXISTING==true) EditExistingCable();
@@ -266,16 +271,7 @@ void FLEXCABLE::OnButton1Click(wxCommandEvent&amp; event) @@ -266,16 +271,7 @@ void FLEXCABLE::OnButton1Click(wxCommandEvent&amp; event)
266 check_is_empty(TextCtrl13, &IsError); 271 check_is_empty(TextCtrl13, &IsError);
267 check_is_empty(TextCtrl14, &IsError); 272 check_is_empty(TextCtrl14, &IsError);
268 273
269 - if (CheckBox1->GetValue())  
270 - {  
271 -// check_is_empty(TextCtrl7, &IsError);  
272 -// check_is_empty(TextCtrl8, &IsError);  
273 -// check_is_empty(TextCtrl9, &IsError);  
274 -// check_is_empty(TextCtrl10, &IsError);  
275 -// check_is_empty(TextCtrl11, &IsError);  
276 - }  
277 -  
278 - else 274 + if (!CheckBox1->GetValue())
279 { 275 {
280 check_is_empty(TextCtrl12, &IsError); 276 check_is_empty(TextCtrl12, &IsError);
281 } 277 }
@@ -310,28 +306,24 @@ void FLEXCABLE::OnCheckBox1Click(wxCommandEvent&amp; event) @@ -310,28 +306,24 @@ void FLEXCABLE::OnCheckBox1Click(wxCommandEvent&amp; event)
310 } 306 }
311 winFD_ESR->Destroy(); 307 winFD_ESR->Destroy();
312 308
313 -  
314 -// TextCtrl7->Enable();  
315 -// TextCtrl8->Enable();  
316 -// TextCtrl9->Enable();  
317 -// TextCtrl10->Enable();  
318 -// TextCtrl11->Enable();  
319 -  
320 } 309 }
321 310
322 void FLEXCABLE::OnButton2Click(wxCommandEvent& event) 311 void FLEXCABLE::OnButton2Click(wxCommandEvent& event)
323 { 312 {
324 //CABLE BUIDER 313 //CABLE BUIDER
325 wxString fileName = TextCtrl1->GetValue(); 314 wxString fileName = TextCtrl1->GetValue();
326 - wxString fineName = fileName; 315 + wxString command_line;
327 316
328 std::stringstream stream; 317 std::stringstream stream;
329 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 318 +
  319 + stream << "cable_model_builder"
330 << " " 320 << " "
331 << "..\\" + MODname + "\\CABLE\\" 321 << "..\\" + MODname + "\\CABLE\\"
332 << fileName ; 322 << fileName ;
333 323
334 - system(stream.str().c_str()); 324 + command_line << stream.str().c_str();
  325 +
  326 + wxExecute (command_line);
335 327
336 // Display Run Status 328 // Display Run Status
337 RUN_STATUS *run_status = new RUN_STATUS(this); 329 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -400,39 +392,6 @@ void FLEXCABLE::OnTextCtrl12Text(wxCommandEvent&amp; event) @@ -400,39 +392,6 @@ void FLEXCABLE::OnTextCtrl12Text(wxCommandEvent&amp; event)
400 check_is_positive(TextCtrl2, &IsError); 392 check_is_positive(TextCtrl2, &IsError);
401 } 393 }
402 394
403 -//void FLEXCABLE::OnTextCtrl7Text(wxCommandEvent& event)  
404 -//{  
405 -// int IsError = 0;  
406 -// check_is_numeric(TextCtrl7, &IsError);  
407 -// check_is_positive(TextCtrl7, &IsError);  
408 -//}  
409 -//  
410 -//void FLEXCABLE::OnTextCtrl8Text(wxCommandEvent& event)  
411 -//{  
412 -// int IsError = 0;  
413 -// check_is_numeric(TextCtrl8, &IsError);  
414 -// check_is_positive(TextCtrl8, &IsError);  
415 -//}  
416 -//  
417 -//void FLEXCABLE::OnTextCtrl9Text(wxCommandEvent& event)  
418 -//{  
419 -// int IsError = 0;  
420 -// check_is_numeric_list(TextCtrl9, &IsError);  
421 -//}  
422 -//  
423 -//void FLEXCABLE::OnTextCtrl10Text(wxCommandEvent& event)  
424 -//{  
425 -// int IsError = 0;  
426 -// check_is_numeric(TextCtrl10, &IsError);  
427 -// check_is_positive(TextCtrl10, &IsError);  
428 -//}  
429 -  
430 -//void FLEXCABLE::OnTextCtrl11Text(wxCommandEvent& event)  
431 -//{  
432 -// int IsError = 0;  
433 -// check_is_numeric_list(TextCtrl11, &IsError);  
434 -//}  
435 -  
436 void FLEXCABLE::OnTextCtrl13Text(wxCommandEvent& event) 395 void FLEXCABLE::OnTextCtrl13Text(wxCommandEvent& event)
437 { 396 {
438 int IsError = 0; 397 int IsError = 0;
@@ -458,7 +417,7 @@ void FLEXCABLE::WriteCableFile (wxString fileName) @@ -458,7 +417,7 @@ void FLEXCABLE::WriteCableFile (wxString fileName)
458 { 417 {
459 ofstream cableFile; 418 ofstream cableFile;
460 419
461 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 420 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
462 421
463 cableFile.open (fullFileName); 422 cableFile.open (fullFileName);
464 423
@@ -936,3 +895,4 @@ void FLEXCABLE::OnCheckBox3Click(wxCommandEvent&amp; event) @@ -936,3 +895,4 @@ void FLEXCABLE::OnCheckBox3Click(wxCommandEvent&amp; event)
936 } 895 }
937 WriteCableFile (TextCtrl1->GetValue()); 896 WriteCableFile (TextCtrl1->GetValue());
938 } 897 }
  898 +
GUI/SW1/SRC/FLEXCABLE.h
  Diff comments   View file @2a0d305
@@ -198,6 +198,7 @@ class FLEXCABLE: public wxDialog @@ -198,6 +198,7 @@ class FLEXCABLE: public wxDialog
198 void OnTextCtrl13TextEnter(wxCommandEvent& event); 198 void OnTextCtrl13TextEnter(wxCommandEvent& event);
199 void OnGrid1CellLeftClick(wxGridEvent& event); 199 void OnGrid1CellLeftClick(wxGridEvent& event);
200 void OnCheckBox3Click1(wxCommandEvent& event); 200 void OnCheckBox3Click1(wxCommandEvent& event);
  201 + void OnInit(wxInitDialogEvent& event);
201 //*) 202 //*)
202 203
203 DECLARE_EVENT_TABLE() 204 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/OVERSHIELD.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -175,26 +175,36 @@ OVERSHIELD::OVERSHIELD(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const w @@ -175,26 +175,36 @@ OVERSHIELD::OVERSHIELD(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const w
175 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&OVERSHIELD::OnButton3Click); 175 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&OVERSHIELD::OnButton3Click);
176 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&OVERSHIELD::OnPanel1Paint,0,this); 176 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&OVERSHIELD::OnPanel1Paint,0,this);
177 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&OVERSHIELD::OnPanel1LeftDClick,0,this); 177 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&OVERSHIELD::OnPanel1LeftDClick,0,this);
  178 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&OVERSHIELD::OnInit);
  179 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&OVERSHIELD::OnPaint);
178 //*) 180 //*)
  181 +}
179 182
  183 +OVERSHIELD::~OVERSHIELD()
  184 +{
  185 + //(*Destroy(OVERSHIELD)
  186 + //*)
  187 +}
  188 +
  189 +
  190 +void OVERSHIELD::OnInit(wxInitDialogEvent& event)
  191 +{
180 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this); 192 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this);
181 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this); 193 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this);
182 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this); 194 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this);
183 TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this); 195 TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&OVERSHIELD::OnHighlightSchematic, this);
184 } 196 }
185 197
186 -OVERSHIELD::~OVERSHIELD() 198 +void OVERSHIELD::OnPaint(wxPaintEvent& event)
187 { 199 {
188 - //(*Destroy(OVERSHIELD)  
189 - //*) 200 + if (EDIT_EXISTING==true) EditExistingCable();
190 } 201 }
191 202
  203 +
192 void OVERSHIELD::SetPathToMOD(wxString Path, wxString Name) 204 void OVERSHIELD::SetPathToMOD(wxString Path, wxString Name)
193 { 205 {
194 -  
195 pathToMOD << Path; 206 pathToMOD << Path;
196 MODname << Name; 207 MODname << Name;
197 -  
198 } 208 }
199 209
200 void OVERSHIELD::OnButton1Click(wxCommandEvent& event) 210 void OVERSHIELD::OnButton1Click(wxCommandEvent& event)
@@ -241,15 +251,17 @@ void OVERSHIELD::OnButton2Click(wxCommandEvent&amp; event) @@ -241,15 +251,17 @@ void OVERSHIELD::OnButton2Click(wxCommandEvent&amp; event)
241 251
242 //CABLE BUIDER 252 //CABLE BUIDER
243 wxString fileName = TextCtrl1->GetValue(); 253 wxString fileName = TextCtrl1->GetValue();
244 - wxString fineName = fileName; 254 + wxString command_line;
245 255
246 std::stringstream stream; 256 std::stringstream stream;
247 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 257 + stream << "cable_model_builder"
248 << " " 258 << " "
249 << "..\\" + MODname + "\\CABLE\\" 259 << "..\\" + MODname + "\\CABLE\\"
250 << fileName ; 260 << fileName ;
251 261
252 - system(stream.str().c_str()); 262 + command_line << stream.str().c_str();
  263 +
  264 + wxExecute (command_line);
253 265
254 // Display Run Status 266 // Display Run Status
255 RUN_STATUS *run_status = new RUN_STATUS(this); 267 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -320,7 +332,7 @@ void OVERSHIELD::WriteCableFile (wxString fileName) @@ -320,7 +332,7 @@ void OVERSHIELD::WriteCableFile (wxString fileName)
320 { 332 {
321 ofstream cableFile; 333 ofstream cableFile;
322 334
323 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 335 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
324 336
325 cableFile.open (fullFileName); 337 cableFile.open (fullFileName);
326 338
@@ -433,3 +445,10 @@ void OVERSHIELD::OnPanel1LeftDClick(wxMouseEvent&amp; event) @@ -433,3 +445,10 @@ void OVERSHIELD::OnPanel1LeftDClick(wxMouseEvent&amp; event)
433 { 445 {
434 overshieldSchematic(); 446 overshieldSchematic();
435 } 447 }
  448 +
  449 +void OVERSHIELD::EditExistingCable()
  450 +{
  451 + Close();
  452 +}
  453 +
  454 +
GUI/SW1/SRC/OVERSHIELD.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -67,33 +67,6 @@ @@ -67,33 +67,6 @@
67 67
68 using namespace std; 68 using namespace std;
69 69
70 -  
71 -class overshieldSchematicPane : public wxPanel  
72 -{  
73 -  
74 -public:  
75 - overshieldSchematicPane(wxFrame* parent);  
76 -  
77 - void paintEvent(wxPaintEvent & evt);  
78 - void paintNow();  
79 -  
80 - void render(wxDC& dc);  
81 -  
82 - // some useful events  
83 - /*  
84 - void mouseMoved(wxMouseEvent& event);  
85 - void mouseDown(wxMouseEvent& event);  
86 - void mouseWheelMoved(wxMouseEvent& event);  
87 - void mouseReleased(wxMouseEvent& event);  
88 - void rightClick(wxMouseEvent& event);  
89 - void mouseLeftWindow(wxMouseEvent& event);  
90 - void keyPressed(wxKeyEvent& event);  
91 - void keyReleased(wxKeyEvent& event);  
92 - */  
93 -  
94 - DECLARE_EVENT_TABLE()  
95 -};  
96 -  
97 class OVERSHIELD: public wxDialog 70 class OVERSHIELD: public wxDialog
98 { 71 {
99 public: 72 public:
@@ -108,12 +81,12 @@ class OVERSHIELD: public wxDialog @@ -108,12 +81,12 @@ class OVERSHIELD: public wxDialog
108 81
109 void WriteCableFile(wxString); 82 void WriteCableFile(wxString);
110 83
111 - void paintNow();  
112 - void render(wxDC& dc); 84 + void EditExistingCable();
  85 + bool EDIT_EXISTING;
  86 +
113 void overshieldSchematic(); 87 void overshieldSchematic();
114 void OnHighlightSchematic(wxCommandEvent & event); 88 void OnHighlightSchematic(wxCommandEvent & event);
115 89
116 - overshieldSchematicPane *drawPane;  
117 90
118 //(*Declarations(OVERSHIELD) 91 //(*Declarations(OVERSHIELD)
119 wxStaticText* StaticText9; 92 wxStaticText* StaticText9;
@@ -183,6 +156,8 @@ class OVERSHIELD: public wxDialog @@ -183,6 +156,8 @@ class OVERSHIELD: public wxDialog
183 void OnTextCtrl9Text(wxCommandEvent& event); 156 void OnTextCtrl9Text(wxCommandEvent& event);
184 void OnPanel1Paint(wxPaintEvent& event); 157 void OnPanel1Paint(wxPaintEvent& event);
185 void OnPanel1LeftDClick(wxMouseEvent& event); 158 void OnPanel1LeftDClick(wxMouseEvent& event);
  159 + void OnPaint(wxPaintEvent& event);
  160 + void OnInit(wxInitDialogEvent& event);
186 //*) 161 //*)
187 162
188 DECLARE_EVENT_TABLE() 163 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/SPACEWIRE.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -358,9 +358,20 @@ SPACEWIRE::SPACEWIRE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS @@ -358,9 +358,20 @@ SPACEWIRE::SPACEWIRE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
358 Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton1Click); 358 Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton1Click);
359 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton2Click); 359 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton2Click);
360 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton3Click); 360 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton3Click);
  361 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&SPACEWIRE::OnInit);
361 Connect(wxEVT_PAINT,(wxObjectEventFunction)&SPACEWIRE::OnPaint); 362 Connect(wxEVT_PAINT,(wxObjectEventFunction)&SPACEWIRE::OnPaint);
362 //*) 363 //*)
  364 +}
363 365
  366 +SPACEWIRE::~SPACEWIRE()
  367 +{
  368 + //(*Destroy(SPACEWIRE)
  369 + //*)
  370 +}
  371 +
  372 +
  373 +void SPACEWIRE::OnInit(wxInitDialogEvent& event)
  374 +{
364 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this); 375 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this);
365 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this); 376 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this);
366 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this); 377 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this);
@@ -380,12 +391,6 @@ SPACEWIRE::SPACEWIRE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS @@ -380,12 +391,6 @@ SPACEWIRE::SPACEWIRE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
380 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this); 391 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this);
381 } 392 }
382 393
383 -SPACEWIRE::~SPACEWIRE()  
384 -{  
385 - //(*Destroy(SPACEWIRE)  
386 - //*)  
387 -}  
388 -  
389 void SPACEWIRE::OnPaint(wxPaintEvent& event) 394 void SPACEWIRE::OnPaint(wxPaintEvent& event)
390 { 395 {
391 if (EDIT_EXISTING==true) EditExistingCable(); 396 if (EDIT_EXISTING==true) EditExistingCable();
@@ -492,13 +497,6 @@ void SPACEWIRE::OnCheckBox1Click(wxCommandEvent&amp; event) @@ -492,13 +497,6 @@ void SPACEWIRE::OnCheckBox1Click(wxCommandEvent&amp; event)
492 FD_Fmin = winFD_ESR->TextCtrl17->GetValue(); 497 FD_Fmin = winFD_ESR->TextCtrl17->GetValue();
493 FD_Fmax = winFD_ESR->TextCtrl18->GetValue(); 498 FD_Fmax = winFD_ESR->TextCtrl18->GetValue();
494 FD_Num = winFD_ESR->TextCtrl19->GetValue(); 499 FD_Num = winFD_ESR->TextCtrl19->GetValue();
495 -  
496 -  
497 -// FD_ORDER = winFD_ESR->TextCtrl11->GetValue();  
498 -// FD_lin = winFD_ESR->RadioButton1->GetValue();  
499 -// FD_Fmin = winFD_ESR->TextCtrl12->GetValue();  
500 -// FD_Fmax = winFD_ESR->TextCtrl12->GetValue();  
501 -// FD_Num = winFD_ESR->TextCtrl12->GetValue();  
502 } 500 }
503 winFD_ESR->Destroy(); 501 winFD_ESR->Destroy();
504 } 502 }
@@ -510,17 +508,17 @@ void SPACEWIRE::OnButton2Click(wxCommandEvent&amp; event) @@ -510,17 +508,17 @@ void SPACEWIRE::OnButton2Click(wxCommandEvent&amp; event)
510 508
511 //CABLE BUIDER 509 //CABLE BUIDER
512 wxString fileName = TextCtrl1->GetValue(); 510 wxString fileName = TextCtrl1->GetValue();
513 - wxString fineName = fileName; 511 + wxString command_line;
514 512
515 std::stringstream stream; 513 std::stringstream stream;
516 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 514 + stream << "cable_model_builder"
517 << " " 515 << " "
518 << "..\\" + MODname + "\\CABLE\\" 516 << "..\\" + MODname + "\\CABLE\\"
519 << fileName ; 517 << fileName ;
520 518
521 - system(stream.str().c_str()); 519 + command_line << stream.str().c_str();
522 520
523 - ifstream runStatus; 521 + wxExecute (command_line);
524 522
525 // Display Run Status 523 // Display Run Status
526 RUN_STATUS *run_status = new RUN_STATUS(this); 524 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -861,7 +859,7 @@ void SPACEWIRE::WriteCableFile (wxString fileName) @@ -861,7 +859,7 @@ void SPACEWIRE::WriteCableFile (wxString fileName)
861 859
862 ofstream cableFile; 860 ofstream cableFile;
863 861
864 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 862 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
865 863
866 cableFile.open (fullFileName); 864 cableFile.open (fullFileName);
867 865
@@ -1651,3 +1649,4 @@ void SPACEWIRE::EditExistingCable() @@ -1651,3 +1649,4 @@ void SPACEWIRE::EditExistingCable()
1651 { 1649 {
1652 Close(); 1650 Close();
1653 } 1651 }
  1652 +
GUI/SW1/SRC/SPACEWIRE.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -304,6 +304,7 @@ class SPACEWIRE: public wxDialog @@ -304,6 +304,7 @@ class SPACEWIRE: public wxDialog
304 void OnCheckBox3Click(wxCommandEvent& event); 304 void OnCheckBox3Click(wxCommandEvent& event);
305 void OnTextCtrl28Text(wxCommandEvent& event); 305 void OnTextCtrl28Text(wxCommandEvent& event);
306 void OnPaint(wxPaintEvent& event); 306 void OnPaint(wxPaintEvent& event);
  307 + void OnInit(wxInitDialogEvent& event);
307 //*) 308 //*)
308 309
309 DECLARE_EVENT_TABLE() 310 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/SPICEMODEL.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -284,6 +284,7 @@ SPICEMODEL::SPICEMODEL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const w @@ -284,6 +284,7 @@ SPICEMODEL::SPICEMODEL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const w
284 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPICEMODEL::OnButton2Click); 284 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPICEMODEL::OnButton2Click);
285 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPICEMODEL::OnButton3Click); 285 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPICEMODEL::OnButton3Click);
286 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&SPICEMODEL::OnPanel1Paint,0,this); 286 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&SPICEMODEL::OnPanel1Paint,0,this);
  287 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&SPICEMODEL::OnInit);
287 //*) 288 //*)
288 } 289 }
289 290
@@ -293,6 +294,10 @@ SPICEMODEL::~SPICEMODEL() @@ -293,6 +294,10 @@ SPICEMODEL::~SPICEMODEL()
293 //*) 294 //*)
294 } 295 }
295 296
  297 +void SPICEMODEL::OnInit(wxInitDialogEvent& event)
  298 +{
  299 +}
  300 +
296 void SPICEMODEL::SetPathToMOD(wxString Path, wxString Name) 301 void SPICEMODEL::SetPathToMOD(wxString Path, wxString Name)
297 { 302 {
298 PathToMOD << Path; 303 PathToMOD << Path;
@@ -388,7 +393,7 @@ void SPICEMODEL::OnButton2Click(wxCommandEvent&amp; event) @@ -388,7 +393,7 @@ void SPICEMODEL::OnButton2Click(wxCommandEvent&amp; event)
388 //wxString fineName = fileName; 393 //wxString fineName = fileName;
389 394
390 std::stringstream stream; 395 std::stringstream stream;
391 - stream << "\"..\\BIN\\spice_cable_bundle_model_builder.exe\"" 396 + stream << "\"..\\BIN\\spice_cable_bundle_model_builder\""
392 << " " 397 << " "
393 << "..\\" + MODname + "\\SPICE\\" 398 << "..\\" + MODname + "\\SPICE\\"
394 << fileName; 399 << fileName;
GUI/SW1/SRC/SPICEMODEL.h
  Diff comments   View file @2a0d305
@@ -218,6 +218,7 @@ class SPICEMODEL: public wxDialog @@ -218,6 +218,7 @@ class SPICEMODEL: public wxDialog
218 void OnNotebook1PageChanged(wxNotebookEvent& event); 218 void OnNotebook1PageChanged(wxNotebookEvent& event);
219 void OnNotebook1PageChanged1(wxNotebookEvent& event); 219 void OnNotebook1PageChanged1(wxNotebookEvent& event);
220 void OnTextCtrl13Text1(wxCommandEvent& event); 220 void OnTextCtrl13Text1(wxCommandEvent& event);
  221 + void OnInit(wxInitDialogEvent& event);
221 //*) 222 //*)
222 223
223 void PopulateTheDirectoryTree ( wxString); 224 void PopulateTheDirectoryTree ( wxString);
GUI/SW1/SRC/SW1_GUI.depend
  Diff comments   View file @2a0d305
@@ -5541,23 +5541,22 @@ @@ -5541,23 +5541,22 @@
5541 <wx/intl.h> 5541 <wx/intl.h>
5542 <wx/string.h> 5542 <wx/string.h>
5543 5543
5544 -1512938044 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.cpp2\local_sw1\about.cpp 5544 +1533748199 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.cpp2\local_sw1\about.cpp
5545 "ABOUT.h" 5545 "ABOUT.h"
5546 <wx/textfile.h> 5546 <wx/textfile.h>
5547 <wx/msgdlg.h> 5547 <wx/msgdlg.h>
5548 <wx/hyperlink.h> 5548 <wx/hyperlink.h>
5549 - <wx/bitmap.h>  
5550 <wx/intl.h> 5549 <wx/intl.h>
5551 - <wx/image.h>  
5552 <wx/string.h> 5550 <wx/string.h>
5553 5551
5554 -1502693582 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.h2\local_sw1\about.h 5552 +1533746579 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.h2\local_sw1\about.h
5555 <wx/sizer.h> 5553 <wx/sizer.h>
5556 <wx/textctrl.h> 5554 <wx/textctrl.h>
  5555 + <wx/panel.h>
5557 <wx/statbmp.h> 5556 <wx/statbmp.h>
5558 <wx/dialog.h> 5557 <wx/dialog.h>
5559 5558
5560 -1530399384 source:c:\users\eezsg\desktop\sacamos_july_20184 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp2\local_sw1\bundle_schematic.cpp 5559 +1530874924 source:c:\users\eezsg\desktop\sacamos_july_20184 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp2\local_sw1\bundle_schematic.cpp
5561 "BUNDLE_SCHEMATIC.h" 5560 "BUNDLE_SCHEMATIC.h"
5562 5561
5563 1502693582 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h 5562 1502693582 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h
@@ -5569,7 +5568,7 @@ @@ -5569,7 +5568,7 @@
5569 <sstream> 5568 <sstream>
5570 <cmath> 5569 <cmath>
5571 5570
5572 -1530740294 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.cpp2\local_sw1\bundlebldr.cpp 5571 +1533124608 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.cpp2\local_sw1\bundlebldr.cpp
5573 "BUNDLEBLDR.h" 5572 "BUNDLEBLDR.h"
5574 "PLACE_CABLE.h" 5573 "PLACE_CABLE.h"
5575 "MESH_LAPLACE.h" 5574 "MESH_LAPLACE.h"
@@ -5666,14 +5665,14 @@ @@ -5666,14 +5665,14 @@
5666 <fstream> 5665 <fstream>
5667 <sstream> 5666 <sstream>
5668 5667
5669 -1530175204 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.cpp2\local_sw1\coaxial.cpp 5668 +1533825182 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.cpp2\local_sw1\coaxial.cpp
5670 "COAXIAL.h" 5669 "COAXIAL.h"
5671 <wx/settings.h> 5670 <wx/settings.h>
5672 <wx/font.h> 5671 <wx/font.h>
5673 <wx/intl.h> 5672 <wx/intl.h>
5674 <wx/string.h> 5673 <wx/string.h>
5675 5674
5676 -1514832982 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.h2\local_sw1\coaxial.h 5675 +1533825101 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.h2\local_sw1\coaxial.h
5677 <wx/notebook.h> 5676 <wx/notebook.h>
5678 <wx/sizer.h> 5677 <wx/sizer.h>
5679 <wx/stattext.h> 5678 <wx/stattext.h>
@@ -5712,13 +5711,13 @@ @@ -5712,13 +5711,13 @@
5712 <wx/button.h> 5711 <wx/button.h>
5713 <wx/dialog.h> 5712 <wx/dialog.h>
5714 5713
5715 -1530723822 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.cpp2\local_sw1\cylindrical.cpp 5714 +1533825320 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.cpp2\local_sw1\cylindrical.cpp
5716 "CYLINDRICAL.h" 5715 "CYLINDRICAL.h"
5717 <wx/settings.h> 5716 <wx/settings.h>
5718 <wx/intl.h> 5717 <wx/intl.h>
5719 <wx/string.h> 5718 <wx/string.h>
5720 5719
5721 -1530723822 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.h2\local_sw1\cylindrical.h 5720 +1533823895 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.h2\local_sw1\cylindrical.h
5722 <wx/sizer.h> 5721 <wx/sizer.h>
5723 <wx/stattext.h> 5722 <wx/stattext.h>
5724 <wx/textctrl.h> 5723 <wx/textctrl.h>
@@ -5735,13 +5734,13 @@ @@ -5735,13 +5734,13 @@
5735 <fstream> 5734 <fstream>
5736 <sstream> 5735 <sstream>
5737 5736
5738 -1530716864 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.cpp2\local_sw1\dconn.cpp 5737 +1533829935 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.cpp2\local_sw1\dconn.cpp
5739 "DCONN.h" 5738 "DCONN.h"
5740 <wx/settings.h> 5739 <wx/settings.h>
5741 <wx/intl.h> 5740 <wx/intl.h>
5742 <wx/string.h> 5741 <wx/string.h>
5743 5742
5744 -1514918482 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.h2\local_sw1\dconn.h 5743 +1533829856 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.h2\local_sw1\dconn.h
5745 <wx/sizer.h> 5744 <wx/sizer.h>
5746 <wx/stattext.h> 5745 <wx/stattext.h>
5747 <wx/textctrl.h> 5746 <wx/textctrl.h>
@@ -5760,7 +5759,7 @@ @@ -5760,7 +5759,7 @@
5760 <fstream> 5759 <fstream>
5761 <sstream> 5760 <sstream>
5762 5761
5763 -1508706938 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.cpp2\local_sw1\export_spice.cpp 5762 +1530874672 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.cpp2\local_sw1\export_spice.cpp
5764 "EXPORT_SPICE.h" 5763 "EXPORT_SPICE.h"
5765 <wx/intl.h> 5764 <wx/intl.h>
5766 <wx/string.h> 5765 <wx/string.h>
@@ -5838,7 +5837,7 @@ @@ -5838,7 +5837,7 @@
5838 <direct.h> 5837 <direct.h>
5839 "dos.h" 5838 "dos.h"
5840 5839
5841 -1530740316 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp2\local_sw1\mesh_laplace.cpp 5840 +1530802204 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp2\local_sw1\mesh_laplace.cpp
5842 "MESH_LAPLACE.h" 5841 "MESH_LAPLACE.h"
5843 5842
5844 1530714886 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp 5843 1530714886 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp
@@ -5847,13 +5846,13 @@ @@ -5847,13 +5846,13 @@
5847 <wx/intl.h> 5846 <wx/intl.h>
5848 <wx/string.h> 5847 <wx/string.h>
5849 5848
5850 -1514917242 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.cpp2\local_sw1\overshield.cpp 5849 +1531159069 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.cpp2\local_sw1\overshield.cpp
5851 "OVERSHIELD.h" 5850 "OVERSHIELD.h"
5852 <wx/settings.h> 5851 <wx/settings.h>
5853 <wx/intl.h> 5852 <wx/intl.h>
5854 <wx/string.h> 5853 <wx/string.h>
5855 5854
5856 -1514918530 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.h2\local_sw1\overshield.h 5855 +1533829967 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.h2\local_sw1\overshield.h
5857 <wx/sizer.h> 5856 <wx/sizer.h>
5858 <wx/stattext.h> 5857 <wx/stattext.h>
5859 <wx/textctrl.h> 5858 <wx/textctrl.h>
@@ -5882,13 +5881,13 @@ @@ -5882,13 +5881,13 @@
5882 <wx/intl.h> 5881 <wx/intl.h>
5883 <wx/string.h> 5882 <wx/string.h>
5884 5883
5885 -1530724588 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.cpp2\local_sw1\spacewire.cpp 5884 +1533827895 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.cpp2\local_sw1\spacewire.cpp
5886 "SPACEWIRE.h" 5885 "SPACEWIRE.h"
5887 <wx/settings.h> 5886 <wx/settings.h>
5888 <wx/intl.h> 5887 <wx/intl.h>
5889 <wx/string.h> 5888 <wx/string.h>
5890 5889
5891 -1530724620 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.h2\local_sw1\spacewire.h 5890 +1533827965 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.h2\local_sw1\spacewire.h
5892 <wx/notebook.h> 5891 <wx/notebook.h>
5893 <wx/sizer.h> 5892 <wx/sizer.h>
5894 <wx/stattext.h> 5893 <wx/stattext.h>
@@ -5909,7 +5908,7 @@ @@ -5909,7 +5908,7 @@
5909 <fstream> 5908 <fstream>
5910 <sstream> 5909 <sstream>
5911 5910
5912 -1509492344 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.cpp2\local_sw1\spicemodel.cpp 5911 +1533827776 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.cpp2\local_sw1\spicemodel.cpp
5913 "SPICEMODEL.h" 5912 "SPICEMODEL.h"
5914 <wx/filename.h> 5913 <wx/filename.h>
5915 <wx/dcclient.h> 5914 <wx/dcclient.h>
@@ -5922,7 +5921,7 @@ @@ -5922,7 +5921,7 @@
5922 <wx/intl.h> 5921 <wx/intl.h>
5923 <wx/string.h> 5922 <wx/string.h>
5924 5923
5925 -1509486246 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h2\local_sw1\spicemodel.h 5924 +1533827724 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h2\local_sw1\spicemodel.h
5926 <wx/notebook.h> 5925 <wx/notebook.h>
5927 <wx/sizer.h> 5926 <wx/sizer.h>
5928 <wx/stattext.h> 5927 <wx/stattext.h>
@@ -5950,7 +5949,7 @@ @@ -5950,7 +5949,7 @@
5950 1502693570 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h 5949 1502693570 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h
5951 <wx/app.h> 5950 <wx/app.h>
5952 5951
5953 -1514922396 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.h2\local_sw1\sw1_guimain.h 5952 +1533743085 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.h2\local_sw1\sw1_guimain.h
5954 <wx/sizer.h> 5953 <wx/sizer.h>
5955 <wx/menu.h> 5954 <wx/menu.h>
5956 <wx/panel.h> 5955 <wx/panel.h>
@@ -5986,7 +5985,7 @@ @@ -5986,7 +5985,7 @@
5986 <fstream> 5985 <fstream>
5987 <string> 5986 <string>
5988 5987
5989 -1530719970 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.h2\local_sw1\twinax.h 5988 +1533827355 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.h2\local_sw1\twinax.h
5990 <wx/notebook.h> 5989 <wx/notebook.h>
5991 <wx/sizer.h> 5990 <wx/sizer.h>
5992 <wx/stattext.h> 5991 <wx/stattext.h>
@@ -6008,7 +6007,7 @@ @@ -6008,7 +6007,7 @@
6008 <fstream> 6007 <fstream>
6009 <sstream> 6008 <sstream>
6010 6009
6011 -1530722668 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.h2\local_sw1\utp.h 6010 +1533825911 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.h2\local_sw1\utp.h
6012 <wx/notebook.h> 6011 <wx/notebook.h>
6013 <wx/sizer.h> 6012 <wx/sizer.h>
6014 <wx/stattext.h> 6013 <wx/stattext.h>
@@ -6030,7 +6029,7 @@ @@ -6030,7 +6029,7 @@
6030 <sstream> 6029 <sstream>
6031 <stdio.h> 6030 <stdio.h>
6032 6031
6033 -1530722646 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.h2\local_sw1\tp.h 6032 +1533825961 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.h2\local_sw1\tp.h
6034 <wx/notebook.h> 6033 <wx/notebook.h>
6035 <wx/sizer.h> 6034 <wx/sizer.h>
6036 <wx/stattext.h> 6035 <wx/stattext.h>
@@ -6052,7 +6051,7 @@ @@ -6052,7 +6051,7 @@
6052 <fstream> 6051 <fstream>
6053 <sstream> 6052 <sstream>
6054 6053
6055 -1530714758 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h2\local_sw1\flexcable.h 6054 +1533827985 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h2\local_sw1\flexcable.h
6056 <wx/notebook.h> 6055 <wx/notebook.h>
6057 <wx/sizer.h> 6056 <wx/sizer.h>
6058 <wx/stattext.h> 6057 <wx/stattext.h>
@@ -6074,22 +6073,19 @@ @@ -6074,22 +6073,19 @@
6074 <fstream> 6073 <fstream>
6075 <sstream> 6074 <sstream>
6076 6075
6077 -1514923368 source:c:\users\eezsg\desktop\sacamos_july_20188 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp2\local_sw1\sw1_guimain.cpp 6076 +1533810128 source:c:\users\eezsg\desktop\sacamos_july_20188 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp2\local_sw1\sw1_guimain.cpp
6078 "SW1_GUIMain.h" 6077 "SW1_GUIMain.h"
6079 - <wx/bitmap.h>  
6080 - <wx/icon.h>  
6081 <wx/settings.h> 6078 <wx/settings.h>
6082 <wx/intl.h> 6079 <wx/intl.h>
6083 - <wx/image.h>  
6084 <wx/string.h> 6080 <wx/string.h>
6085 6081
6086 -1530724216 source:c:\users\eezsg\desktop\sacamos_july_20186 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp2\local_sw1\tp.cpp 6082 +1533826466 source:c:\users\eezsg\desktop\sacamos_july_20186 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp2\local_sw1\tp.cpp
6087 "TP.h" 6083 "TP.h"
6088 <wx/settings.h> 6084 <wx/settings.h>
6089 <wx/intl.h> 6085 <wx/intl.h>
6090 <wx/string.h> 6086 <wx/string.h>
6091 6087
6092 -1530721192 source:c:\users\eezsg\desktop\sacamos_july_20182 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp2\local_sw1\twinax.cpp 6088 +1533827512 source:c:\users\eezsg\desktop\sacamos_july_20182 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp2\local_sw1\twinax.cpp
6093 "TWINAX.h" 6089 "TWINAX.h"
6094 <wx/settings.h> 6090 <wx/settings.h>
6095 <wx/intl.h> 6091 <wx/intl.h>
@@ -6098,15 +6094,584 @@ @@ -6098,15 +6094,584 @@
6098 1502693568 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp 6094 1502693568 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp
6099 "UTILITIES.h" 6095 "UTILITIES.h"
6100 6096
6101 -1530724000 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.cpp2\local_sw1\utp.cpp 6097 +1533825916 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.cpp2\local_sw1\utp.cpp
6102 "UTP.h" 6098 "UTP.h"
6103 <wx/settings.h> 6099 <wx/settings.h>
6104 <wx/intl.h> 6100 <wx/intl.h>
6105 <wx/string.h> 6101 <wx/string.h>
6106 6102
6107 -1530797567 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.cpp2\local_sw1\flexcable.cpp 6103 +1533829809 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.cpp2\local_sw1\flexcable.cpp
6108 "FLEXCABLE.h" 6104 "FLEXCABLE.h"
6109 <wx/settings.h> 6105 <wx/settings.h>
6110 <wx/intl.h> 6106 <wx/intl.h>
6111 <wx/string.h> 6107 <wx/string.h>
6112 6108
  6109 +1512938044 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\about.cpp
  6110 + "ABOUT.h"
  6111 + <wx/textfile.h>
  6112 + <wx/msgdlg.h>
  6113 + <wx/hyperlink.h>
  6114 + <wx/bitmap.h>
  6115 + <wx/intl.h>
  6116 + <wx/image.h>
  6117 + <wx/string.h>
  6118 +
  6119 +1502693582 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\about.h
  6120 + <wx/sizer.h>
  6121 + <wx/textctrl.h>
  6122 + <wx/statbmp.h>
  6123 + <wx/dialog.h>
  6124 +
  6125 +1530874924 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp
  6126 + "BUNDLE_SCHEMATIC.h"
  6127 +
  6128 +1502693582 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h
  6129 + <wx/panel.h>
  6130 + <wx/dcclient.h>
  6131 + <wx/msgdlg.h>
  6132 + <iostream>
  6133 + <fstream>
  6134 + <sstream>
  6135 + <cmath>
  6136 +
  6137 +1533124608 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.cpp
  6138 + "BUNDLEBLDR.h"
  6139 + "PLACE_CABLE.h"
  6140 + "MESH_LAPLACE.h"
  6141 + <wx/msgdlg.h>
  6142 + <wx/filename.h>
  6143 + <wx/dcclient.h>
  6144 + <iostream>
  6145 + <string>
  6146 + <fstream>
  6147 + <sstream>
  6148 + <wx/settings.h>
  6149 + <wx/intl.h>
  6150 + <wx/string.h>
  6151 +
  6152 +1530739988 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.h
  6153 + <wx/notebook.h>
  6154 + <wx/sizer.h>
  6155 + <wx/stattext.h>
  6156 + <wx/textctrl.h>
  6157 + <wx/checkbox.h>
  6158 + <wx/listbox.h>
  6159 + <wx/radiobut.h>
  6160 + <wx/panel.h>
  6161 + <wx/button.h>
  6162 + <wx/dialog.h>
  6163 + <wx/spinbutt.h>
  6164 + <wx/combobox.h>
  6165 + <wx/dirctrl.h>
  6166 + <wx/treectrl.h>
  6167 + "FileSelectorCtrl.h"
  6168 + "UTILITIES.h"
  6169 + "MESH_LAPLACE.h"
  6170 + "MESH_PARAM.h"
  6171 + "RUN_STATUS.h"
  6172 + <iostream>
  6173 + <string>
  6174 +
  6175 +1502693578 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fileselectorctrl.h
  6176 + "wx/treectrl.h"
  6177 + "wx/dialog.h"
  6178 + "wx/dirdlg.h"
  6179 + "wx/choice.h"
  6180 +
  6181 +1502693568 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\utilities.h
  6182 + <wx/textctrl.h>
  6183 + <wx/tokenzr.h>
  6184 + <wx/filename.h>
  6185 + <wx/filefn.h>
  6186 +
  6187 +1502693576 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.h
  6188 + <wx/sizer.h>
  6189 + <wx/panel.h>
  6190 + <wx/button.h>
  6191 + <wx/dialog.h>
  6192 + <wx/msgdlg.h>
  6193 + <wx/dcclient.h>
  6194 + <iostream>
  6195 + <fstream>
  6196 + <string>
  6197 + <algorithm>
  6198 +
  6199 +1530714876 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\mesh_param.h
  6200 + <wx/sizer.h>
  6201 + <wx/stattext.h>
  6202 + <wx/textctrl.h>
  6203 + <wx/button.h>
  6204 + <wx/dialog.h>
  6205 + "UTILITIES.h"
  6206 +
  6207 +1502693574 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\run_status.h
  6208 + <wx/sizer.h>
  6209 + <wx/textctrl.h>
  6210 + <wx/dialog.h>
  6211 + <wx/textfile.h>
  6212 + <iostream>
  6213 + <fstream>
  6214 + <sstream>
  6215 +
  6216 +1502693576 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\place_cable.h
  6217 + <wx/sizer.h>
  6218 + <wx/stattext.h>
  6219 + <wx/textctrl.h>
  6220 + <wx/button.h>
  6221 + <wx/dialog.h>
  6222 +
  6223 +1530399132 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.cpp
  6224 + "CABLE_SCHEMATIC.h"
  6225 +
  6226 +1502693580 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.h
  6227 + <wx/panel.h>
  6228 + <wx/dcclient.h>
  6229 + <wx/msgdlg.h>
  6230 + <iostream>
  6231 + <fstream>
  6232 + <sstream>
  6233 +
  6234 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\coaxial.cpp
  6235 + "COAXIAL.h"
  6236 + <wx/settings.h>
  6237 + <wx/font.h>
  6238 + <wx/intl.h>
  6239 + <wx/string.h>
  6240 +
  6241 +1514832982 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\coaxial.h
  6242 + <wx/notebook.h>
  6243 + <wx/sizer.h>
  6244 + <wx/stattext.h>
  6245 + <wx/textctrl.h>
  6246 + <wx/checkbox.h>
  6247 + <wx/statline.h>
  6248 + <wx/panel.h>
  6249 + <wx/button.h>
  6250 + <wx/dialog.h>
  6251 + <wx/msgdlg.h>
  6252 + <wx/dcclient.h>
  6253 + "UTILITIES.h"
  6254 + "FD_ESR.h"
  6255 + "FD_ZT.h"
  6256 + "RUN_STATUS.h"
  6257 + <iostream>
  6258 + <fstream>
  6259 + <sstream>
  6260 +
  6261 +1530719644 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fd_esr.h
  6262 + <wx/sizer.h>
  6263 + <wx/stattext.h>
  6264 + <wx/textctrl.h>
  6265 + <wx/checkbox.h>
  6266 + <wx/statline.h>
  6267 + <wx/radiobut.h>
  6268 + <wx/button.h>
  6269 + <wx/dialog.h>
  6270 + "UTILITIES.h"
  6271 +
  6272 +1502693578 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fd_zt.h
  6273 + <wx/sizer.h>
  6274 + <wx/stattext.h>
  6275 + <wx/textctrl.h>
  6276 + <wx/statline.h>
  6277 + <wx/button.h>
  6278 + <wx/dialog.h>
  6279 +
  6280 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\dconn.cpp
  6281 + "DCONN.h"
  6282 + <wx/settings.h>
  6283 + <wx/intl.h>
  6284 + <wx/string.h>
  6285 +
  6286 +1514918482 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\dconn.h
  6287 + <wx/sizer.h>
  6288 + <wx/stattext.h>
  6289 + <wx/textctrl.h>
  6290 + <wx/checkbox.h>
  6291 + <wx/panel.h>
  6292 + <wx/button.h>
  6293 + <wx/dialog.h>
  6294 + <wx/combobox.h>
  6295 + <wx/dcclient.h>
  6296 + <wx/msgdlg.h>
  6297 + "MESH_LAPLACE.h"
  6298 + "MESH_PARAM.h"
  6299 + "RUN_STATUS.h"
  6300 + "UTILITIES.h"
  6301 + <iostream>
  6302 + <fstream>
  6303 + <sstream>
  6304 +
  6305 +1530874672 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\export_spice.cpp
  6306 + "EXPORT_SPICE.h"
  6307 + <wx/intl.h>
  6308 + <wx/string.h>
  6309 +
  6310 +1508706152 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\export_spice.h
  6311 + <wx/sizer.h>
  6312 + <wx/textctrl.h>
  6313 + <wx/filepicker.h>
  6314 + <wx/button.h>
  6315 + <wx/dialog.h>
  6316 + <wx/msgdlg.h>
  6317 + <wx/filefn.h>
  6318 + <wx/textfile.h>
  6319 +
  6320 +1530719662 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fd_esr.cpp
  6321 + "FD_ESR.h"
  6322 + <wx/settings.h>
  6323 + <wx/intl.h>
  6324 + <wx/string.h>
  6325 +
  6326 +1530724392 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.cpp
  6327 + "FD_ESR_SW.h"
  6328 + "UTILITIES.h"
  6329 + <wx/settings.h>
  6330 + <wx/intl.h>
  6331 + <wx/string.h>
  6332 +
  6333 +1530724366 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.h
  6334 + <wx/sizer.h>
  6335 + <wx/stattext.h>
  6336 + <wx/textctrl.h>
  6337 + <wx/checkbox.h>
  6338 + <wx/statline.h>
  6339 + <wx/radiobut.h>
  6340 + <wx/button.h>
  6341 + <wx/dialog.h>
  6342 +
  6343 +1502693578 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fd_zt.cpp
  6344 + "FD_ZT.h"
  6345 + <wx/intl.h>
  6346 + <wx/string.h>
  6347 +
  6348 +1502693578 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\fileselectorctrl.cpp
  6349 + "wx/wxprec.h"
  6350 + "wx/generic/dirctrlg.h"
  6351 + "FileSelectorCtrl.h"
  6352 + "wx/hash.h"
  6353 + "wx/intl.h"
  6354 + "wx/log.h"
  6355 + "wx/utils.h"
  6356 + "wx/button.h"
  6357 + "wx/icon.h"
  6358 + "wx/settings.h"
  6359 + "wx/msgdlg.h"
  6360 + "wx/choice.h"
  6361 + "wx/textctrl.h"
  6362 + "wx/layout.h"
  6363 + "wx/sizer.h"
  6364 + "wx/textdlg.h"
  6365 + "wx/gdicmn.h"
  6366 + "wx/image.h"
  6367 + "wx/module.h"
  6368 + "wx/filename.h"
  6369 + "wx/filefn.h"
  6370 + "wx/imaglist.h"
  6371 + "wx/tokenzr.h"
  6372 + "wx/dir.h"
  6373 + "wx/artprov.h"
  6374 + "wx/mimetype.h"
  6375 + "wx/statline.h"
  6376 + "wx/osx/private.h"
  6377 + <windows.h>
  6378 + "wx/msw/winundef.h"
  6379 + "wx/volume.h"
  6380 + <direct.h>
  6381 + "dos.h"
  6382 +
  6383 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\flexcable.cpp
  6384 + "FLEXCABLE.h"
  6385 + <wx/settings.h>
  6386 + <wx/intl.h>
  6387 + <wx/string.h>
  6388 +
  6389 +1530714758 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\flexcable.h
  6390 + <wx/notebook.h>
  6391 + <wx/sizer.h>
  6392 + <wx/stattext.h>
  6393 + <wx/textctrl.h>
  6394 + <wx/checkbox.h>
  6395 + <wx/panel.h>
  6396 + <wx/grid.h>
  6397 + <wx/button.h>
  6398 + <wx/dialog.h>
  6399 + <wx/combobox.h>
  6400 + <wx/msgdlg.h>
  6401 + <wx/dcclient.h>
  6402 + "UTILITIES.h"
  6403 + "MESH_LAPLACE.h"
  6404 + "MESH_PARAM.h"
  6405 + "RUN_STATUS.h"
  6406 + "FD_ESR.h"
  6407 + <iostream>
  6408 + <fstream>
  6409 + <sstream>
  6410 +
  6411 +1530802204 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp
  6412 + "MESH_LAPLACE.h"
  6413 +
  6414 +1530714886 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp
  6415 + "MESH_PARAM.h"
  6416 + <wx/settings.h>
  6417 + <wx/intl.h>
  6418 + <wx/string.h>
  6419 +
  6420 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\overshield.cpp
  6421 + "OVERSHIELD.h"
  6422 + <wx/settings.h>
  6423 + <wx/intl.h>
  6424 + <wx/string.h>
  6425 +
  6426 +1514918530 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\overshield.h
  6427 + <wx/sizer.h>
  6428 + <wx/stattext.h>
  6429 + <wx/textctrl.h>
  6430 + <wx/panel.h>
  6431 + <wx/button.h>
  6432 + <wx/dialog.h>
  6433 + <wx/msgdlg.h>
  6434 + <wx/dcclient.h>
  6435 + "MESH_LAPLACE.h"
  6436 + "UTILITIES.h"
  6437 + "RUN_STATUS.h"
  6438 + <iostream>
  6439 + <fstream>
  6440 + <sstream>
  6441 +
  6442 +1502693576 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\place_cable.cpp
  6443 + "PLACE_CABLE.h"
  6444 + <wx/intl.h>
  6445 + <wx/string.h>
  6446 +
  6447 +1502693574 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\resource.rc
  6448 + "wx/msw/wx.rc"
  6449 +
  6450 +1502693574 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\run_status.cpp
  6451 + "RUN_STATUS.h"
  6452 + <wx/intl.h>
  6453 + <wx/string.h>
  6454 +
  6455 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\spacewire.cpp
  6456 + "SPACEWIRE.h"
  6457 + <wx/settings.h>
  6458 + <wx/intl.h>
  6459 + <wx/string.h>
  6460 +
  6461 +1530724620 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\spacewire.h
  6462 + <wx/notebook.h>
  6463 + <wx/sizer.h>
  6464 + <wx/stattext.h>
  6465 + <wx/textctrl.h>
  6466 + <wx/checkbox.h>
  6467 + <wx/panel.h>
  6468 + <wx/button.h>
  6469 + <wx/dialog.h>
  6470 + <wx/combobox.h>
  6471 + <wx/msgdlg.h>
  6472 + <wx/dcclient.h>
  6473 + "FD_ESR_SW.h"
  6474 + "UTILITIES.h"
  6475 + "MESH_LAPLACE.h"
  6476 + "MESH_PARAM.h"
  6477 + "RUN_STATUS.h"
  6478 + <iostream>
  6479 + <fstream>
  6480 + <sstream>
  6481 +
  6482 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\spicemodel.cpp
  6483 + "SPICEMODEL.h"
  6484 + <wx/filename.h>
  6485 + <wx/dcclient.h>
  6486 + <wx/tokenzr.h>
  6487 + <iostream>
  6488 + <fstream>
  6489 + <string>
  6490 + <sstream>
  6491 + <wx/settings.h>
  6492 + <wx/intl.h>
  6493 + <wx/string.h>
  6494 +
  6495 +1509486246 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h
  6496 + <wx/notebook.h>
  6497 + <wx/sizer.h>
  6498 + <wx/stattext.h>
  6499 + <wx/textctrl.h>
  6500 + <wx/checkbox.h>
  6501 + <wx/radiobut.h>
  6502 + <wx/panel.h>
  6503 + <wx/button.h>
  6504 + <wx/dialog.h>
  6505 + <wx/msgdlg.h>
  6506 + <wx/dirctrl.h>
  6507 + <wx/treectrl.h>
  6508 + <iostream>
  6509 + <string>
  6510 + "FileSelectorCtrl.h"
  6511 + "BUNDLE_SCHEMATIC.h"
  6512 + "RUN_STATUS.h"
  6513 + "UTILITIES.h"
  6514 +
  6515 +1502693570 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.cpp
  6516 + "SW1_GUIApp.h"
  6517 + "SW1_GUIMain.h"
  6518 + <wx/image.h>
  6519 +
  6520 +1502693570 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h
  6521 + <wx/app.h>
  6522 +
  6523 +1514922396 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.h
  6524 + <wx/sizer.h>
  6525 + <wx/menu.h>
  6526 + <wx/panel.h>
  6527 + <wx/statbmp.h>
  6528 + <wx/dirdlg.h>
  6529 + <wx/frame.h>
  6530 + <wx/statusbr.h>
  6531 + <wx/dirctrl.h>
  6532 + <wx/msgdlg.h>
  6533 + <wx/dir.h>
  6534 + <wx/dirctrl.h>
  6535 + <wx/treectrl.h>
  6536 + <wx/filename.h>
  6537 + <wx/dcclient.h>
  6538 + "FileSelectorCtrl.h"
  6539 + "ABOUT.h"
  6540 + "CYLINDRICAL.h"
  6541 + "COAXIAL.h"
  6542 + "TWINAX.h"
  6543 + "UTP.h"
  6544 + "TP.h"
  6545 + "SPACEWIRE.h"
  6546 + "OVERSHIELD.h"
  6547 + "FLEXCABLE.h"
  6548 + "DCONN.h"
  6549 + "BUNDLEBLDR.h"
  6550 + "SPICEMODEL.h"
  6551 + "CABLE_SCHEMATIC.h"
  6552 + "BUNDLE_SCHEMATIC.h"
  6553 + "EXPORT_SPICE.h"
  6554 + "UTILITIES.h"
  6555 + <iostream>
  6556 + <fstream>
  6557 + <string>
  6558 +
  6559 +1530723822 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\cylindrical.h
  6560 + <wx/sizer.h>
  6561 + <wx/stattext.h>
  6562 + <wx/textctrl.h>
  6563 + <wx/checkbox.h>
  6564 + <wx/panel.h>
  6565 + <wx/button.h>
  6566 + <wx/dialog.h>
  6567 + <wx/msgdlg.h>
  6568 + <wx/dcclient.h>
  6569 + "FD_ESR.h"
  6570 + "UTILITIES.h"
  6571 + "RUN_STATUS.h"
  6572 + <iostream>
  6573 + <fstream>
  6574 + <sstream>
  6575 +
  6576 +1530719970 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\twinax.h
  6577 + <wx/notebook.h>
  6578 + <wx/sizer.h>
  6579 + <wx/stattext.h>
  6580 + <wx/textctrl.h>
  6581 + <wx/checkbox.h>
  6582 + <wx/statline.h>
  6583 + <wx/panel.h>
  6584 + <wx/button.h>
  6585 + <wx/dialog.h>
  6586 + <wx/combobox.h>
  6587 + <wx/msgdlg.h>
  6588 + <wx/dcclient.h>
  6589 + "FD_ESR.h"
  6590 + "UTILITIES.h"
  6591 + "MESH_LAPLACE.h"
  6592 + "MESH_PARAM.h"
  6593 + "RUN_STATUS.h"
  6594 + <iostream>
  6595 + <fstream>
  6596 + <sstream>
  6597 +
  6598 +1530722668 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\utp.h
  6599 + <wx/notebook.h>
  6600 + <wx/sizer.h>
  6601 + <wx/stattext.h>
  6602 + <wx/textctrl.h>
  6603 + <wx/checkbox.h>
  6604 + <wx/panel.h>
  6605 + <wx/button.h>
  6606 + <wx/dialog.h>
  6607 + <wx/combobox.h>
  6608 + <wx/msgdlg.h>
  6609 + <wx/dcclient.h>
  6610 + "FD_ESR.h"
  6611 + "UTILITIES.h"
  6612 + "MESH_LAPLACE.h"
  6613 + "MESH_PARAM.h"
  6614 + "RUN_STATUS.h"
  6615 + <iostream>
  6616 + <fstream>
  6617 + <sstream>
  6618 + <stdio.h>
  6619 +
  6620 +1530722646 c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\tp.h
  6621 + <wx/notebook.h>
  6622 + <wx/sizer.h>
  6623 + <wx/stattext.h>
  6624 + <wx/textctrl.h>
  6625 + <wx/checkbox.h>
  6626 + <wx/statline.h>
  6627 + <wx/panel.h>
  6628 + <wx/button.h>
  6629 + <wx/dialog.h>
  6630 + <wx/combobox.h>
  6631 + <wx/msgdlg.h>
  6632 + <wx/dcclient.h>
  6633 + "FD_ESR.h"
  6634 + "MESH_LAPLACE.h"
  6635 + "MESH_PARAM.h"
  6636 + "UTILITIES.h"
  6637 + "RUN_STATUS.h"
  6638 + <iostream>
  6639 + <fstream>
  6640 + <sstream>
  6641 +
  6642 +1514923368 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp
  6643 + "SW1_GUIMain.h"
  6644 + <wx/bitmap.h>
  6645 + <wx/icon.h>
  6646 + <wx/settings.h>
  6647 + <wx/intl.h>
  6648 + <wx/image.h>
  6649 + <wx/string.h>
  6650 +
  6651 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\tp.cpp
  6652 + "TP.h"
  6653 + <wx/settings.h>
  6654 + <wx/intl.h>
  6655 + <wx/string.h>
  6656 +
  6657 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp
  6658 + "TWINAX.h"
  6659 + <wx/settings.h>
  6660 + <wx/intl.h>
  6661 + <wx/string.h>
  6662 +
  6663 +1502693568 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp
  6664 + "UTILITIES.h"
  6665 +
  6666 +1531159069 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\utp.cpp
  6667 + "UTP.h"
  6668 + <wx/settings.h>
  6669 + <wx/intl.h>
  6670 + <wx/string.h>
  6671 +
  6672 +1531158573 source:c:\users\eezsg\desktop\desktop\sacamos_july_2018\02\local_sw1\cylindrical.cpp
  6673 + "CYLINDRICAL.h"
  6674 + <wx/settings.h>
  6675 + <wx/intl.h>
  6676 + <wx/string.h>
  6677 +
GUI/SW1/SRC/SW1_GUI.layout
  Diff comments   View file @2a0d305
@@ -2,34 +2,69 @@ @@ -2,34 +2,69 @@
2 <CodeBlocks_layout_file> 2 <CodeBlocks_layout_file>
3 <FileVersion major="1" minor="0" /> 3 <FileVersion major="1" minor="0" />
4 <ActiveTarget name="Release" /> 4 <ActiveTarget name="Release" />
5 - <File name="TWINAX.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 5 + <File name="SPICEMODEL.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
6 <Cursor> 6 <Cursor>
7 - <Cursor1 position="29097" topLine="765" /> 7 + <Cursor1 position="22299" topLine="362" />
8 </Cursor> 8 </Cursor>
9 </File> 9 </File>
10 - <File name="UTP.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 10 + <File name="SPICEMODEL.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
11 <Cursor> 11 <Cursor>
12 - <Cursor1 position="15969" topLine="277" /> 12 + <Cursor1 position="0" topLine="58" />
13 </Cursor> 13 </Cursor>
14 </File> 14 </File>
15 - <File name="BUNDLEBLDR.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 15 + <File name="SW1_GUIMain.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  16 + <Cursor>
  17 + <Cursor1 position="3921" topLine="122" />
  18 + </Cursor>
  19 + </File>
  20 + <File name="TWINAX.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  21 + <Cursor>
  22 + <Cursor1 position="3090" topLine="84" />
  23 + </Cursor>
  24 + </File>
  25 + <File name="UTILITIES.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  26 + <Cursor>
  27 + <Cursor1 position="0" topLine="0" />
  28 + </Cursor>
  29 + </File>
  30 + <File name="ABOUT.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  31 + <Cursor>
  32 + <Cursor1 position="2860" topLine="0" />
  33 + </Cursor>
  34 + </File>
  35 + <File name="SW1_GUIMain.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  36 + <Cursor>
  37 + <Cursor1 position="4105" topLine="120" />
  38 + </Cursor>
  39 + </File>
  40 + <File name="BUNDLEBLDR.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
16 <Cursor> 41 <Cursor>
17 <Cursor1 position="4034" topLine="111" /> 42 <Cursor1 position="4034" topLine="111" />
18 </Cursor> 43 </Cursor>
19 </File> 44 </File>
20 - <File name="UTP.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 45 + <File name="COAXIAL.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
21 <Cursor> 46 <Cursor>
22 - <Cursor1 position="3106" topLine="84" /> 47 + <Cursor1 position="0" topLine="159" />
  48 + </Cursor>
  49 + </File>
  50 + <File name="BUNDLE_SCHEMATIC.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  51 + <Cursor>
  52 + <Cursor1 position="3923" topLine="138" />
  53 + </Cursor>
  54 + </File>
  55 + <File name="TP.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  56 + <Cursor>
  57 + <Cursor1 position="3112" topLine="71" />
23 </Cursor> 58 </Cursor>
24 </File> 59 </File>
25 - <File name="BUNDLEBLDR.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 60 + <File name="FLEXCABLE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
26 <Cursor> 61 <Cursor>
27 - <Cursor1 position="68218" topLine="1027" /> 62 + <Cursor1 position="3107" topLine="75" />
28 </Cursor> 63 </Cursor>
29 </File> 64 </File>
30 - <File name="BUNDLE_SCHEMATIC.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 65 + <File name="BUNDLE_SCHEMATIC.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
31 <Cursor> 66 <Cursor>
32 - <Cursor1 position="7034" topLine="669" /> 67 + <Cursor1 position="0" topLine="34" />
33 </Cursor> 68 </Cursor>
34 </File> 69 </File>
35 <File name="SPACEWIRE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 70 <File name="SPACEWIRE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -37,74 +72,89 @@ @@ -37,74 +72,89 @@
37 <Cursor1 position="2860" topLine="70" /> 72 <Cursor1 position="2860" topLine="70" />
38 </Cursor> 73 </Cursor>
39 </File> 74 </File>
40 - <File name="CABLE_SCHEMATIC.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 75 + <File name="EXPORT_SPICE.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  76 + <Cursor>
  77 + <Cursor1 position="7345" topLine="158" />
  78 + </Cursor>
  79 + </File>
  80 + <File name="CABLE_SCHEMATIC.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
41 <Cursor> 81 <Cursor>
42 <Cursor1 position="33393" topLine="711" /> 82 <Cursor1 position="33393" topLine="711" />
43 </Cursor> 83 </Cursor>
44 </File> 84 </File>
  85 + <File name="TP.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  86 + <Cursor>
  87 + <Cursor1 position="27531" topLine="461" />
  88 + </Cursor>
  89 + </File>
45 <File name="FD_ESR.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 90 <File name="FD_ESR.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
46 <Cursor> 91 <Cursor>
47 <Cursor1 position="0" topLine="318" /> 92 <Cursor1 position="0" topLine="318" />
48 </Cursor> 93 </Cursor>
49 </File> 94 </File>
50 - <File name="TWINAX.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 95 + <File name="MESH_LAPLACE.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
51 <Cursor> 96 <Cursor>
52 - <Cursor1 position="3090" topLine="84" /> 97 + <Cursor1 position="3418" topLine="92" />
53 </Cursor> 98 </Cursor>
54 </File> 99 </File>
55 - <File name="COAXIAL.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 100 + <File name="COAXIAL.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
56 <Cursor> 101 <Cursor>
57 - <Cursor1 position="0" topLine="844" /> 102 + <Cursor1 position="24008" topLine="391" />
58 </Cursor> 103 </Cursor>
59 </File> 104 </File>
60 - <File name="FLEXCABLE.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 105 + <File name="PLACE_CABLE.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
61 <Cursor> 106 <Cursor>
62 - <Cursor1 position="23632" topLine="447" /> 107 + <Cursor1 position="0" topLine="0" />
63 </Cursor> 108 </Cursor>
64 </File> 109 </File>
65 - <File name="FLEXCABLE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 110 + <File name="CYLINDRICAL.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
66 <Cursor> 111 <Cursor>
67 - <Cursor1 position="3107" topLine="75" /> 112 + <Cursor1 position="2973" topLine="69" />
68 </Cursor> 113 </Cursor>
69 </File> 114 </File>
70 - <File name="TP.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 115 + <File name="UTP.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
71 <Cursor> 116 <Cursor>
72 - <Cursor1 position="3112" topLine="71" /> 117 + <Cursor1 position="3106" topLine="84" />
73 </Cursor> 118 </Cursor>
74 </File> 119 </File>
75 - <File name="COAXIAL.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 120 + <File name="FLEXCABLE.cpp" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
76 <Cursor> 121 <Cursor>
77 - <Cursor1 position="0" topLine="159" /> 122 + <Cursor1 position="17171" topLine="321" />
78 </Cursor> 123 </Cursor>
79 </File> 124 </File>
80 - <File name="MESH_LAPLACE.cpp" open="1" top="1" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 125 + <File name="CYLINDRICAL.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
81 <Cursor> 126 <Cursor>
82 - <Cursor1 position="3417" topLine="89" /> 127 + <Cursor1 position="12787" topLine="248" />
83 </Cursor> 128 </Cursor>
84 </File> 129 </File>
85 - <File name="TP.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 130 + <File name="DCONN.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
86 <Cursor> 131 <Cursor>
87 - <Cursor1 position="38129" topLine="766" /> 132 + <Cursor1 position="12183" topLine="234" />
88 </Cursor> 133 </Cursor>
89 </File> 134 </File>
90 - <File name="CYLINDRICAL.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 135 + <File name="UTP.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
91 <Cursor> 136 <Cursor>
92 - <Cursor1 position="2973" topLine="69" /> 137 + <Cursor1 position="17257" topLine="333" />
  138 + </Cursor>
  139 + </File>
  140 + <File name="OVERSHIELD.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  141 + <Cursor>
  142 + <Cursor1 position="13542" topLine="244" />
93 </Cursor> 143 </Cursor>
94 </File> 144 </File>
95 - <File name="CYLINDRICAL.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 145 + <File name="BUNDLEBLDR.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
96 <Cursor> 146 <Cursor>
97 - <Cursor1 position="15249" topLine="332" /> 147 + <Cursor1 position="67331" topLine="1522" />
98 </Cursor> 148 </Cursor>
99 </File> 149 </File>
100 - <File name="DCONN.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 150 + <File name="SPACEWIRE.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
101 <Cursor> 151 <Cursor>
102 - <Cursor1 position="25411" topLine="320" /> 152 + <Cursor1 position="33711" topLine="508" />
103 </Cursor> 153 </Cursor>
104 </File> 154 </File>
105 - <File name="SPACEWIRE.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> 155 + <File name="TWINAX.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
106 <Cursor> 156 <Cursor>
107 - <Cursor1 position="32757" topLine="461" /> 157 + <Cursor1 position="27272" topLine="432" />
108 </Cursor> 158 </Cursor>
109 </File> 159 </File>
110 </CodeBlocks_layout_file> 160 </CodeBlocks_layout_file>
GUI/SW1/SRC/SW1_GUIMain.cpp
  Diff comments   View file @2a0d305
@@ -44,11 +44,8 @@ @@ -44,11 +44,8 @@
44 44
45 45
46 //(*InternalHeaders(SW1_GUIFrame) 46 //(*InternalHeaders(SW1_GUIFrame)
47 -#include <wx/bitmap.h>  
48 -#include <wx/icon.h>  
49 #include <wx/settings.h> 47 #include <wx/settings.h>
50 #include <wx/intl.h> 48 #include <wx/intl.h>
51 -#include <wx/image.h>  
52 #include <wx/string.h> 49 #include <wx/string.h>
53 //*) 50 //*)
54 51
@@ -124,11 +121,6 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id) @@ -124,11 +121,6 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id)
124 wxMenu* Menu2; 121 wxMenu* Menu2;
125 122
126 Create(parent, wxID_ANY, _("SACAMOS"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, _T("wxID_ANY")); 123 Create(parent, wxID_ANY, _("SACAMOS"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, _T("wxID_ANY"));
127 - {  
128 - wxIcon FrameIcon;  
129 - FrameIcon.CopyFromBitmap(wxBitmap(wxImage(_T("resources//spacewire_schematic_64x64.ico"))));  
130 - SetIcon(FrameIcon);  
131 - }  
132 FlexGridSizer1 = new wxFlexGridSizer(1, 2, 0, 5); 124 FlexGridSizer1 = new wxFlexGridSizer(1, 2, 0, 5);
133 FlexGridSizer1->AddGrowableCol(1); 125 FlexGridSizer1->AddGrowableCol(1);
134 FlexGridSizer1->AddGrowableRow(0); 126 FlexGridSizer1->AddGrowableRow(0);
@@ -137,10 +129,10 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id) @@ -137,10 +129,10 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id)
137 StaticBoxSizer1->Add(Panel1, 1, wxALL|wxEXPAND, 5); 129 StaticBoxSizer1->Add(Panel1, 1, wxALL|wxEXPAND, 5);
138 FlexGridSizer1->Add(StaticBoxSizer1, 0, wxALL|wxEXPAND, 5); 130 FlexGridSizer1->Add(StaticBoxSizer1, 0, wxALL|wxEXPAND, 5);
139 StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, wxEmptyString); 131 StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, wxEmptyString);
140 - Panel2 = new wxPanel(this, ID_PANEL2, wxDefaultPosition, wxSize(600,600), wxSIMPLE_BORDER|wxTAB_TRAVERSAL, _T("ID_PANEL2")); 132 + Panel2 = new wxPanel(this, ID_PANEL2, wxDefaultPosition, wxSize(600,600), wxSIMPLE_BORDER|wxTAB_TRAVERSAL|wxFULL_REPAINT_ON_RESIZE, _T("ID_PANEL2"));
141 Panel2->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION)); 133 Panel2->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION));
142 Panel2->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); 134 Panel2->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
143 - StaticBitmap1 = new wxStaticBitmap(Panel2, ID_STATICBITMAP1, wxBitmap(wxImage(_T("resources//Sacamos_Logo_v2.png"))), wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE, _T("ID_STATICBITMAP1")); 135 + StaticBitmap1 = new wxStaticBitmap(Panel2, ID_STATICBITMAP1, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE, _T("ID_STATICBITMAP1"));
144 StaticBoxSizer2->Add(Panel2, 1, wxALL|wxEXPAND, 5); 136 StaticBoxSizer2->Add(Panel2, 1, wxALL|wxEXPAND, 5);
145 FlexGridSizer1->Add(StaticBoxSizer2, 2, wxALL|wxEXPAND, 5); 137 FlexGridSizer1->Add(StaticBoxSizer2, 2, wxALL|wxEXPAND, 5);
146 SetSizer(FlexGridSizer1); 138 SetSizer(FlexGridSizer1);
@@ -205,8 +197,8 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id) @@ -205,8 +197,8 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id)
205 197
206 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&SW1_GUIFrame::OnPanel1Paint,0,this); 198 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&SW1_GUIFrame::OnPanel1Paint,0,this);
207 Panel2->Connect(wxEVT_PAINT,(wxObjectEventFunction)&SW1_GUIFrame::OnPanel2Paint,0,this); 199 Panel2->Connect(wxEVT_PAINT,(wxObjectEventFunction)&SW1_GUIFrame::OnPanel2Paint,0,this);
208 - Connect(ID_CREATEMOD,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::onCreateMOD);  
209 - Connect(ID_SELECTMOD,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::onSelectMOD); 200 + Connect(ID_CREATEMOD,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnCreateMOD);
  201 + Connect(ID_SELECTMOD,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnSelectMOD);
210 Connect(ID_MENUITEM1,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnQuit); 202 Connect(ID_MENUITEM1,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnQuit);
211 Connect(ID_CYLINDRICAL,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnCYLINDRICAL); 203 Connect(ID_CYLINDRICAL,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnCYLINDRICAL);
212 Connect(ID_COAX,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnCOAXIAL); 204 Connect(ID_COAX,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnCOAXIAL);
@@ -223,14 +215,21 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id) @@ -223,14 +215,21 @@ SW1_GUIFrame::SW1_GUIFrame(wxWindow* parent,wxWindowID id)
223 Connect(idMenuAbout,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnAbout); 215 Connect(idMenuAbout,wxEVT_COMMAND_MENU_SELECTED,(wxObjectEventFunction)&SW1_GUIFrame::OnAbout);
224 //*) 216 //*)
225 217
  218 + // Set frame icon here
  219 + wxIcon FrameIcon;
  220 + FrameIcon.CopyFromBitmap(wxBitmap(wxImage(_T("resources/spacewire_schematic_64x64.ico"))));
  221 + SetIcon(FrameIcon);
  222 +
  223 + // Set main image
  224 + StaticBitmap1->SetBitmap(wxBitmap(wxImage(_T("resources/Sacamos_Logo_v2.png"))));
  225 +
226 // Disable Top Menu Items Until MOD location is chosen 226 // Disable Top Menu Items Until MOD location is chosen
227 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Cable Model")),false); 227 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Cable Model")),false);
228 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Bundle Model")),false); 228 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Bundle Model")),false);
229 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Spice Model")),false); 229 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Spice Model")),false);
230 230
231 - allowResize = 0;  
232 -  
233 - StatusBar1 -> SetStatusText(wxT("Ready")); 231 + // Set status bar message text
  232 + StatusBar1 -> SetStatusText(wxT("Please Select MOD Directory"));
234 } 233 }
235 234
236 SW1_GUIFrame::~SW1_GUIFrame() 235 SW1_GUIFrame::~SW1_GUIFrame()
@@ -252,7 +251,7 @@ void SW1_GUIFrame::OnAbout(wxCommandEvent&amp; event) @@ -252,7 +251,7 @@ void SW1_GUIFrame::OnAbout(wxCommandEvent&amp; event)
252 about->ShowModal(); 251 about->ShowModal();
253 } 252 }
254 253
255 -void SW1_GUIFrame::onSelectMOD(wxCommandEvent& event) 254 +void SW1_GUIFrame::OnSelectMOD(wxCommandEvent& event)
256 { 255 {
257 // Create a new wxDirDialog dialog 256 // Create a new wxDirDialog dialog
258 wxDirDialog* dirDialog = new wxDirDialog(this); 257 wxDirDialog* dirDialog = new wxDirDialog(this);
@@ -263,15 +262,15 @@ void SW1_GUIFrame::onSelectMOD(wxCommandEvent&amp; event) @@ -263,15 +262,15 @@ void SW1_GUIFrame::onSelectMOD(wxCommandEvent&amp; event)
263 if (dirDialog->ShowModal() == wxID_OK) 262 if (dirDialog->ShowModal() == wxID_OK)
264 { 263 {
265 wxString selectedFile = dirDialog->GetPath(); 264 wxString selectedFile = dirDialog->GetPath();
  265 +
  266 + SelectedFile = dirDialog->GetPath();
266 PathToMOD << dirDialog->GetPath(); 267 PathToMOD << dirDialog->GetPath();
267 268
268 // Show the selected folder in the status bar 269 // Show the selected folder in the status bar
269 - SetStatusText(selectedFile, 0); 270 + SetStatusText(SelectedFile, 0);
270 271
271 - PopulateTheDirectoryTree (selectedFile); 272 + PopulateTheDirectoryTree (SelectedFile);
272 } 273 }
273 -  
274 - allowResize = 1;  
275 dirDialog->Destroy(); 274 dirDialog->Destroy();
276 275
277 wxStringTokenizer tkz(PathToMOD, wxT("\\")); 276 wxStringTokenizer tkz(PathToMOD, wxT("\\"));
@@ -280,10 +279,9 @@ void SW1_GUIFrame::onSelectMOD(wxCommandEvent&amp; event) @@ -280,10 +279,9 @@ void SW1_GUIFrame::onSelectMOD(wxCommandEvent&amp; event)
280 { 279 {
281 MODname = tkz.GetNextToken(); 280 MODname = tkz.GetNextToken();
282 } 281 }
283 -  
284 } 282 }
285 283
286 -void SW1_GUIFrame::onCreateMOD(wxCommandEvent& event) 284 +void SW1_GUIFrame::OnCreateMOD(wxCommandEvent& event)
287 { 285 {
288 // Create a new wxDirDialog dialog 286 // Create a new wxDirDialog dialog
289 wxDirDialog* dirDialog = new wxDirDialog(this); 287 wxDirDialog* dirDialog = new wxDirDialog(this);
@@ -302,34 +300,32 @@ void SW1_GUIFrame::onCreateMOD(wxCommandEvent&amp; event) @@ -302,34 +300,32 @@ void SW1_GUIFrame::onCreateMOD(wxCommandEvent&amp; event)
302 { 300 {
303 MODname = tkz.GetNextToken(); 301 MODname = tkz.GetNextToken();
304 } 302 }
305 -  
306 wxString folder, dirName; 303 wxString folder, dirName;
307 304
308 folder = PathToMOD + "/CABLE"; 305 folder = PathToMOD + "/CABLE";
309 dirName = folder; 306 dirName = folder;
310 if (!wxDirExists(dirName)) 307 if (!wxDirExists(dirName))
311 - wxMkdir(dirName, 0); 308 + wxMkdir(dirName, 0);
312 309
313 folder = PathToMOD + "/BUNDLE"; 310 folder = PathToMOD + "/BUNDLE";
314 dirName = folder; 311 dirName = folder;
315 if (!wxDirExists(dirName)) 312 if (!wxDirExists(dirName))
316 - wxMkdir(dirName, 0); 313 + wxMkdir(dirName, 0);
317 314
318 folder = PathToMOD + "/SPICE"; 315 folder = PathToMOD + "/SPICE";
319 dirName = folder; 316 dirName = folder;
320 if (!wxDirExists(dirName)) 317 if (!wxDirExists(dirName))
321 - wxMkdir(dirName, 0); 318 + wxMkdir(dirName, 0);
322 319
323 folder = PathToMOD + "/SPICE/SYMBOL"; 320 folder = PathToMOD + "/SPICE/SYMBOL";
324 dirName = folder; 321 dirName = folder;
325 if (!wxDirExists(dirName)) 322 if (!wxDirExists(dirName))
326 - wxMkdir(dirName, 0); 323 + wxMkdir(dirName, 0);
327 324
328 wxMenuBar* MenuBar1 = GetMenuBar(); 325 wxMenuBar* MenuBar1 = GetMenuBar();
329 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Cable Model")),true); 326 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Cable Model")),true);
330 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Bundle Model")),true); 327 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Bundle Model")),true);
331 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Spice Model")),true); 328 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Spice Model")),true);
332 -  
333 } 329 }
334 dirDialog->Destroy(); 330 dirDialog->Destroy();
335 } 331 }
@@ -340,7 +336,6 @@ void SW1_GUIFrame::PopulateTheDirectoryTree ( wxString RootFolder) @@ -340,7 +336,6 @@ void SW1_GUIFrame::PopulateTheDirectoryTree ( wxString RootFolder)
340 Panel1->GetSize(&size_h, &size_v ); 336 Panel1->GetSize(&size_h, &size_v );
341 337
342 if (tree != NULL) 338 if (tree != NULL)
343 -  
344 tree->Destroy(); 339 tree->Destroy();
345 340
346 tree = (wxSpecificDirCtrl *) NULL; 341 tree = (wxSpecificDirCtrl *) NULL;
@@ -348,103 +343,276 @@ void SW1_GUIFrame::PopulateTheDirectoryTree ( wxString RootFolder) @@ -348,103 +343,276 @@ void SW1_GUIFrame::PopulateTheDirectoryTree ( wxString RootFolder)
348 tree = new wxSpecificDirCtrl (Panel1, -1, RootFolder, 343 tree = new wxSpecificDirCtrl (Panel1, -1, RootFolder,
349 wxDefaultPosition, 344 wxDefaultPosition,
350 wxSize(size_h,size_v), 345 wxSize(size_h,size_v),
351 - wxSIMPLE_BORDER,//wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,  
352 - wxEmptyString, 0, 346 + wxSIMPLE_BORDER,
  347 + "*.cable_spec;*.bundle_spec;*.spice_model_spec", 0,
353 _T("Directory Listing")); 348 _T("Directory Listing"));
354 349
  350 + //Connect tree item activated e.g. single click and tree item selected e.g. double click events
  351 + Connect(tree->GetTreeCtrl()->GetId(),wxEVT_COMMAND_TREE_SEL_CHANGED , (wxObjectEventFunction) (wxEventFunction)(wxCommandEventFunction) &SW1_GUIFrame::OnTreeSelection);
355 Connect(tree->GetTreeCtrl()->GetId(),wxEVT_COMMAND_TREE_ITEM_ACTIVATED, (wxObjectEventFunction) (wxEventFunction)(wxCommandEventFunction) &SW1_GUIFrame::OnTreeSelectionChanged); 352 Connect(tree->GetTreeCtrl()->GetId(),wxEVT_COMMAND_TREE_ITEM_ACTIVATED, (wxObjectEventFunction) (wxEventFunction)(wxCommandEventFunction) &SW1_GUIFrame::OnTreeSelectionChanged);
356 - //SetButtonState_FolderSelected();  
357 353
  354 + //Activate Menu Items Once MOD Selected
358 wxMenuBar* MenuBar1 = GetMenuBar(); 355 wxMenuBar* MenuBar1 = GetMenuBar();
359 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Cable Model")),true); 356 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Cable Model")),true);
360 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Bundle Model")),true); 357 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Bundle Model")),true);
361 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Spice Model")),true); 358 MenuBar1->EnableTop(MenuBar1->FindMenu(_("&Spice Model")),true);
362 -  
363 } 359 }
364 360
365 -void SW1_GUIFrame::OnTreeSelectionChanged(wxTreeEvent& evt) 361 +void SW1_GUIFrame::OnTreeSelection(wxTreeEvent& evt)
366 { 362 {
367 wxFileName fname (tree->GetFilePath()); 363 wxFileName fname (tree->GetFilePath());
368 wxString File_Path = fname.GetPath(); 364 wxString File_Path = fname.GetPath();
369 - wxString File_FUllName = fname.GetFullName(); 365 + wxString File_FullName = fname.GetFullName();
370 wxString File_FullNamePath = fname.GetFullPath(); 366 wxString File_FullNamePath = fname.GetFullPath();
371 367
372 StaticBitmap1->Hide(); 368 StaticBitmap1->Hide();
373 369
374 - if(File_FUllName.substr(File_FUllName.find_last_of(".") + 1) == "cable_spec") { 370 + SetStatusText(File_FullName, 0);
375 371
  372 + if(File_FullName.substr(File_FullName.find_last_of(".") + 1) == "cable_spec")
  373 + {
376 draw_cable(Panel2,File_FullNamePath, 0, 0); 374 draw_cable(Panel2,File_FullNamePath, 0, 0);
377 } 375 }
378 376
379 else 377 else
380 - if(File_FUllName.substr(File_FUllName.find_last_of(".") + 1) == "bundle_spec") {  
381 378
  379 + if(File_FullName.substr(File_FullName.find_last_of(".") + 1) == "bundle_spec")
  380 + {
382 draw_bundle(Panel2, PathToMOD, File_FullNamePath); 381 draw_bundle(Panel2, PathToMOD, File_FullNamePath);
383 } 382 }
384 } 383 }
385 384
386 -void SW1_GUIFrame::OnCYLINDRICAL(wxCommandEvent& event) 385 +
  386 +void SW1_GUIFrame::OnTreeSelectionChanged(wxTreeEvent& evt)
387 { 387 {
  388 + wxFileName fname (tree->GetFilePath());
  389 + wxString File_Path = fname.GetPath();
  390 + wxString File_FullName = fname.GetFullName();
  391 + wxString File_FullNamePath = fname.GetFullPath();
  392 +
  393 + SetStatusText(File_FullName, 0);
  394 +
  395 + StaticBitmap1->Hide();
  396 +
  397 + if(File_FullName.substr(File_FullName.find_last_of(".") + 1) == "cable_spec")
  398 + {
  399 + std::ifstream cableFile;
  400 + cableFile.open (File_FullNamePath);
  401 +
  402 + std::string str;
388 403
389 - CYLINDRICAL *cylindrical = new CYLINDRICAL(this);  
390 - cylindrical->SetPathToMOD(PathToMOD, MODname);  
391 - cylindrical->ShowModal(); 404 + std::getline(cableFile, str);
  405 + std::getline(cableFile, str);
  406 + std::getline(cableFile, str);
  407 +
  408 + if (str == "Cylindrical")
  409 + {
  410 + Edit = true;
  411 + CreateCable ("Cylindrical", File_FullName, Edit);
  412 + }
  413 +
  414 + if (str == "Coax")
  415 + {
  416 + Edit = true;
  417 + CreateCable ("Coaxial", File_FullName, Edit);
  418 + }
  419 +
  420 + if (str == "Twinax")
  421 + {
  422 + Edit = true;
  423 + CreateCable ("Twinax", File_FullName, Edit);
  424 + }
  425 +
  426 + if (str == "Twisted_pair")
  427 + {
  428 + Edit = true;
  429 + CreateCable ("UTP", File_FullName, Edit);
  430 + }
  431 +
  432 + if (str == "Shielded_twisted_pair")
  433 + {
  434 + Edit = true;
  435 + CreateCable ("TP", File_FullName, Edit);
  436 + }
  437 +
  438 + if (str == "Spacewire")
  439 + {
  440 + Edit = true;
  441 + CreateCable ("Spacewire", File_FullName, Edit);
  442 + }
  443 +
  444 + if (str == "Overshield")
  445 + {
  446 + Edit = true;
  447 + CreateCable ("Overshield", File_FullName, Edit);
  448 + }
  449 +
  450 + if (str == "Dconnector")
  451 + {
  452 + Edit = true;
  453 + CreateCable ("Dsub", File_FullName, Edit);
  454 + }
  455 +
  456 + if (str == "Flex_cable")
  457 + {
  458 + Edit = true;
  459 + CreateCable ("Flexcable", File_FullName, Edit);
  460 + }
  461 + }
  462 +}
  463 +
  464 +void SW1_GUIFrame::CreateCable(wxString CableType, wxString CableFile, bool Edit)
  465 +{
  466 + int cable;
  467 +
  468 + if (CableType == "Cylindrical") cable = 1;
  469 + if (CableType == "Coaxial") cable = 2;
  470 + if (CableType == "Twinax") cable = 3;
  471 + if (CableType == "UTP") cable = 4;
  472 + if (CableType == "TP") cable = 5;
  473 + if (CableType == "Spacewire") cable = 6;
  474 + if (CableType == "Overshield") cable = 7;
  475 + if (CableType == "Flexcable") cable = 8;
  476 + if (CableType == "Dsub") cable = 9;
  477 +
  478 + switch (cable)
  479 + {
  480 + case 1:
  481 + {
  482 + CYLINDRICAL *cylindrical = new CYLINDRICAL(this);
  483 + cylindrical->SetPathToMOD(PathToMOD, MODname);
  484 + cylindrical->EDIT_EXISTING = Edit;
  485 + cylindrical->ShowModal();
  486 + break;
  487 + }
  488 +
  489 + case 2:
  490 + {
  491 + COAXIAL *coaxial = new COAXIAL(this);
  492 + coaxial->SetPathToMOD(PathToMOD, MODname);
  493 + coaxial->EDIT_EXISTING = Edit;
  494 + coaxial->ShowModal();
  495 + break;
  496 + }
  497 +
  498 + case 3:
  499 + {
  500 + TWINAX *twinax = new TWINAX(this);
  501 + twinax->SetPathToMOD(PathToMOD, MODname);
  502 + twinax->EDIT_EXISTING = Edit;
  503 + twinax->ShowModal();
  504 + break;
  505 + }
  506 +
  507 + case 4:
  508 + {
  509 + UTP *utp = new UTP(this);
  510 + utp->SetPathToMOD(PathToMOD, MODname);
  511 + utp->EDIT_EXISTING = Edit;
  512 + utp->ShowModal();
  513 + break;
  514 + }
  515 +
  516 + case 5:
  517 + {
  518 + TP *tp = new TP(this);
  519 + tp->SetPathToMOD(PathToMOD, MODname);
  520 + tp->EDIT_EXISTING = Edit;
  521 + tp->ShowModal();
  522 + break;
  523 + }
  524 +
  525 + case 6:
  526 + {
  527 + SPACEWIRE *spacewire = new SPACEWIRE(this);
  528 + spacewire->SetPathToMOD(PathToMOD, MODname);
  529 + spacewire->EDIT_EXISTING = Edit;
  530 + spacewire->ShowModal();
  531 + break;
  532 + }
  533 +
  534 + case 7:
  535 + {
  536 + OVERSHIELD *overshield = new OVERSHIELD(this);
  537 + overshield->SetPathToMOD(PathToMOD, MODname);
  538 + overshield->EDIT_EXISTING = Edit;
  539 + overshield->ShowModal();
  540 + break;
  541 + }
  542 +
  543 + case 8:
  544 + {
  545 + FLEXCABLE *flexcable = new FLEXCABLE(this);
  546 + flexcable->SetPathToMOD(PathToMOD, MODname);
  547 + flexcable->EDIT_EXISTING = Edit;
  548 + flexcable->ShowModal();
  549 + break;
  550 + }
  551 +
  552 +
  553 + case 9:
  554 + {
  555 + DCONN *dsub = new DCONN(this);
  556 + dsub->SetPathToMOD(PathToMOD, MODname);
  557 + dsub->EDIT_EXISTING = Edit;
  558 + dsub->ShowModal();
  559 + break;
  560 + }
  561 + }
  562 +}
  563 +
  564 +void SW1_GUIFrame::OnCYLINDRICAL(wxCommandEvent& event)
  565 +{
  566 + Edit = false;
  567 + CreateCable ("Cylindrical", "", Edit);
392 } 568 }
393 569
394 void SW1_GUIFrame::OnCOAXIAL(wxCommandEvent& event) 570 void SW1_GUIFrame::OnCOAXIAL(wxCommandEvent& event)
395 { 571 {
396 - COAXIAL *coaxial = new COAXIAL(this);  
397 - coaxial->SetPathToMOD(PathToMOD, MODname);  
398 - coaxial->ShowModal(); 572 + Edit = false;
  573 + CreateCable ("Coaxial", "", Edit);
399 } 574 }
400 575
401 void SW1_GUIFrame::OnTWINAX(wxCommandEvent& event) 576 void SW1_GUIFrame::OnTWINAX(wxCommandEvent& event)
402 { 577 {
403 - TWINAX *twinax = new TWINAX(this);  
404 - twinax->SetPathToMOD(PathToMOD, MODname);  
405 - twinax->ShowModal(); 578 + Edit = false;
  579 + CreateCable ("Twinax", "", Edit);
406 } 580 }
407 581
408 void SW1_GUIFrame::OnUTP(wxCommandEvent& event) 582 void SW1_GUIFrame::OnUTP(wxCommandEvent& event)
409 { 583 {
410 - UTP *utp = new UTP(this);  
411 - utp->SetPathToMOD(PathToMOD, MODname);  
412 - utp->ShowModal(); 584 + Edit = false;
  585 + CreateCable ("UTP", "", Edit);
413 } 586 }
414 587
415 void SW1_GUIFrame::OnTP(wxCommandEvent& event) 588 void SW1_GUIFrame::OnTP(wxCommandEvent& event)
416 { 589 {
417 - TP *tp = new TP(this);  
418 - tp->SetPathToMOD(PathToMOD, MODname);  
419 - tp->ShowModal(); 590 + Edit = false;
  591 + CreateCable ("TP", "", Edit);
420 } 592 }
421 593
422 void SW1_GUIFrame::OnSPACEWIRE(wxCommandEvent& event) 594 void SW1_GUIFrame::OnSPACEWIRE(wxCommandEvent& event)
423 { 595 {
424 - SPACEWIRE *spacewire = new SPACEWIRE(this);  
425 - spacewire->SetPathToMOD(PathToMOD, MODname);  
426 - spacewire->ShowModal(); 596 + Edit = false;
  597 + CreateCable ("Spacewire", "", Edit);
427 } 598 }
428 599
429 void SW1_GUIFrame::OnOVERSHIELD(wxCommandEvent& event) 600 void SW1_GUIFrame::OnOVERSHIELD(wxCommandEvent& event)
430 { 601 {
431 - OVERSHIELD *overshield = new OVERSHIELD(this);  
432 - overshield->SetPathToMOD(PathToMOD, MODname);  
433 - overshield->ShowModal(); 602 + Edit = false;
  603 + CreateCable ("Overshield", "", Edit);
434 } 604 }
435 605
436 void SW1_GUIFrame::OnFLEXCABLE(wxCommandEvent& event) 606 void SW1_GUIFrame::OnFLEXCABLE(wxCommandEvent& event)
437 { 607 {
438 - FLEXCABLE *flexcable = new FLEXCABLE(this);  
439 - flexcable->SetPathToMOD(PathToMOD, MODname);  
440 - flexcable->ShowModal(); 608 + Edit = false;
  609 + CreateCable ("Flexcable", "", Edit);
441 } 610 }
442 611
443 void SW1_GUIFrame::OnDSUB(wxCommandEvent& event) 612 void SW1_GUIFrame::OnDSUB(wxCommandEvent& event)
444 { 613 {
445 - DCONN *dsub = new DCONN(this);  
446 - dsub->SetPathToMOD(PathToMOD, MODname);  
447 - dsub->ShowModal(); 614 + Edit = false;
  615 + CreateCable ("Dsub", "", Edit);
448 } 616 }
449 617
450 void SW1_GUIFrame::OnNEWBUNDLE(wxCommandEvent& event) 618 void SW1_GUIFrame::OnNEWBUNDLE(wxCommandEvent& event)
@@ -470,11 +638,14 @@ void SW1_GUIFrame::OnEXPORTSPICE(wxCommandEvent&amp; event) @@ -470,11 +638,14 @@ void SW1_GUIFrame::OnEXPORTSPICE(wxCommandEvent&amp; event)
470 638
471 void SW1_GUIFrame::OnPanel1Paint(wxPaintEvent& event) 639 void SW1_GUIFrame::OnPanel1Paint(wxPaintEvent& event)
472 { 640 {
473 - 641 + if (tree != NULL){
  642 + int size_h, size_v;
  643 + Panel1->GetSize(&size_h, &size_v );
  644 + tree->SetSize(size_h,size_v);
  645 + }
474 } 646 }
  647 +
475 void SW1_GUIFrame::OnPanel2Paint(wxPaintEvent& event) 648 void SW1_GUIFrame::OnPanel2Paint(wxPaintEvent& event)
476 { 649 {
477 650
478 } 651 }
479 -  
480 -  
GUI/SW1/SRC/SW1_GUIMain.h
  Diff comments   View file @2a0d305
@@ -99,18 +99,21 @@ class SW1_GUIFrame: public wxFrame @@ -99,18 +99,21 @@ class SW1_GUIFrame: public wxFrame
99 99
100 void PopulateTheDirectoryTree ( wxString ); 100 void PopulateTheDirectoryTree ( wxString );
101 void OnTreeSelectionChanged ( wxTreeEvent& evt ); 101 void OnTreeSelectionChanged ( wxTreeEvent& evt );
  102 + void OnTreeSelection ( wxTreeEvent& evt );
  103 + void CreateCable (wxString, wxString, bool);
102 104
103 wxSpecificDirCtrl *tree; 105 wxSpecificDirCtrl *tree;
104 106
105 wxString PathToMOD; 107 wxString PathToMOD;
  108 + wxString SelectedFile;
106 wxString MODname; 109 wxString MODname;
107 110
108 - int allowResize; 111 + bool Edit;
109 112
110 //(*Handlers(SW1_GUIFrame) 113 //(*Handlers(SW1_GUIFrame)
111 void OnQuit(wxCommandEvent& event); 114 void OnQuit(wxCommandEvent& event);
112 void OnAbout(wxCommandEvent& event); 115 void OnAbout(wxCommandEvent& event);
113 - void onSelectMOD(wxCommandEvent& event); 116 + void OnSelectMOD(wxCommandEvent& event);
114 void OnCOAXIAL(wxCommandEvent& event); 117 void OnCOAXIAL(wxCommandEvent& event);
115 void OnPanel1Paint(wxPaintEvent& event); 118 void OnPanel1Paint(wxPaintEvent& event);
116 void OnPanel2Paint(wxPaintEvent& event); 119 void OnPanel2Paint(wxPaintEvent& event);
@@ -128,7 +131,7 @@ class SW1_GUIFrame: public wxFrame @@ -128,7 +131,7 @@ class SW1_GUIFrame: public wxFrame
128 void OnPanel1Resize(wxSizeEvent& event); 131 void OnPanel1Resize(wxSizeEvent& event);
129 void OnResize(wxSizeEvent& event); 132 void OnResize(wxSizeEvent& event);
130 void OnPanel1RightDClick(wxMouseEvent& event); 133 void OnPanel1RightDClick(wxMouseEvent& event);
131 - void onCreateMOD(wxCommandEvent& event); 134 + void OnCreateMOD(wxCommandEvent& event);
132 void OnEXPORTSPICE(wxCommandEvent& event); 135 void OnEXPORTSPICE(wxCommandEvent& event);
133 void OnClose(wxCloseEvent& event); 136 void OnClose(wxCloseEvent& event);
134 //*) 137 //*)
GUI/SW1/SRC/TP.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -326,9 +326,19 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size) @@ -326,9 +326,19 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
326 Panel4->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPanel4Paint,0,this); 326 Panel4->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPanel4Paint,0,this);
327 Panel4->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TP::OnPanel4LeftDClick,0,this); 327 Panel4->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TP::OnPanel4LeftDClick,0,this);
328 Panel4->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&TP::OnPanel4MouseWheel,0,this); 328 Panel4->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&TP::OnPanel4MouseWheel,0,this);
  329 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&TP::OnInit);
329 Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPaint); 330 Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPaint);
330 //*) 331 //*)
  332 +}
  333 +
  334 +TP::~TP()
  335 +{
  336 + //(*Destroy(TP)
  337 + //*)
  338 +}
331 339
  340 +void TP::OnInit(wxInitDialogEvent& event)
  341 +{
332 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this); 342 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
333 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this); 343 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
334 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this); 344 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
@@ -342,12 +352,6 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size) @@ -342,12 +352,6 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
342 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this); 352 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
343 } 353 }
344 354
345 -TP::~TP()  
346 -{  
347 - //(*Destroy(TP)  
348 - //*)  
349 -}  
350 -  
351 void TP::OnPaint(wxPaintEvent& event) 355 void TP::OnPaint(wxPaintEvent& event)
352 { 356 {
353 if (EDIT_EXISTING==true) EditExistingCable(); 357 if (EDIT_EXISTING==true) EditExistingCable();
@@ -425,13 +429,11 @@ void TP::OnButton1Click(wxCommandEvent&amp; event) @@ -425,13 +429,11 @@ void TP::OnButton1Click(wxCommandEvent&amp; event)
425 429
426 void TP::OnCheckBox1Click(wxCommandEvent& event) 430 void TP::OnCheckBox1Click(wxCommandEvent& event)
427 { 431 {
428 - //TextCtrl2->Disable();  
429 - //TextCtrl3->Disable(); 432 + TextCtrl10->Disable();
  433 + TextCtrl11->Disable();
430 434
431 FD_ESR *winFD_ESR = new FD_ESR(this); 435 FD_ESR *winFD_ESR = new FD_ESR(this);
432 436
433 - //winFD_ESR->formtype = 1;  
434 -  
435 if ( winFD_ESR->ShowModal() == wxID_OK ) 437 if ( winFD_ESR->ShowModal() == wxID_OK )
436 { 438 {
437 FD_ESR1 = winFD_ESR->TextCtrl1->GetValue(); 439 FD_ESR1 = winFD_ESR->TextCtrl1->GetValue();
@@ -463,17 +465,18 @@ void TP::OnButton2Click(wxCommandEvent&amp; event) @@ -463,17 +465,18 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
463 clean_temp_files(); 465 clean_temp_files();
464 466
465 wxString fileName = TextCtrl1->GetValue(); 467 wxString fileName = TextCtrl1->GetValue();
466 - wxString fineName = fileName; 468 + wxString command_line;
467 469
468 std::stringstream stream; 470 std::stringstream stream;
469 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 471 +
  472 + stream << "cable_model_builder"
470 << " " 473 << " "
471 << "..\\" + MODname + "\\CABLE\\" 474 << "..\\" + MODname + "\\CABLE\\"
472 << fileName ; 475 << fileName ;
473 476
474 - system(stream.str().c_str()); 477 + command_line << stream.str().c_str();
475 478
476 - //ifstream runStatus; 479 + wxExecute (command_line);
477 480
478 // Display Run Status 481 // Display Run Status
479 RUN_STATUS *run_status = new RUN_STATUS(this); 482 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -492,8 +495,6 @@ void TP::OnButton2Click(wxCommandEvent&amp; event) @@ -492,8 +495,6 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
492 495
493 file = wxFindFirstFile(pattern); 496 file = wxFindFirstFile(pattern);
494 497
495 -  
496 -  
497 while ( !file.empty()) 498 while ( !file.empty())
498 { 499 {
499 wxString meshfile = file; 500 wxString meshfile = file;
@@ -519,7 +520,6 @@ void TP::OnButton2Click(wxCommandEvent&amp; event) @@ -519,7 +520,6 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
519 void TP::OnButton3Click(wxCommandEvent& event) 520 void TP::OnButton3Click(wxCommandEvent& event)
520 { 521 {
521 //clean up directory 522 //clean up directory
522 - wxMessageBox("Please fix highlighted errors" , _("HELP3"));  
523 clean_temp_files(); 523 clean_temp_files();
524 Close(); 524 Close();
525 } 525 }
@@ -701,7 +701,7 @@ void TP::WriteCableFile (wxString fileName) @@ -701,7 +701,7 @@ void TP::WriteCableFile (wxString fileName)
701 { 701 {
702 ofstream cableFile; 702 ofstream cableFile;
703 703
704 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 704 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
705 705
706 cableFile.open (fullFileName); 706 cableFile.open (fullFileName);
707 707
@@ -802,12 +802,8 @@ void TP::WriteCableFile (wxString fileName) @@ -802,12 +802,8 @@ void TP::WriteCableFile (wxString fileName)
802 802
803 if (CheckBox3->GetValue()) 803 if (CheckBox3->GetValue())
804 { 804 {
805 - //cableFile << "Laplace_boundary_constant\n";  
806 - //cableFile << MESH_PARAM1 <<"\n";  
807 cableFile << "Laplace_surface_mesh_constant\n"; 805 cableFile << "Laplace_surface_mesh_constant\n";
808 cableFile << MESH_PARAM2 <<"\n"; 806 cableFile << MESH_PARAM2 <<"\n";
809 - //cableFile << "max_mesh_edge_length\n";  
810 - //cableFile << MESH_PARAM3 <<"\n";  
811 807
812 CheckBox3 ->SetValue(false); 808 CheckBox3 ->SetValue(false);
813 } 809 }
@@ -1132,8 +1128,6 @@ void TP::OnNotebook1PageChanging(wxNotebookEvent&amp; event) @@ -1132,8 +1128,6 @@ void TP::OnNotebook1PageChanging(wxNotebookEvent&amp; event)
1132 tpSchematic(); 1128 tpSchematic();
1133 } 1129 }
1134 1130
1135 -  
1136 -  
1137 void TP::OnCheckBox3Click(wxCommandEvent& event) 1131 void TP::OnCheckBox3Click(wxCommandEvent& event)
1138 { 1132 {
1139 if (CheckBox3->GetValue()) 1133 if (CheckBox3->GetValue())
@@ -1146,9 +1140,7 @@ void TP::OnCheckBox3Click(wxCommandEvent&amp; event) @@ -1146,9 +1140,7 @@ void TP::OnCheckBox3Click(wxCommandEvent&amp; event)
1146 1140
1147 if ( winMESH_PARAM->ShowModal() == wxID_OK ) 1141 if ( winMESH_PARAM->ShowModal() == wxID_OK )
1148 { 1142 {
1149 - //MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();  
1150 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue(); 1143 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
1151 - //MESH_PARAM3 = winMESH_PARAM->TextCtrl3->GetValue();  
1152 } 1144 }
1153 winMESH_PARAM->Destroy(); 1145 winMESH_PARAM->Destroy();
1154 } 1146 }
GUI/SW1/SRC/TP.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -278,6 +278,7 @@ class TP: public wxDialog @@ -278,6 +278,7 @@ class TP: public wxDialog
278 void OnTextCtrl18Text(wxCommandEvent& event); 278 void OnTextCtrl18Text(wxCommandEvent& event);
279 void OnCheckBox4Click(wxCommandEvent& event); 279 void OnCheckBox4Click(wxCommandEvent& event);
280 void OnPaint(wxPaintEvent& event); 280 void OnPaint(wxPaintEvent& event);
  281 + void OnInit(wxInitDialogEvent& event);
281 //*) 282 //*)
282 283
283 DECLARE_EVENT_TABLE() 284 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/TWINAX.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -334,9 +334,19 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s @@ -334,9 +334,19 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
334 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TWINAX::OnButton2Click); 334 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TWINAX::OnButton2Click);
335 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPanel1Paint,0,this); 335 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPanel1Paint,0,this);
336 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TWINAX::OnPanel1LeftDClick,0,this); 336 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TWINAX::OnPanel1LeftDClick,0,this);
  337 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&TWINAX::OnInit);
337 Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPaint); 338 Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPaint);
338 //*) 339 //*)
  340 +}
339 341
  342 +TWINAX::~TWINAX()
  343 +{
  344 + //(*Destroy(TWINAX)
  345 + //*)
  346 +}
  347 +
  348 +void TWINAX::OnInit(wxInitDialogEvent& event)
  349 +{
340 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this); 350 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this);
341 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this); 351 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this);
342 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this); 352 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this);
@@ -350,11 +360,6 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s @@ -350,11 +360,6 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
350 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this); 360 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this);
351 } 361 }
352 362
353 -TWINAX::~TWINAX()  
354 -{  
355 - //(*Destroy(TWINAX)  
356 - //*)  
357 -}  
358 363
359 void TWINAX::OnPaint(wxPaintEvent& event) 364 void TWINAX::OnPaint(wxPaintEvent& event)
360 { 365 {
@@ -434,15 +439,18 @@ void TWINAX::OnButton3Click(wxCommandEvent&amp; event) @@ -434,15 +439,18 @@ void TWINAX::OnButton3Click(wxCommandEvent&amp; event)
434 439
435 //CABLE BUIDER 440 //CABLE BUIDER
436 wxString fileName = TextCtrl1->GetValue(); 441 wxString fileName = TextCtrl1->GetValue();
437 - wxString fineName = fileName; 442 + wxString command_line;
438 443
439 std::stringstream stream; 444 std::stringstream stream;
440 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 445 +
  446 + stream << "cable_model_builder"
441 << " " 447 << " "
442 << "..\\" + MODname + "\\CABLE\\" 448 << "..\\" + MODname + "\\CABLE\\"
443 << fileName ; 449 << fileName ;
444 450
445 - system(stream.str().c_str()); 451 + command_line << stream.str().c_str();
  452 +
  453 + wxExecute (command_line);
446 454
447 // Display Run Status 455 // Display Run Status
448 RUN_STATUS *run_status = new RUN_STATUS(this); 456 RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -690,7 +698,7 @@ void TWINAX::WriteCableFile (wxString fileName) @@ -690,7 +698,7 @@ void TWINAX::WriteCableFile (wxString fileName)
690 { 698 {
691 ofstream cableFile; 699 ofstream cableFile;
692 700
693 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 701 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
694 702
695 cableFile.open (fullFileName); 703 cableFile.open (fullFileName);
696 704
@@ -1180,5 +1188,3 @@ void TWINAX::EditExistingCable() @@ -1180,5 +1188,3 @@ void TWINAX::EditExistingCable()
1180 { 1188 {
1181 Close(); 1189 Close();
1182 } 1190 }
1183 -  
1184 -  
GUI/SW1/SRC/TWINAX.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -278,6 +278,7 @@ class TWINAX: public wxDialog @@ -278,6 +278,7 @@ class TWINAX: public wxDialog
278 void OnTextCtrl18Text(wxCommandEvent& event); 278 void OnTextCtrl18Text(wxCommandEvent& event);
279 void OnCheckBox4Click(wxCommandEvent& event); 279 void OnCheckBox4Click(wxCommandEvent& event);
280 void OnPaint(wxPaintEvent& event); 280 void OnPaint(wxPaintEvent& event);
  281 + void OnInit(wxInitDialogEvent& event);
281 //*) 282 //*)
282 283
283 DECLARE_EVENT_TABLE() 284 DECLARE_EVENT_TABLE()
GUI/SW1/SRC/UTP.cpp
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -207,27 +207,27 @@ UTP::UTP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size) @@ -207,27 +207,27 @@ UTP::UTP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
207 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&UTP::OnPanel1Paint,0,this); 207 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&UTP::OnPanel1Paint,0,this);
208 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&UTP::OnPanel1LeftDClick,0,this); 208 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&UTP::OnPanel1LeftDClick,0,this);
209 Panel1->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&UTP::OnPanel1MouseWheel,0,this); 209 Panel1->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&UTP::OnPanel1MouseWheel,0,this);
  210 + Connect(wxID_ANY,wxEVT_INIT_DIALOG,(wxObjectEventFunction)&UTP::OnInit);
210 Connect(wxEVT_PAINT,(wxObjectEventFunction)&UTP::OnPaint); 211 Connect(wxEVT_PAINT,(wxObjectEventFunction)&UTP::OnPaint);
211 //*) 212 //*)
  213 +}
  214 +
  215 +UTP::~UTP()
  216 +{
  217 + //(*Destroy(UTP)
  218 + //*)
  219 +}
212 220
  221 +void UTP::OnInit(wxInitDialogEvent& event)
  222 +{
213 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this); 223 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
214 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this); 224 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
215 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this); 225 TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
216 TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this); 226 TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
217 -// TextCtrl6->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);  
218 -// TextCtrl7->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);  
219 -// TextCtrl8->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);  
220 -// TextCtrl9->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);  
221 -// TextCtrl10->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);  
222 TextCtrl11->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this); 227 TextCtrl11->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
223 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this); 228 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
224 } 229 }
225 230
226 -UTP::~UTP()  
227 -{  
228 - //(*Destroy(UTP)  
229 - //*)  
230 -}  
231 231
232 void UTP::OnPaint(wxPaintEvent& event) 232 void UTP::OnPaint(wxPaintEvent& event)
233 { 233 {
@@ -259,15 +259,7 @@ void UTP::OnButton1Click(wxCommandEvent&amp; event) @@ -259,15 +259,7 @@ void UTP::OnButton1Click(wxCommandEvent&amp; event)
259 check_is_empty(TextCtrl4, &IsError); 259 check_is_empty(TextCtrl4, &IsError);
260 check_is_empty(TextCtrl5, &IsError); 260 check_is_empty(TextCtrl5, &IsError);
261 261
262 - if (CheckBox1->GetValue())  
263 - {  
264 -// check_is_empty(TextCtrl6, &IsError);  
265 -// check_is_empty(TextCtrl7, &IsError);  
266 -// check_is_empty(TextCtrl8, &IsError);  
267 -// check_is_empty(TextCtrl9, &IsError);  
268 -// check_is_empty(TextCtrl10, &IsError);  
269 - }  
270 - else 262 + if (!CheckBox1->GetValue())
271 { 263 {
272 check_is_empty(TextCtrl11, &IsError); 264 check_is_empty(TextCtrl11, &IsError);
273 } 265 }
@@ -291,11 +283,6 @@ void UTP::OnButton1Click(wxCommandEvent&amp; event) @@ -291,11 +283,6 @@ void UTP::OnButton1Click(wxCommandEvent&amp; event)
291 void UTP::OnCheckBox1Click(wxCommandEvent& event) 283 void UTP::OnCheckBox1Click(wxCommandEvent& event)
292 { 284 {
293 TextCtrl11->Disable(); 285 TextCtrl11->Disable();
294 -// TextCtrl6->Enable();  
295 -// TextCtrl7->Enable();  
296 -// TextCtrl8->Enable();  
297 -// TextCtrl9->Enable();  
298 -// TextCtrl10->Enable();  
299 286
300 FD_ESR *winFD_ESR = new FD_ESR(this); 287 FD_ESR *winFD_ESR = new FD_ESR(this);
301 288
@@ -303,12 +290,6 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event) @@ -303,12 +290,6 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event)
303 290
304 if ( winFD_ESR->ShowModal() == wxID_OK ) 291 if ( winFD_ESR->ShowModal() == wxID_OK )
305 { 292 {
306 -// FD_ESR1 = winFD_ESR->TextCtrl1->GetValue();  
307 -// FD_ESR2 = winFD_ESR->TextCtrl2->GetValue();  
308 -// FD_ESR3 = winFD_ESR->TextCtrl3->GetValue();  
309 -// FD_ESR4 = winFD_ESR->TextCtrl4->GetValue();  
310 -// FD_ESR5 = winFD_ESR->TextCtrl5->GetValue();  
311 -  
312 FD_ESR6 = winFD_ESR->TextCtrl6->GetValue(); 293 FD_ESR6 = winFD_ESR->TextCtrl6->GetValue();
313 FD_ESR7 = winFD_ESR->TextCtrl7->GetValue(); 294 FD_ESR7 = winFD_ESR->TextCtrl7->GetValue();
314 FD_ESR8 = winFD_ESR->TextCtrl8->GetValue(); 295 FD_ESR8 = winFD_ESR->TextCtrl8->GetValue();
@@ -322,7 +303,6 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event) @@ -322,7 +303,6 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event)
322 FD_Fmin = winFD_ESR->TextCtrl12->GetValue(); 303 FD_Fmin = winFD_ESR->TextCtrl12->GetValue();
323 FD_Fmax = winFD_ESR->TextCtrl12->GetValue(); 304 FD_Fmax = winFD_ESR->TextCtrl12->GetValue();
324 FD_Num = winFD_ESR->TextCtrl12->GetValue(); 305 FD_Num = winFD_ESR->TextCtrl12->GetValue();
325 -  
326 } 306 }
327 winFD_ESR->Destroy(); 307 winFD_ESR->Destroy();
328 308
@@ -331,19 +311,21 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event) @@ -331,19 +311,21 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event)
331 void UTP::OnButton2Click(wxCommandEvent& event) 311 void UTP::OnButton2Click(wxCommandEvent& event)
332 { 312 {
333 //clean up directory 313 //clean up directory
334 - clean_temp_files(); 314 + clean_temp_files(); // in case any mesh files lurk
335 315
336 //CABLE BUIDER 316 //CABLE BUIDER
337 wxString fileName = TextCtrl1->GetValue(); 317 wxString fileName = TextCtrl1->GetValue();
338 - wxString fineName = fileName; 318 + wxString command_line;
339 319
340 std::stringstream stream; 320 std::stringstream stream;
341 - stream << "\"..\\BIN\\cable_model_builder.exe\"" 321 + stream << "cable_model_builder"
342 << " " 322 << " "
343 << "..\\" + MODname + "\\CABLE\\" 323 << "..\\" + MODname + "\\CABLE\\"
344 << fileName ; 324 << fileName ;
345 325
346 - system(stream.str().c_str()); 326 + command_line << stream.str().c_str();
  327 +
  328 + wxExecute (command_line);
347 329
348 ifstream runStatus; 330 ifstream runStatus;
349 331
@@ -355,7 +337,6 @@ void UTP::OnButton2Click(wxCommandEvent&amp; event) @@ -355,7 +337,6 @@ void UTP::OnButton2Click(wxCommandEvent&amp; event)
355 337
356 if (CheckBox2->GetValue()) 338 if (CheckBox2->GetValue())
357 { 339 {
358 -  
359 wxString pattern (("*.msh.vtk")) ; 340 wxString pattern (("*.msh.vtk")) ;
360 341
361 wxString file; 342 wxString file;
@@ -381,7 +362,6 @@ void UTP::OnButton2Click(wxCommandEvent&amp; event) @@ -381,7 +362,6 @@ void UTP::OnButton2Click(wxCommandEvent&amp; event)
381 362
382 file = wxFindNextFile(); 363 file = wxFindNextFile();
383 } 364 }
384 -  
385 CheckBox3->Enable(); 365 CheckBox3->Enable();
386 } 366 }
387 } 367 }
@@ -445,42 +425,12 @@ void UTP::OnTextCtrl11Text(wxCommandEvent&amp; event) @@ -445,42 +425,12 @@ void UTP::OnTextCtrl11Text(wxCommandEvent&amp; event)
445 check_is_numeric_list(TextCtrl11, &IsError); 425 check_is_numeric_list(TextCtrl11, &IsError);
446 } 426 }
447 427
448 -//void UTP::OnTextCtrl6Text(wxCommandEvent& event)  
449 -//{  
450 -// int IsError = 0;  
451 -// check_is_numeric_list(TextCtrl6, &IsError);  
452 -//}  
453 -//  
454 -//void UTP::OnTextCtrl7Text(wxCommandEvent& event)  
455 -//{  
456 -// int IsError = 0;  
457 -// check_is_numeric_list(TextCtrl7, &IsError);  
458 -//}  
459 -//  
460 -//void UTP::OnTextCtrl8Text(wxCommandEvent& event)  
461 -//{  
462 -// int IsError = 0;  
463 -// check_is_numeric_list(TextCtrl8, &IsError);  
464 -//}  
465 -//  
466 -//void UTP::OnTextCtrl9Text(wxCommandEvent& event)  
467 -//{  
468 -// int IsError = 0;  
469 -// check_is_numeric_list(TextCtrl9, &IsError);  
470 -//}  
471 -//  
472 -//void UTP::OnTextCtrl10Text(wxCommandEvent& event)  
473 -//{  
474 -// int IsError = 0;  
475 -// check_is_numeric_list(TextCtrl10, &IsError);  
476 -//}  
477 -  
478 void UTP::WriteCableFile (wxString fileName) 428 void UTP::WriteCableFile (wxString fileName)
479 { 429 {
480 430
481 ofstream cableFile; 431 ofstream cableFile;
482 432
483 - wxString fullFileName = pathToMOD + "//CABLE//" + fileName + ".cable_spec"; 433 + wxString fullFileName = pathToMOD + "/CABLE/" + fileName + ".cable_spec";
484 434
485 cableFile.open (fullFileName); 435 cableFile.open (fullFileName);
486 436
@@ -506,13 +456,6 @@ void UTP::WriteCableFile (wxString fileName) @@ -506,13 +456,6 @@ void UTP::WriteCableFile (wxString fileName)
506 cableFile << FD_ESR8 <<"\n"; 456 cableFile << FD_ESR8 <<"\n";
507 cableFile << FD_ESR9 <<"\t # b order, b coefficients follow below\n"; 457 cableFile << FD_ESR9 <<"\t # b order, b coefficients follow below\n";
508 cableFile << FD_ESR10 <<"\n"; 458 cableFile << FD_ESR10 <<"\n";
509 -  
510 -// cableFile << "# Dielectric relative permittivity model follows\n";  
511 -// cableFile << TextCtrl6->GetValue() <<" \t# w normalisation constant\n";  
512 -// cableFile << TextCtrl7->GetValue() <<" \t# a order, a coefficients follow below\n";  
513 -// cableFile << TextCtrl8->GetValue() <<" \n";  
514 -// cableFile << TextCtrl9->GetValue() <<" \t# b order, b coefficients follow below\n";  
515 -// cableFile << TextCtrl10->GetValue() <<" \n";  
516 } 459 }
517 460
518 else{ 461 else{
@@ -551,12 +494,8 @@ void UTP::WriteCableFile (wxString fileName) @@ -551,12 +494,8 @@ void UTP::WriteCableFile (wxString fileName)
551 494
552 if (CheckBox3->GetValue()) 495 if (CheckBox3->GetValue())
553 { 496 {
554 - //cableFile << "laplace_boundary_constant\n";  
555 - //cableFile << MESH_PARAM1 <<"\n";  
556 cableFile << "laplace_surface_mesh_constant\n"; 497 cableFile << "laplace_surface_mesh_constant\n";
557 cableFile << MESH_PARAM2 <<"\n"; 498 cableFile << MESH_PARAM2 <<"\n";
558 - //cableFile << "max_mesh_edge_length\n";  
559 - //cableFile << MESH_PARAM3 <<"\n";  
560 499
561 CheckBox3 ->SetValue(false); 500 CheckBox3 ->SetValue(false);
562 } 501 }
@@ -730,9 +669,7 @@ void UTP::OnCheckBox3Click(wxCommandEvent&amp; event) @@ -730,9 +669,7 @@ void UTP::OnCheckBox3Click(wxCommandEvent&amp; event)
730 669
731 if ( winMESH_PARAM->ShowModal() == wxID_OK ) 670 if ( winMESH_PARAM->ShowModal() == wxID_OK )
732 { 671 {
733 - //MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();  
734 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue(); 672 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
735 - //MESH_PARAM3 = winMESH_PARAM->TextCtrl3->GetValue();  
736 } 673 }
737 winMESH_PARAM->Destroy(); 674 winMESH_PARAM->Destroy();
738 } 675 }
@@ -759,4 +696,3 @@ void UTP::EditExistingCable() @@ -759,4 +696,3 @@ void UTP::EditExistingCable()
759 { 696 {
760 Close(); 697 Close();
761 } 698 }
762 -  
GUI/SW1/SRC/UTP.h
  Diff comments   View file @2a0d305
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 // It was developed by the University of Nottingham and the Netherlands Aerospace 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 // 6 //
7 -// Copyright (C) 2015 - 2017 University of Nottingham 7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 // 8 //
9 // SACAMOS is free software: you can redistribute it and/or modify it under the 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 // terms of the GNU General Public License as published by the Free Software 10 // terms of the GNU General Public License as published by the Free Software
@@ -205,6 +205,7 @@ class UTP: public wxDialog @@ -205,6 +205,7 @@ class UTP: public wxDialog
205 void OnPanel1MouseWheel(wxMouseEvent& event); 205 void OnPanel1MouseWheel(wxMouseEvent& event);
206 void OnComboBox1Selected(wxCommandEvent& event); 206 void OnComboBox1Selected(wxCommandEvent& event);
207 void OnPaint(wxPaintEvent& event); 207 void OnPaint(wxPaintEvent& event);
  208 + void OnInit(wxInitDialogEvent& event);
208 //*) 209 //*)
209 210
210 DECLARE_EVENT_TABLE() 211 DECLARE_EVENT_TABLE()