Commit 2e55c7768702ade1395b0b9c687d70459b579531
1 parent
16856de9
Exists in
master
and in
3 other branches
SW1_GUI Updates
BUNDLEBLDR Change message on cable delete pop up warning PLACE_CABLE add check for numeric entry
Showing
5 changed files
with
93 additions
and
44 deletions
Show diff stats
GUI/SW1/SRC/BUNDLEBLDR.cpp
@@ -353,7 +353,7 @@ void BUNDLEBLDR::OnListboxRDown(wxMouseEvent& event) | @@ -353,7 +353,7 @@ void BUNDLEBLDR::OnListboxRDown(wxMouseEvent& event) | ||
353 | 353 | ||
354 | } | 354 | } |
355 | else | 355 | else |
356 | - wxMessageBox(_T("Listbox right clicked but no item clicked upon"),_("No item selected")); | 356 | + wxMessageBox(_T("No Cable SELECTED"),_("Remove Cable Component")); |
357 | 357 | ||
358 | event.Skip(); | 358 | event.Skip(); |
359 | } | 359 | } |
@@ -362,6 +362,8 @@ void BUNDLEBLDR::PopulateListControl(void) | @@ -362,6 +362,8 @@ void BUNDLEBLDR::PopulateListControl(void) | ||
362 | { | 362 | { |
363 | ListBox1->Clear(); | 363 | ListBox1->Clear(); |
364 | 364 | ||
365 | + Button1->Enable(); | ||
366 | + | ||
365 | Bundle *Current = bundle_root; | 367 | Bundle *Current = bundle_root; |
366 | 368 | ||
367 | while ( Current->next != NULL ) | 369 | while ( Current->next != NULL ) |
@@ -369,6 +371,8 @@ void BUNDLEBLDR::PopulateListControl(void) | @@ -369,6 +371,8 @@ void BUNDLEBLDR::PopulateListControl(void) | ||
369 | ListBox1->Append(Current->CableType); | 371 | ListBox1->Append(Current->CableType); |
370 | Current = Current->next; | 372 | Current = Current->next; |
371 | } | 373 | } |
374 | + DrawPanel(); | ||
375 | + DrawBundleCsection(); | ||
372 | } | 376 | } |
373 | 377 | ||
374 | void BUNDLEBLDR::removeElement(int ItemIndex) | 378 | void BUNDLEBLDR::removeElement(int ItemIndex) |
@@ -398,6 +402,8 @@ void BUNDLEBLDR::removeElement(int ItemIndex) | @@ -398,6 +402,8 @@ void BUNDLEBLDR::removeElement(int ItemIndex) | ||
398 | 402 | ||
399 | delete Current; | 403 | delete Current; |
400 | 404 | ||
405 | + Button1->Enable(); | ||
406 | + | ||
401 | } | 407 | } |
402 | 408 | ||
403 | 409 | ||
@@ -462,6 +468,8 @@ void BUNDLEBLDR::OnTreeSelectionChanged(wxTreeEvent& evt) | @@ -462,6 +468,8 @@ void BUNDLEBLDR::OnTreeSelectionChanged(wxTreeEvent& evt) | ||
462 | 468 | ||
463 | ListBox1->Append(File_FullName); | 469 | ListBox1->Append(File_FullName); |
464 | 470 | ||
471 | + Button1->Enable(); | ||
472 | + | ||
465 | DrawBundleCsection(); | 473 | DrawBundleCsection(); |
466 | 474 | ||
467 | } | 475 | } |
@@ -487,6 +495,19 @@ void BUNDLEBLDR::OnCheckListBox1Toggled(wxCommandEvent& event) | @@ -487,6 +495,19 @@ void BUNDLEBLDR::OnCheckListBox1Toggled(wxCommandEvent& event) | ||
487 | 495 | ||
488 | void BUNDLEBLDR::OnPanel1Paint(wxPaintEvent& event) | 496 | void BUNDLEBLDR::OnPanel1Paint(wxPaintEvent& event) |
489 | { | 497 | { |
498 | +// double maxDimension; | ||
499 | +// | ||
500 | +// wxString maxXY = TextCtrl8->GetValue(); | ||
501 | +// | ||
502 | +// maxXY.ToDouble(&maxDimension); | ||
503 | +// | ||
504 | +// FormatPanel(maxDimension); | ||
505 | + | ||
506 | + DrawPanel(); | ||
507 | +} | ||
508 | + | ||
509 | +void BUNDLEBLDR::DrawPanel() | ||
510 | +{ | ||
490 | double maxDimension; | 511 | double maxDimension; |
491 | 512 | ||
492 | wxString maxXY = TextCtrl8->GetValue(); | 513 | wxString maxXY = TextCtrl8->GetValue(); |
@@ -1615,3 +1636,4 @@ void BUNDLEBLDR::OnSpinButton1ChangeDown(wxSpinEvent& event) | @@ -1615,3 +1636,4 @@ void BUNDLEBLDR::OnSpinButton1ChangeDown(wxSpinEvent& event) | ||
1615 | 1636 | ||
1616 | DrawBundleCsection(); | 1637 | DrawBundleCsection(); |
1617 | } | 1638 | } |
1639 | + |
GUI/SW1/SRC/BUNDLEBLDR.h
@@ -115,6 +115,7 @@ class BUNDLEBLDR: public wxDialog | @@ -115,6 +115,7 @@ class BUNDLEBLDR: public wxDialog | ||
115 | void DrawBundleCable(wxString, wxString, wxString, wxString); | 115 | void DrawBundleCable(wxString, wxString, wxString, wxString); |
116 | 116 | ||
117 | void ConstructBundleCsection(wxString, wxString, wxString); | 117 | void ConstructBundleCsection(wxString, wxString, wxString); |
118 | + void DrawPanel(); | ||
118 | void DrawBundleCsection(); | 119 | void DrawBundleCsection(); |
119 | 120 | ||
120 | void WriteBundleFile(wxString); | 121 | void WriteBundleFile(wxString); |
GUI/SW1/SRC/PLACE_CABLE.cpp
@@ -92,7 +92,9 @@ PLACE_CABLE::PLACE_CABLE(wxWindow* parent,wxWindowID id,const wxPoint& pos,const | @@ -92,7 +92,9 @@ PLACE_CABLE::PLACE_CABLE(wxWindow* parent,wxWindowID id,const wxPoint& pos,const | ||
92 | StaticBoxSizer1->Fit(this); | 92 | StaticBoxSizer1->Fit(this); |
93 | StaticBoxSizer1->SetSizeHints(this); | 93 | StaticBoxSizer1->SetSizeHints(this); |
94 | 94 | ||
95 | - Connect(ID_TEXTCTRL1,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnbundleXText); | 95 | + Connect(ID_TEXTCTRL1,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnTextCtrl1Text); |
96 | + Connect(ID_TEXTCTRL2,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnTextCtrl2Text); | ||
97 | + Connect(ID_TEXTCTRL3,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&PLACE_CABLE::OnTextCtrl3Text); | ||
96 | Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PLACE_CABLE::OnButton1Click); | 98 | Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PLACE_CABLE::OnButton1Click); |
97 | Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PLACE_CABLE::OnButton2Click); | 99 | Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PLACE_CABLE::OnButton2Click); |
98 | //*) | 100 | //*) |
@@ -118,6 +120,22 @@ void PLACE_CABLE::OnButton2Click(wxCommandEvent& event) | @@ -118,6 +120,22 @@ void PLACE_CABLE::OnButton2Click(wxCommandEvent& event) | ||
118 | 120 | ||
119 | } | 121 | } |
120 | 122 | ||
121 | -void PLACE_CABLE::OnbundleXText(wxCommandEvent& event) | 123 | +void PLACE_CABLE::OnTextCtrl1Text(wxCommandEvent& event) |
122 | { | 124 | { |
125 | + int IsError = 0; | ||
126 | + check_is_numeric_list(TextCtrl1, &IsError); | ||
123 | } | 127 | } |
128 | + | ||
129 | +void PLACE_CABLE::OnTextCtrl2Text(wxCommandEvent& event) | ||
130 | +{ | ||
131 | + int IsError = 0; | ||
132 | + check_is_numeric_list(TextCtrl2, &IsError); | ||
133 | +} | ||
134 | + | ||
135 | +void PLACE_CABLE::OnTextCtrl3Text(wxCommandEvent& event) | ||
136 | +{ | ||
137 | + int IsError = 0; | ||
138 | + check_is_numeric_list(TextCtrl3, &IsError); | ||
139 | +} | ||
140 | + | ||
141 | + |
GUI/SW1/SRC/PLACE_CABLE.h
@@ -50,6 +50,9 @@ | @@ -50,6 +50,9 @@ | ||
50 | #include <wx/dialog.h> | 50 | #include <wx/dialog.h> |
51 | //*) | 51 | //*) |
52 | 52 | ||
53 | +// Application Includes | ||
54 | +#include "UTILITIES.h" | ||
55 | + | ||
53 | class PLACE_CABLE: public wxDialog | 56 | class PLACE_CABLE: public wxDialog |
54 | { | 57 | { |
55 | public: | 58 | public: |
@@ -88,7 +91,9 @@ class PLACE_CABLE: public wxDialog | @@ -88,7 +91,9 @@ class PLACE_CABLE: public wxDialog | ||
88 | //(*Handlers(PLACE_CABLE) | 91 | //(*Handlers(PLACE_CABLE) |
89 | void OnButton2Click(wxCommandEvent& event); | 92 | void OnButton2Click(wxCommandEvent& event); |
90 | void OnButton1Click(wxCommandEvent& event); | 93 | void OnButton1Click(wxCommandEvent& event); |
91 | - void OnbundleXText(wxCommandEvent& event); | 94 | + void OnTextCtrl2Text(wxCommandEvent& event); |
95 | + void OnTextCtrl3Text(wxCommandEvent& event); | ||
96 | + void OnTextCtrl1Text(wxCommandEvent& event); | ||
92 | //*) | 97 | //*) |
93 | 98 | ||
94 | DECLARE_EVENT_TABLE() | 99 | DECLARE_EVENT_TABLE() |
GUI/SW1/SRC/SW1_GUI.depend
@@ -5541,7 +5541,7 @@ | @@ -5541,7 +5541,7 @@ | ||
5541 | <wx/intl.h> | 5541 | <wx/intl.h> |
5542 | <wx/string.h> | 5542 | <wx/string.h> |
5543 | 5543 | ||
5544 | -1533748199 source:c:\users\eezsg\desktop\sacamos_july_20189 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.cpp2\local_sw1\about.cpp | 5544 | +1534176979 source:c:\users\eezsg\desktop\sacamos_july_20189 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> |
@@ -5549,26 +5549,28 @@ | @@ -5549,26 +5549,28 @@ | ||
5549 | <wx/intl.h> | 5549 | <wx/intl.h> |
5550 | <wx/string.h> | 5550 | <wx/string.h> |
5551 | 5551 | ||
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 | 5552 | +1534156874 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.h2\local_sw1\about.h |
5553 | <wx/sizer.h> | 5553 | <wx/sizer.h> |
5554 | <wx/textctrl.h> | 5554 | <wx/textctrl.h> |
5555 | <wx/panel.h> | 5555 | <wx/panel.h> |
5556 | <wx/statbmp.h> | 5556 | <wx/statbmp.h> |
5557 | <wx/dialog.h> | 5557 | <wx/dialog.h> |
5558 | 5558 | ||
5559 | -1530874924 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp2\local_sw1\bundle_schematic.cpp | 5559 | +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp2\local_sw1\bundle_schematic.cpp |
5560 | "BUNDLE_SCHEMATIC.h" | 5560 | "BUNDLE_SCHEMATIC.h" |
5561 | 5561 | ||
5562 | -1502693582 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h2\local_sw1\bundle_schematic.h | 5562 | +1533919879 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h2\local_sw1\bundle_schematic.h |
5563 | <wx/panel.h> | 5563 | <wx/panel.h> |
5564 | <wx/dcclient.h> | 5564 | <wx/dcclient.h> |
5565 | <wx/msgdlg.h> | 5565 | <wx/msgdlg.h> |
5566 | + <wx/filename.h> | ||
5566 | <iostream> | 5567 | <iostream> |
5567 | <fstream> | 5568 | <fstream> |
5568 | <sstream> | 5569 | <sstream> |
5569 | <cmath> | 5570 | <cmath> |
5571 | + <string> | ||
5570 | 5572 | ||
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 | +1534453396 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 |
5572 | "BUNDLEBLDR.h" | 5574 | "BUNDLEBLDR.h" |
5573 | "PLACE_CABLE.h" | 5575 | "PLACE_CABLE.h" |
5574 | "MESH_LAPLACE.h" | 5576 | "MESH_LAPLACE.h" |
@@ -5583,7 +5585,7 @@ | @@ -5583,7 +5585,7 @@ | ||
5583 | <wx/intl.h> | 5585 | <wx/intl.h> |
5584 | <wx/string.h> | 5586 | <wx/string.h> |
5585 | 5587 | ||
5586 | -1530739988 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.h2\local_sw1\bundlebldr.h | 5588 | +1534453477 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.h2\local_sw1\bundlebldr.h |
5587 | <wx/notebook.h> | 5589 | <wx/notebook.h> |
5588 | <wx/sizer.h> | 5590 | <wx/sizer.h> |
5589 | <wx/stattext.h> | 5591 | <wx/stattext.h> |
@@ -5612,13 +5614,13 @@ | @@ -5612,13 +5614,13 @@ | ||
5612 | "wx/dirdlg.h" | 5614 | "wx/dirdlg.h" |
5613 | "wx/choice.h" | 5615 | "wx/choice.h" |
5614 | 5616 | ||
5615 | -1502693568 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.h2\local_sw1\utilities.h | 5617 | +1534156875 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.h2\local_sw1\utilities.h |
5616 | <wx/textctrl.h> | 5618 | <wx/textctrl.h> |
5617 | <wx/tokenzr.h> | 5619 | <wx/tokenzr.h> |
5618 | <wx/filename.h> | 5620 | <wx/filename.h> |
5619 | <wx/filefn.h> | 5621 | <wx/filefn.h> |
5620 | 5622 | ||
5621 | -1502693576 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.h2\local_sw1\mesh_laplace.h | 5623 | +1534156875 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.h2\local_sw1\mesh_laplace.h |
5622 | <wx/sizer.h> | 5624 | <wx/sizer.h> |
5623 | <wx/panel.h> | 5625 | <wx/panel.h> |
5624 | <wx/button.h> | 5626 | <wx/button.h> |
@@ -5638,7 +5640,7 @@ | @@ -5638,7 +5640,7 @@ | ||
5638 | <wx/dialog.h> | 5640 | <wx/dialog.h> |
5639 | "UTILITIES.h" | 5641 | "UTILITIES.h" |
5640 | 5642 | ||
5641 | -1502693574 c:\users\eezsg\desktop\sacamos_july_201874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.h2\local_sw1\run_status.h | 5643 | +1534156874 c:\users\eezsg\desktop\sacamos_july_201874 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.h2\local_sw1\run_status.h |
5642 | <wx/sizer.h> | 5644 | <wx/sizer.h> |
5643 | <wx/textctrl.h> | 5645 | <wx/textctrl.h> |
5644 | <wx/dialog.h> | 5646 | <wx/dialog.h> |
@@ -5647,17 +5649,18 @@ | @@ -5647,17 +5649,18 @@ | ||
5647 | <fstream> | 5649 | <fstream> |
5648 | <sstream> | 5650 | <sstream> |
5649 | 5651 | ||
5650 | -1502693576 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.h2\local_sw1\place_cable.h | 5652 | +1534454450 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.h2\local_sw1\place_cable.h |
5651 | <wx/sizer.h> | 5653 | <wx/sizer.h> |
5652 | <wx/stattext.h> | 5654 | <wx/stattext.h> |
5653 | <wx/textctrl.h> | 5655 | <wx/textctrl.h> |
5654 | <wx/button.h> | 5656 | <wx/button.h> |
5655 | <wx/dialog.h> | 5657 | <wx/dialog.h> |
5658 | + "UTILITIES.h" | ||
5656 | 5659 | ||
5657 | -1530399132 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.cpp2\local_sw1\cable_schematic.cpp | 5660 | +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.cpp2\local_sw1\cable_schematic.cpp |
5658 | "CABLE_SCHEMATIC.h" | 5661 | "CABLE_SCHEMATIC.h" |
5659 | 5662 | ||
5660 | -1502693580 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.h2\local_sw1\cable_schematic.h | 5663 | +1534156875 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.h2\local_sw1\cable_schematic.h |
5661 | <wx/panel.h> | 5664 | <wx/panel.h> |
5662 | <wx/dcclient.h> | 5665 | <wx/dcclient.h> |
5663 | <wx/msgdlg.h> | 5666 | <wx/msgdlg.h> |
@@ -5665,7 +5668,7 @@ | @@ -5665,7 +5668,7 @@ | ||
5665 | <fstream> | 5668 | <fstream> |
5666 | <sstream> | 5669 | <sstream> |
5667 | 5670 | ||
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 | 5671 | +1533918833 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 |
5669 | "COAXIAL.h" | 5672 | "COAXIAL.h" |
5670 | <wx/settings.h> | 5673 | <wx/settings.h> |
5671 | <wx/font.h> | 5674 | <wx/font.h> |
@@ -5692,7 +5695,7 @@ | @@ -5692,7 +5695,7 @@ | ||
5692 | <fstream> | 5695 | <fstream> |
5693 | <sstream> | 5696 | <sstream> |
5694 | 5697 | ||
5695 | -1530719644 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.h2\local_sw1\fd_esr.h | 5698 | +1534156875 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.h2\local_sw1\fd_esr.h |
5696 | <wx/sizer.h> | 5699 | <wx/sizer.h> |
5697 | <wx/stattext.h> | 5700 | <wx/stattext.h> |
5698 | <wx/textctrl.h> | 5701 | <wx/textctrl.h> |
@@ -5711,7 +5714,7 @@ | @@ -5711,7 +5714,7 @@ | ||
5711 | <wx/button.h> | 5714 | <wx/button.h> |
5712 | <wx/dialog.h> | 5715 | <wx/dialog.h> |
5713 | 5716 | ||
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 | 5717 | +1533918802 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 |
5715 | "CYLINDRICAL.h" | 5718 | "CYLINDRICAL.h" |
5716 | <wx/settings.h> | 5719 | <wx/settings.h> |
5717 | <wx/intl.h> | 5720 | <wx/intl.h> |
@@ -5734,13 +5737,13 @@ | @@ -5734,13 +5737,13 @@ | ||
5734 | <fstream> | 5737 | <fstream> |
5735 | <sstream> | 5738 | <sstream> |
5736 | 5739 | ||
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 | 5740 | +1533918900 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 |
5738 | "DCONN.h" | 5741 | "DCONN.h" |
5739 | <wx/settings.h> | 5742 | <wx/settings.h> |
5740 | <wx/intl.h> | 5743 | <wx/intl.h> |
5741 | <wx/string.h> | 5744 | <wx/string.h> |
5742 | 5745 | ||
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 | 5746 | +1533831264 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.h2\local_sw1\dconn.h |
5744 | <wx/sizer.h> | 5747 | <wx/sizer.h> |
5745 | <wx/stattext.h> | 5748 | <wx/stattext.h> |
5746 | <wx/textctrl.h> | 5749 | <wx/textctrl.h> |
@@ -5759,12 +5762,12 @@ | @@ -5759,12 +5762,12 @@ | ||
5759 | <fstream> | 5762 | <fstream> |
5760 | <sstream> | 5763 | <sstream> |
5761 | 5764 | ||
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 | 5765 | +1534156875 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 |
5763 | "EXPORT_SPICE.h" | 5766 | "EXPORT_SPICE.h" |
5764 | <wx/intl.h> | 5767 | <wx/intl.h> |
5765 | <wx/string.h> | 5768 | <wx/string.h> |
5766 | 5769 | ||
5767 | -1508706152 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.h2\local_sw1\export_spice.h | 5770 | +1534156875 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.h2\local_sw1\export_spice.h |
5768 | <wx/sizer.h> | 5771 | <wx/sizer.h> |
5769 | <wx/textctrl.h> | 5772 | <wx/textctrl.h> |
5770 | <wx/filepicker.h> | 5773 | <wx/filepicker.h> |
@@ -5774,20 +5777,20 @@ | @@ -5774,20 +5777,20 @@ | ||
5774 | <wx/filefn.h> | 5777 | <wx/filefn.h> |
5775 | <wx/textfile.h> | 5778 | <wx/textfile.h> |
5776 | 5779 | ||
5777 | -1530719662 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.cpp2\local_sw1\fd_esr.cpp | 5780 | +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.cpp2\local_sw1\fd_esr.cpp |
5778 | "FD_ESR.h" | 5781 | "FD_ESR.h" |
5779 | <wx/settings.h> | 5782 | <wx/settings.h> |
5780 | <wx/intl.h> | 5783 | <wx/intl.h> |
5781 | <wx/string.h> | 5784 | <wx/string.h> |
5782 | 5785 | ||
5783 | -1530724392 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.cpp2\local_sw1\fd_esr_sw.cpp | 5786 | +1534156875 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.cpp2\local_sw1\fd_esr_sw.cpp |
5784 | "FD_ESR_SW.h" | 5787 | "FD_ESR_SW.h" |
5785 | "UTILITIES.h" | 5788 | "UTILITIES.h" |
5786 | <wx/settings.h> | 5789 | <wx/settings.h> |
5787 | <wx/intl.h> | 5790 | <wx/intl.h> |
5788 | <wx/string.h> | 5791 | <wx/string.h> |
5789 | 5792 | ||
5790 | -1530724366 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.h2\local_sw1\fd_esr_sw.h | 5793 | +1534156874 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.h2\local_sw1\fd_esr_sw.h |
5791 | <wx/sizer.h> | 5794 | <wx/sizer.h> |
5792 | <wx/stattext.h> | 5795 | <wx/stattext.h> |
5793 | <wx/textctrl.h> | 5796 | <wx/textctrl.h> |
@@ -5837,7 +5840,7 @@ | @@ -5837,7 +5840,7 @@ | ||
5837 | <direct.h> | 5840 | <direct.h> |
5838 | "dos.h" | 5841 | "dos.h" |
5839 | 5842 | ||
5840 | -1530802204 source:c:\users\eezsg\desktop\sacamos_july_20184 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp2\local_sw1\mesh_laplace.cpp | 5843 | +1534156874 source:c:\users\eezsg\desktop\sacamos_july_20184 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp2\local_sw1\mesh_laplace.cpp |
5841 | "MESH_LAPLACE.h" | 5844 | "MESH_LAPLACE.h" |
5842 | 5845 | ||
5843 | 1530714886 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp | 5846 | 1530714886 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp |
@@ -5846,13 +5849,13 @@ | @@ -5846,13 +5849,13 @@ | ||
5846 | <wx/intl.h> | 5849 | <wx/intl.h> |
5847 | <wx/string.h> | 5850 | <wx/string.h> |
5848 | 5851 | ||
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 | 5852 | +1533918913 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 |
5850 | "OVERSHIELD.h" | 5853 | "OVERSHIELD.h" |
5851 | <wx/settings.h> | 5854 | <wx/settings.h> |
5852 | <wx/intl.h> | 5855 | <wx/intl.h> |
5853 | <wx/string.h> | 5856 | <wx/string.h> |
5854 | 5857 | ||
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 | 5858 | +1533830894 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.h2\local_sw1\overshield.h |
5856 | <wx/sizer.h> | 5859 | <wx/sizer.h> |
5857 | <wx/stattext.h> | 5860 | <wx/stattext.h> |
5858 | <wx/textctrl.h> | 5861 | <wx/textctrl.h> |
@@ -5868,7 +5871,7 @@ | @@ -5868,7 +5871,7 @@ | ||
5868 | <fstream> | 5871 | <fstream> |
5869 | <sstream> | 5872 | <sstream> |
5870 | 5873 | ||
5871 | -1502693576 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.cpp2\local_sw1\place_cable.cpp | 5874 | +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.cpp2\local_sw1\place_cable.cpp |
5872 | "PLACE_CABLE.h" | 5875 | "PLACE_CABLE.h" |
5873 | <wx/intl.h> | 5876 | <wx/intl.h> |
5874 | <wx/string.h> | 5877 | <wx/string.h> |
@@ -5876,12 +5879,12 @@ | @@ -5876,12 +5879,12 @@ | ||
5876 | 1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\resource.rc | 5879 | 1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\resource.rc |
5877 | "wx/msw/wx.rc" | 5880 | "wx/msw/wx.rc" |
5878 | 5881 | ||
5879 | -1502693574 source:c:\users\eezsg\desktop\sacamos_july_201874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.cpp2\local_sw1\run_status.cpp | 5882 | +1534156874 source:c:\users\eezsg\desktop\sacamos_july_201874 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.cpp2\local_sw1\run_status.cpp |
5880 | "RUN_STATUS.h" | 5883 | "RUN_STATUS.h" |
5881 | <wx/intl.h> | 5884 | <wx/intl.h> |
5882 | <wx/string.h> | 5885 | <wx/string.h> |
5883 | 5886 | ||
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 | 5887 | +1533918874 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 |
5885 | "SPACEWIRE.h" | 5888 | "SPACEWIRE.h" |
5886 | <wx/settings.h> | 5889 | <wx/settings.h> |
5887 | <wx/intl.h> | 5890 | <wx/intl.h> |
@@ -5908,7 +5911,7 @@ | @@ -5908,7 +5911,7 @@ | ||
5908 | <fstream> | 5911 | <fstream> |
5909 | <sstream> | 5912 | <sstream> |
5910 | 5913 | ||
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 | 5914 | +1533922218 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 |
5912 | "SPICEMODEL.h" | 5915 | "SPICEMODEL.h" |
5913 | <wx/filename.h> | 5916 | <wx/filename.h> |
5914 | <wx/dcclient.h> | 5917 | <wx/dcclient.h> |
@@ -5921,7 +5924,7 @@ | @@ -5921,7 +5924,7 @@ | ||
5921 | <wx/intl.h> | 5924 | <wx/intl.h> |
5922 | <wx/string.h> | 5925 | <wx/string.h> |
5923 | 5926 | ||
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 | 5927 | +1534156875 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h2\local_sw1\spicemodel.h |
5925 | <wx/notebook.h> | 5928 | <wx/notebook.h> |
5926 | <wx/sizer.h> | 5929 | <wx/sizer.h> |
5927 | <wx/stattext.h> | 5930 | <wx/stattext.h> |
@@ -5941,15 +5944,15 @@ | @@ -5941,15 +5944,15 @@ | ||
5941 | "RUN_STATUS.h" | 5944 | "RUN_STATUS.h" |
5942 | "UTILITIES.h" | 5945 | "UTILITIES.h" |
5943 | 5946 | ||
5944 | -1502693570 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.cpp2\local_sw1\sw1_guiapp.cpp | 5947 | +1534156874 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.cpp2\local_sw1\sw1_guiapp.cpp |
5945 | "SW1_GUIApp.h" | 5948 | "SW1_GUIApp.h" |
5946 | "SW1_GUIMain.h" | 5949 | "SW1_GUIMain.h" |
5947 | <wx/image.h> | 5950 | <wx/image.h> |
5948 | 5951 | ||
5949 | -1502693570 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h2\local_sw1\sw1_guiapp.h | 5952 | +1534156874 c:\users\eezsg\desktop\sacamos_july_2018 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h2\local_sw1\sw1_guiapp.h |
5950 | <wx/app.h> | 5953 | <wx/app.h> |
5951 | 5954 | ||
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 | 5955 | +1534156874 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 |
5953 | <wx/sizer.h> | 5956 | <wx/sizer.h> |
5954 | <wx/menu.h> | 5957 | <wx/menu.h> |
5955 | <wx/panel.h> | 5958 | <wx/panel.h> |
@@ -6051,7 +6054,7 @@ | @@ -6051,7 +6054,7 @@ | ||
6051 | <fstream> | 6054 | <fstream> |
6052 | <sstream> | 6055 | <sstream> |
6053 | 6056 | ||
6054 | -1533827985 c:\users\eezsg\desktop\sacamos_july_20185 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h2\local_sw1\flexcable.h | 6057 | +1534156875 c:\users\eezsg\desktop\sacamos_july_20185 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h2\local_sw1\flexcable.h |
6055 | <wx/notebook.h> | 6058 | <wx/notebook.h> |
6056 | <wx/sizer.h> | 6059 | <wx/sizer.h> |
6057 | <wx/stattext.h> | 6060 | <wx/stattext.h> |
@@ -6073,34 +6076,34 @@ | @@ -6073,34 +6076,34 @@ | ||
6073 | <fstream> | 6076 | <fstream> |
6074 | <sstream> | 6077 | <sstream> |
6075 | 6078 | ||
6076 | -1533810128 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp2\local_sw1\sw1_guimain.cpp | 6079 | +1534431660 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp2\local_sw1\sw1_guimain.cpp |
6077 | "SW1_GUIMain.h" | 6080 | "SW1_GUIMain.h" |
6078 | <wx/settings.h> | 6081 | <wx/settings.h> |
6079 | <wx/intl.h> | 6082 | <wx/intl.h> |
6080 | <wx/string.h> | 6083 | <wx/string.h> |
6081 | 6084 | ||
6082 | -1533826466 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp2\local_sw1\tp.cpp | 6085 | +1533918852 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp2\local_sw1\tp.cpp |
6083 | "TP.h" | 6086 | "TP.h" |
6084 | <wx/settings.h> | 6087 | <wx/settings.h> |
6085 | <wx/intl.h> | 6088 | <wx/intl.h> |
6086 | <wx/string.h> | 6089 | <wx/string.h> |
6087 | 6090 | ||
6088 | -1533827512 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp2\local_sw1\twinax.cpp | 6091 | +1533918863 source:c:\users\eezsg\desktop\sacamos_july_2018 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp2\local_sw1\twinax.cpp |
6089 | "TWINAX.h" | 6092 | "TWINAX.h" |
6090 | <wx/settings.h> | 6093 | <wx/settings.h> |
6091 | <wx/intl.h> | 6094 | <wx/intl.h> |
6092 | <wx/string.h> | 6095 | <wx/string.h> |
6093 | 6096 | ||
6094 | -1502693568 source:c:\users\eezsg\desktop\sacamos_july_201868 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp2\local_sw1\utilities.cpp | 6097 | +1534435968 source:c:\users\eezsg\desktop\sacamos_july_201868 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp2\local_sw1\utilities.cpp |
6095 | "UTILITIES.h" | 6098 | "UTILITIES.h" |
6096 | 6099 | ||
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 | 6100 | +1533918843 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 |
6098 | "UTP.h" | 6101 | "UTP.h" |
6099 | <wx/settings.h> | 6102 | <wx/settings.h> |
6100 | <wx/intl.h> | 6103 | <wx/intl.h> |
6101 | <wx/string.h> | 6104 | <wx/string.h> |
6102 | 6105 | ||
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 | 6106 | +1534156874 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 |
6104 | "FLEXCABLE.h" | 6107 | "FLEXCABLE.h" |
6105 | <wx/settings.h> | 6108 | <wx/settings.h> |
6106 | <wx/intl.h> | 6109 | <wx/intl.h> |