summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.codelite/.tern-port2
-rw-r--r--.codelite/PSP.session50
-rw-r--r--.codelite/PSP.tagsbin83468288 -> 83549184 bytes
-rw-r--r--.codelite/compilation.dbbin61440 -> 63488 bytes
-rw-r--r--.codelite/compile_commands.json16
-rw-r--r--.codelite/refactoring.dbbin2089984 -> 2154496 bytes
-rw-r--r--Project/ElectricCalculation.h10
-rw-r--r--Project/ElementForm.cpp205
-rw-r--r--Project/ElementForm.h58
-rw-r--r--Project/ElementForm.wxcp2063
-rw-r--r--Project/Project.mk12
-rw-r--r--Project/Project.project2
-rw-r--r--Project/Project.txt2
-rw-r--r--Project/Release/ElementForm.cpp.obin533581 -> 563331 bytes
-rw-r--r--Project/Release/MainFrame.cpp.obin141354 -> 141354 bytes
-rw-r--r--Project/Release/PSP-UFU.exebin4143351 -> 4191127 bytes
-rw-r--r--Project/Release/Text.cpp.obin40534 -> 41237 bytes
-rw-r--r--Project/Release/Text.cpp.o.d817
-rw-r--r--Project/Release/TextForm.cpp.obin0 -> 116147 bytes
-rw-r--r--Project/Release/TextForm.cpp.o.d889
-rw-r--r--Project/Release/Workspace.cpp.obin206026 -> 205498 bytes
-rw-r--r--Project/Text.cpp22
-rw-r--r--Project/Text.h66
-rw-r--r--Project/TextForm.cpp201
-rw-r--r--Project/TextForm.h32
-rw-r--r--Project/Workspace.cpp64
-rw-r--r--Project/Workspace.h1
27 files changed, 4021 insertions, 491 deletions
diff --git a/.codelite/.tern-port b/.codelite/.tern-port
index a84847a..67fcb07 100644
--- a/.codelite/.tern-port
+++ b/.codelite/.tern-port
@@ -1 +1 @@
-58160 \ No newline at end of file
+64886 \ No newline at end of file
diff --git a/.codelite/PSP.session b/.codelite/PSP.session
index 00212d5..6172c4b 100644
--- a/.codelite/PSP.session
+++ b/.codelite/PSP.session
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<Session Name="C:\Users\Thales\Documents\GitHub\PSP\PSP.workspace">
- <int Value="0" Name="m_selectedTab"/>
+ <int Value="10" Name="m_selectedTab"/>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\PSP.workspace" Name="m_workspaceName"/>
<TabInfoArray Name="TabInfoArray">
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.cpp" Name="FileName"/>
- <int Value="555" Name="FirstVisibleLine"/>
- <int Value="575" Name="CurrentLine"/>
+ <int Value="287" Name="FirstVisibleLine"/>
+ <int Value="304" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.h" Name="FileName"/>
- <int Value="18" Name="FirstVisibleLine"/>
- <int Value="37" Name="CurrentLine"/>
+ <int Value="44" Name="FirstVisibleLine"/>
+ <int Value="67" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.cpp" Name="FileName"/>
<int Value="167" Name="FirstVisibleLine"/>
- <int Value="186" Name="CurrentLine"/>
+ <int Value="188" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
@@ -34,49 +34,49 @@
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Element.cpp" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
- <int Value="25" Name="CurrentLine"/>
+ <int Value="36" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
- <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.h" Name="FileName"/>
- <int Value="8" Name="FirstVisibleLine"/>
- <int Value="28" Name="CurrentLine"/>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Element.h" Name="FileName"/>
+ <int Value="75" Name="FirstVisibleLine"/>
+ <int Value="194" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
- <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.cpp" Name="FileName"/>
- <int Value="44" Name="FirstVisibleLine"/>
- <int Value="82" Name="CurrentLine"/>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.h" Name="FileName"/>
+ <int Value="48" Name="FirstVisibleLine"/>
+ <int Value="33" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
- <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Bus.h" Name="FileName"/>
- <int Value="33" Name="FirstVisibleLine"/>
- <int Value="46" Name="CurrentLine"/>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.cpp" Name="FileName"/>
+ <int Value="0" Name="FirstVisibleLine"/>
+ <int Value="16" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
- <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Bus.cpp" Name="FileName"/>
- <int Value="143" Name="FirstVisibleLine"/>
- <int Value="163" Name="CurrentLine"/>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\ElectricCalculation.h" Name="FileName"/>
+ <int Value="24" Name="FirstVisibleLine"/>
+ <int Value="40" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
- <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\wxGLString.cpp" Name="FileName"/>
- <int Value="126" Name="FirstVisibleLine"/>
- <int Value="156" Name="CurrentLine"/>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\TextForm.h" Name="FileName"/>
+ <int Value="0" Name="FirstVisibleLine"/>
+ <int Value="17" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
- <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\wxGLString.h" Name="FileName"/>
- <int Value="75" Name="FirstVisibleLine"/>
- <int Value="76" Name="CurrentLine"/>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\TextForm.cpp" Name="FileName"/>
+ <int Value="160" Name="FirstVisibleLine"/>
+ <int Value="170" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
diff --git a/.codelite/PSP.tags b/.codelite/PSP.tags
index 71ab0db..68167b4 100644
--- a/.codelite/PSP.tags
+++ b/.codelite/PSP.tags
Binary files differ
diff --git a/.codelite/compilation.db b/.codelite/compilation.db
index 6cefeae..794342b 100644
--- a/.codelite/compilation.db
+++ b/.codelite/compilation.db
Binary files differ
diff --git a/.codelite/compile_commands.json b/.codelite/compile_commands.json
index 9d017f3..b60e601 100644
--- a/.codelite/compile_commands.json
+++ b/.codelite/compile_commands.json
@@ -1,17 +1,9 @@
[{
"directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
- "command": "C:/TDM-GCC-64/bin/g++.exe -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -I. -I. -MG -MP -MT./Release/Text.cpp.o -MF./Release/Text.cpp.o.d -MM Text.cpp",
- "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Text.cpp"
+ "command": "C:/TDM-GCC-64/bin/g++.exe -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -I. -I. -MG -MP -MT./Release/TextForm.cpp.o -MF./Release/TextForm.cpp.o.d -MM TextForm.cpp",
+ "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\TextForm.cpp"
}, {
"directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
- "command": "C:/TDM-GCC-64/bin/g++.exe -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -I. -I. -MG -MP -MT./Release/Workspace.cpp.o -MF./Release/Workspace.cpp.o.d -MM Workspace.cpp",
- "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Workspace.cpp"
- }, {
- "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
- "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/Text.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/Text.cpp.o -I. -I.",
- "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Text.cpp"
- }, {
- "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
- "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/Workspace.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/Workspace.cpp.o -I. -I.",
- "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Workspace.cpp"
+ "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/TextForm.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/TextForm.cpp.o -I. -I.",
+ "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\TextForm.cpp"
}] \ No newline at end of file
diff --git a/.codelite/refactoring.db b/.codelite/refactoring.db
index 29e83ff..989f346 100644
--- a/.codelite/refactoring.db
+++ b/.codelite/refactoring.db
Binary files differ
diff --git a/Project/ElectricCalculation.h b/Project/ElectricCalculation.h
index 2b449a1..e4e4ef7 100644
--- a/Project/ElectricCalculation.h
+++ b/Project/ElectricCalculation.h
@@ -47,6 +47,16 @@ class ElectricCalculation
std::vector<ReactiveLimits> reactiveLimit,
double systemPowerBase);
+ const std::vector<Bus*> GetBusList() const { return m_busList; }
+ const std::vector<Capacitor*> GetCapacitorList() const { return m_capacitorList; }
+ const std::vector<IndMotor*> GetIndMotorList() const { return m_indMotorList; }
+ const std::vector<Inductor*> GetInductorList() const { return m_inductorList; }
+ const std::vector<Line*> GetLineList() const { return m_lineList; }
+ const std::vector<Load*> GetLoadList() const { return m_loadList; }
+ const std::vector<SyncGenerator*> GetSyncGeneratorList() const { return m_syncGeneratorList; }
+ const std::vector<SyncMotor*> GetSyncMotorList() const { return m_syncMotorList; }
+ const std::vector<Transformer*> GetTransformerList() const { return m_transformerList; }
+
protected:
std::vector<Bus*> m_busList;
std::vector<Capacitor*> m_capacitorList;
diff --git a/Project/ElementForm.cpp b/Project/ElementForm.cpp
index 489405f..e6e72ed 100644
--- a/Project/ElementForm.cpp
+++ b/Project/ElementForm.cpp
@@ -2575,3 +2575,208 @@ IndMotorFormBase::~IndMotorFormBase()
m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnCancelButtonClick), NULL, this);
}
+
+TextFormBase::TextFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+ : wxDialog(parent, id, title, pos, size, style)
+{
+ if ( !bBitmapLoaded ) {
+ // We need to initialise the default bitmap handler
+ wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler);
+ wxC9EE9InitBitmapResources();
+ bBitmapLoaded = true;
+ }
+
+ wxBoxSizer* boxSizerLvl1_1 = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(boxSizerLvl1_1);
+
+ m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT);
+ m_notebook->SetName(wxT("m_notebook"));
+
+ boxSizerLvl1_1->Add(m_notebook, 1, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_panelGeneral = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+ m_notebook->AddPage(m_panelGeneral, _("General"), false);
+
+ wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxVERTICAL);
+ m_panelGeneral->SetSizer(boxSizerLvl2_1);
+
+ wxGridSizer* gridSizerLvl3_1 = new wxGridSizer(0, 3, 0, 0);
+
+ boxSizerLvl2_1->Add(gridSizerLvl3_1, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl4_1 = new wxBoxSizer(wxVERTICAL);
+
+ gridSizerLvl3_1->Add(boxSizerLvl4_1, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextElement = new wxStaticText(m_panelGeneral, wxID_ANY, _("Element"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl4_1->Add(m_staticTextElement, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxArrayString m_choiceElementArr;
+ m_choiceElementArr.Add(wxT("Bus"));
+ m_choiceElementArr.Add(wxT("Generator"));
+ m_choiceElementArr.Add(wxT("Line"));
+ m_choiceElementArr.Add(wxT("Transformer"));
+ m_choiceElementArr.Add(wxT("Load"));
+ m_choiceElementArr.Add(wxT("Capacitor"));
+ m_choiceElementArr.Add(wxT("Inductor"));
+ m_choiceElementArr.Add(wxT("Synchronous compensator"));
+ m_choiceElementArr.Add(wxT("Induction motor"));
+ m_choiceElement = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceElementArr, 0);
+ m_choiceElement->SetSelection(0);
+
+ boxSizerLvl4_1->Add(m_choiceElement, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl4_2 = new wxBoxSizer(wxVERTICAL);
+
+ gridSizerLvl3_1->Add(boxSizerLvl4_2, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextName = new wxStaticText(m_panelGeneral, wxID_ANY, _("Element name"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl4_2->Add(m_staticTextName, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxArrayString m_choiceNameArr;
+ m_choiceName = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceNameArr, 0);
+
+ boxSizerLvl4_2->Add(m_choiceName, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl4_3 = new wxBoxSizer(wxVERTICAL);
+
+ gridSizerLvl3_1->Add(boxSizerLvl4_3, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextType = new wxStaticText(m_panelGeneral, wxID_ANY, _("Text type"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl4_3->Add(m_staticTextType, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxArrayString m_choiceTextTypeArr;
+ m_choiceTextType = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceTextTypeArr, 0);
+
+ boxSizerLvl4_3->Add(m_choiceTextType, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl4_4 = new wxBoxSizer(wxVERTICAL);
+
+ gridSizerLvl3_1->Add(boxSizerLvl4_4, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextFromBus = new wxStaticText(m_panelGeneral, wxID_ANY, _("From bus"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl4_4->Add(m_staticTextFromBus, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxArrayString m_choiceTextFromBusArr;
+ m_choiceTextFromBus = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceTextFromBusArr, 0);
+
+ boxSizerLvl4_4->Add(m_choiceTextFromBus, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl4_5 = new wxBoxSizer(wxVERTICAL);
+
+ gridSizerLvl3_1->Add(boxSizerLvl4_5, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextToBus = new wxStaticText(m_panelGeneral, wxID_ANY, _("To bus"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl4_5->Add(m_staticTextToBus, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxArrayString m_choiceTextToBusArr;
+ m_choiceTextToBus = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceTextToBusArr, 0);
+
+ boxSizerLvl4_5->Add(m_choiceTextToBus, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl4_6 = new wxBoxSizer(wxVERTICAL);
+
+ gridSizerLvl3_1->Add(boxSizerLvl4_6, 0, wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextUnit = new wxStaticText(m_panelGeneral, wxID_ANY, _("Unit"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl4_6->Add(m_staticTextUnit, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxArrayString m_choiceTextUnitArr;
+ m_choiceTextUnit = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceTextUnitArr, 0);
+
+ boxSizerLvl4_6->Add(m_choiceTextUnit, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerLvl3_2 = new wxBoxSizer(wxHORIZONTAL);
+
+ boxSizerLvl2_1->Add(boxSizerLvl3_2, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5));
+
+ m_staticTextDecimal = new wxStaticText(m_panelGeneral, wxID_ANY, _("Decimal places:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl3_2->Add(m_staticTextDecimal, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ m_textCtrlDecimal = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT("2"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), wxTE_PROCESS_ENTER);
+ #if wxVERSION_NUMBER >= 3000
+ m_textCtrlDecimal->SetHint(wxT(""));
+ #endif
+
+ boxSizerLvl3_2->Add(m_textCtrlDecimal, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ boxSizerLvl3_2->Add(0, 0, 0, wxALL, WXC_FROM_DIP(5));
+
+ m_staticTextPreview = new wxStaticText(m_panelGeneral, wxID_ANY, _("Preview:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+
+ boxSizerLvl3_2->Add(m_staticTextPreview, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ m_textCtrlPreview = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), wxTE_CENTRE);
+ #if wxVERSION_NUMBER >= 3000
+ m_textCtrlPreview->SetHint(wxT(""));
+ #endif
+
+ boxSizerLvl3_2->Add(m_textCtrlPreview, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+
+ wxBoxSizer* boxSizerBottomButtons = new wxBoxSizer(wxHORIZONTAL);
+
+ boxSizerLvl1_1->Add(boxSizerBottomButtons, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5));
+
+ boxSizerBottomButtons->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5));
+
+ m_buttonOK = new wxButton(this, wxID_ANY, _("OK"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+
+ boxSizerBottomButtons->Add(m_buttonOK, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+
+ m_ButtonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+
+ boxSizerBottomButtons->Add(m_ButtonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+
+
+ #if wxVERSION_NUMBER >= 2900
+ if(!wxPersistenceManager::Get().Find(m_notebook)){
+ wxPersistenceManager::Get().RegisterAndRestore(m_notebook);
+ } else {
+ wxPersistenceManager::Get().Restore(m_notebook);
+ }
+ #endif
+
+ SetName(wxT("TextFormBase"));
+ SetSize(-1,-1);
+ if (GetSizer()) {
+ GetSizer()->Fit(this);
+ }
+ if(GetParent()) {
+ CentreOnParent(wxBOTH);
+ } else {
+ CentreOnScreen(wxBOTH);
+ }
+#if wxVERSION_NUMBER >= 2900
+ if(!wxPersistenceManager::Get().Find(this)) {
+ wxPersistenceManager::Get().RegisterAndRestore(this);
+ } else {
+ wxPersistenceManager::Get().Restore(this);
+ }
+#endif
+ // Connect events
+ m_choiceElement->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnElementChoiceSelected), NULL, this);
+ m_choiceName->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnNameChoiceSelected), NULL, this);
+ m_choiceTextType->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnTypeChoiceSelected), NULL, this);
+ m_choiceTextFromBus->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnFromBusChoiceSelected), NULL, this);
+ m_choiceTextToBus->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnToBusChoiceSelected), NULL, this);
+ m_textCtrlDecimal->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(TextFormBase::OnTextEnter), NULL, this);
+
+}
+
+TextFormBase::~TextFormBase()
+{
+ m_choiceElement->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnElementChoiceSelected), NULL, this);
+ m_choiceName->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnNameChoiceSelected), NULL, this);
+ m_choiceTextType->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnTypeChoiceSelected), NULL, this);
+ m_choiceTextFromBus->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnFromBusChoiceSelected), NULL, this);
+ m_choiceTextToBus->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(TextFormBase::OnToBusChoiceSelected), NULL, this);
+ m_textCtrlDecimal->Disconnect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(TextFormBase::OnTextEnter), NULL, this);
+
+}
diff --git a/Project/ElementForm.h b/Project/ElementForm.h
index 1af839c..3b36fed 100644
--- a/Project/ElementForm.h
+++ b/Project/ElementForm.h
@@ -710,4 +710,62 @@ public:
virtual ~IndMotorFormBase();
};
+
+class TextFormBase : public wxDialog
+{
+protected:
+ wxNotebook* m_notebook;
+ wxPanel* m_panelGeneral;
+ wxStaticText* m_staticTextElement;
+ wxChoice* m_choiceElement;
+ wxStaticText* m_staticTextName;
+ wxChoice* m_choiceName;
+ wxStaticText* m_staticTextType;
+ wxChoice* m_choiceTextType;
+ wxStaticText* m_staticTextFromBus;
+ wxChoice* m_choiceTextFromBus;
+ wxStaticText* m_staticTextToBus;
+ wxChoice* m_choiceTextToBus;
+ wxStaticText* m_staticTextUnit;
+ wxChoice* m_choiceTextUnit;
+ wxStaticText* m_staticTextDecimal;
+ wxTextCtrl* m_textCtrlDecimal;
+ wxStaticText* m_staticTextPreview;
+ wxTextCtrl* m_textCtrlPreview;
+ wxButton* m_buttonOK;
+ wxButton* m_ButtonCancel;
+
+protected:
+ virtual void OnElementChoiceSelected(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnNameChoiceSelected(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnTypeChoiceSelected(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnFromBusChoiceSelected(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnToBusChoiceSelected(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnTextEnter(wxCommandEvent& event) { event.Skip(); }
+
+public:
+ wxStaticText* GetStaticTextElement() { return m_staticTextElement; }
+ wxChoice* GetChoiceElement() { return m_choiceElement; }
+ wxStaticText* GetStaticTextName() { return m_staticTextName; }
+ wxChoice* GetChoiceName() { return m_choiceName; }
+ wxStaticText* GetStaticTextType() { return m_staticTextType; }
+ wxChoice* GetChoiceTextType() { return m_choiceTextType; }
+ wxStaticText* GetStaticTextFromBus() { return m_staticTextFromBus; }
+ wxChoice* GetChoiceTextFromBus() { return m_choiceTextFromBus; }
+ wxStaticText* GetStaticTextToBus() { return m_staticTextToBus; }
+ wxChoice* GetChoiceTextToBus() { return m_choiceTextToBus; }
+ wxStaticText* GetStaticTextUnit() { return m_staticTextUnit; }
+ wxChoice* GetChoiceTextUnit() { return m_choiceTextUnit; }
+ wxStaticText* GetStaticTextDecimal() { return m_staticTextDecimal; }
+ wxTextCtrl* GetTextCtrlDecimal() { return m_textCtrlDecimal; }
+ wxStaticText* GetStaticTextPreview() { return m_staticTextPreview; }
+ wxTextCtrl* GetTextCtrlPreview() { return m_textCtrlPreview; }
+ wxPanel* GetPanelGeneral() { return m_panelGeneral; }
+ wxNotebook* GetNotebook() { return m_notebook; }
+ wxButton* GetButtonOK() { return m_buttonOK; }
+ wxButton* GetButtonCancel() { return m_ButtonCancel; }
+ TextFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE);
+ virtual ~TextFormBase();
+};
+
#endif
diff --git a/Project/ElementForm.wxcp b/Project/ElementForm.wxcp
index cb77338..8d9def3 100644
--- a/Project/ElementForm.wxcp
+++ b/Project/ElementForm.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 1508,
+ "m_objCounter": 1580,
"m_includeFiles": [],
"m_bitmapFunction": "wxC9EE9InitBitmapResources",
"m_bitmapsFile": "ElementFormBitmaps.cpp",
@@ -27252,5 +27252,2066 @@
}]
}]
}]
+ }, {
+ "m_type": 4421,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxDEFAULT_DIALOG_STYLE"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "TextFormBase"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Enable Window Persistency:",
+ "m_value": true
+ }, {
+ "type": "string",
+ "m_label": "Title:",
+ "m_value": "Text"
+ }, {
+ "type": "virtualFolderPicker",
+ "m_label": "Virtual Folder:",
+ "m_path": "Project:wxcrafter"
+ }, {
+ "type": "choice",
+ "m_label": "Centre:",
+ "m_selection": 1,
+ "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"]
+ }, {
+ "type": "string",
+ "m_label": "Inherited Class",
+ "m_value": "TextForm"
+ }, {
+ "type": "string",
+ "m_label": "File:",
+ "m_value": "TextForm"
+ }, {
+ "type": "string",
+ "m_label": "Class Decorator",
+ "m_value": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (16x16) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (32x32) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (64x64) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (128x128):",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (256x256):",
+ "m_path": ""
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl1_1"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4442,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxBK_DEFAULT"],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_notebook"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4441,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxTAB_TRAVERSAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_panelGeneral"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "General"
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "bool",
+ "m_label": "Selected",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Null Page",
+ "m_value": false
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl2_1"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4452,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "gridSizerLvl3_1"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "# Columns:",
+ "m_value": "3"
+ }, {
+ "type": "string",
+ "m_label": "# Rows:",
+ "m_value": "0"
+ }, {
+ "type": "string",
+ "m_label": "Horizontal gap:",
+ "m_value": "0"
+ }, {
+ "type": "string",
+ "m_label": "Vertical gap:",
+ "m_value": "0"
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl4_1"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextElement"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "Element"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4411,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceElement"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": "Bus;Generator;Line;Transformer;Load;Capacitor;Inductor;Synchronous compensator;Induction motor"
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnElementChoiceSelected(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
+ "m_noBody": false
+ }],
+ "m_children": []
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl4_2"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextName"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "Element name"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4411,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceName"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnNameChoiceSelected(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
+ "m_noBody": false
+ }],
+ "m_children": []
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl4_3"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextType"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "Text type"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4411,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceTextType"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnTypeChoiceSelected(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
+ "m_noBody": false
+ }],
+ "m_children": []
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl4_4"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextFromBus"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "From bus"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4411,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceTextFromBus"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnFromBusChoiceSelected(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
+ "m_noBody": false
+ }],
+ "m_children": []
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl4_5"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextToBus"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "To bus"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4411,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceTextToBus"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnToBusChoiceSelected(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.",
+ "m_noBody": false
+ }],
+ "m_children": []
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl4_6"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextUnit"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "Unit"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4411,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_choiceTextUnit"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Choices:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Selection:",
+ "m_value": "0"
+ }],
+ "m_events": [],
+ "m_children": []
+ }]
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerLvl3_2"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 1,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_LEFT", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextDecimal"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "Decimal places:"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4406,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxTE_PROCESS_ENTER"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_LEFT", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_textCtrlDecimal"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Value:",
+ "m_value": "2"
+ }, {
+ "type": "string",
+ "m_label": "Text Hint",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Max Length:",
+ "m_value": "0"
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Directories:",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Files:",
+ "m_value": false
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_TEXT_ENTER",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnTextEnter(wxCommandEvent& event)",
+ "m_description": "Respond to a wxEVT_COMMAND_TEXT_ENTER event, generated when enter is pressed in a text control\n(which must have wxTE_PROCESS_ENTER style for this event to be generated).",
+ "m_noBody": false
+ }],
+ "m_children": []
+ }, {
+ "m_type": 4454,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "Spacer_2"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "0,0"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_LEFT", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticTextPreview"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "Preview:"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4406,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxTE_CENTRE"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_LEFT", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_textCtrlPreview"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Value:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Text Hint",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Max Length:",
+ "m_value": "0"
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Directories:",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Files:",
+ "m_value": false
+ }],
+ "m_events": [],
+ "m_children": []
+ }]
+ }]
+ }]
+ }]
+ }, {
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizerBottomButtons"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 1,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4454,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "Spacer_1"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "0,0"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4400,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_buttonOK"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "OK"
+ }, {
+ "type": "bool",
+ "m_label": "Default Button",
+ "m_value": false
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "choice",
+ "m_label": "Direction",
+ "m_selection": 0,
+ "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+ }, {
+ "type": "string",
+ "m_label": "Margins:",
+ "m_value": "2,2"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4400,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_ButtonCancel"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "Cancel"
+ }, {
+ "type": "bool",
+ "m_label": "Default Button",
+ "m_value": false
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "choice",
+ "m_label": "Direction",
+ "m_selection": 0,
+ "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+ }, {
+ "type": "string",
+ "m_label": "Margins:",
+ "m_value": "2,2"
+ }],
+ "m_events": [],
+ "m_children": []
+ }]
+ }]
+ }]
}]
} \ No newline at end of file
diff --git a/Project/Project.mk b/Project/Project.mk
index dbbf71e..2feed7d 100644
--- a/Project/Project.mk
+++ b/Project/Project.mk
@@ -13,7 +13,7 @@ CurrentFileName :=
CurrentFilePath :=
CurrentFileFullPath :=
User :=Thales
-Date :=24/11/2016
+Date :=29/11/2016
CodeLitePath :="C:/Program Files/CodeLite"
LinkerName :=C:/TDM-GCC-64/bin/g++.exe
SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC
@@ -67,7 +67,7 @@ WXCFG:=gcc_dll\mswu
Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) \
$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) \
$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) \
- $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix)
+ $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix)
@@ -396,6 +396,14 @@ $(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix): SyncMachineForm.cpp
$(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix): SyncMachineForm.cpp
$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix)SyncMachineForm.cpp
+$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix): TextForm.cpp $(IntermediateDirectory)/TextForm.cpp$(DependSuffix)
+ $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/TextForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/TextForm.cpp$(DependSuffix): TextForm.cpp
+ @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TextForm.cpp$(DependSuffix) -MM TextForm.cpp
+
+$(IntermediateDirectory)/TextForm.cpp$(PreprocessSuffix): TextForm.cpp
+ $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TextForm.cpp$(PreprocessSuffix)TextForm.cpp
+
-include $(IntermediateDirectory)/*$(DependSuffix)
##
diff --git a/Project/Project.project b/Project/Project.project
index b0314e9..7fdda15 100644
--- a/Project/Project.project
+++ b/Project/Project.project
@@ -47,6 +47,7 @@
<File Name="ReactiveShuntElementForm.cpp"/>
<File Name="IndMotorForm.cpp"/>
<File Name="SyncMachineForm.cpp"/>
+ <File Name="TextForm.cpp"/>
</VirtualDirectory>
</VirtualDirectory>
<File Name="main.cpp"/>
@@ -91,6 +92,7 @@
<File Name="ReactiveShuntElementForm.h"/>
<File Name="IndMotorForm.h"/>
<File Name="SyncMachineForm.h"/>
+ <File Name="TextForm.h"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
diff --git a/Project/Project.txt b/Project/Project.txt
index 3a80728..5a024fc 100644
--- a/Project/Project.txt
+++ b/Project/Project.txt
@@ -1 +1 @@
-./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/Text.cpp.o ./Release/ArtMetro.cpp.o ./Release/wxGLString.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/Element.cpp.o ./Release/ElectricCalculation.cpp.o ./Release/PowerFlow.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o
+./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/Text.cpp.o ./Release/ArtMetro.cpp.o ./Release/wxGLString.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/Element.cpp.o ./Release/ElectricCalculation.cpp.o ./Release/PowerFlow.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o ./Release/TextForm.cpp.o
diff --git a/Project/Release/ElementForm.cpp.o b/Project/Release/ElementForm.cpp.o
index 51e6cce..e9fda68 100644
--- a/Project/Release/ElementForm.cpp.o
+++ b/Project/Release/ElementForm.cpp.o
Binary files differ
diff --git a/Project/Release/MainFrame.cpp.o b/Project/Release/MainFrame.cpp.o
index 2b8cc1a..aaefcd8 100644
--- a/Project/Release/MainFrame.cpp.o
+++ b/Project/Release/MainFrame.cpp.o
Binary files differ
diff --git a/Project/Release/PSP-UFU.exe b/Project/Release/PSP-UFU.exe
index 5c69aba..d665b65 100644
--- a/Project/Release/PSP-UFU.exe
+++ b/Project/Release/PSP-UFU.exe
Binary files differ
diff --git a/Project/Release/Text.cpp.o b/Project/Release/Text.cpp.o
index 98d69f5..8e373b7 100644
--- a/Project/Release/Text.cpp.o
+++ b/Project/Release/Text.cpp.o
Binary files differ
diff --git a/Project/Release/Text.cpp.o.d b/Project/Release/Text.cpp.o.d
index 7f1d70f..802f18e 100644
--- a/Project/Release/Text.cpp.o.d
+++ b/Project/Release/Text.cpp.o.d
@@ -1,5 +1,6 @@
-Release/Text.cpp.o: Text.cpp Text.h Element.h \
- C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
+Release/Text.cpp.o: Text.cpp TextForm.h ElementForm.h \
+ C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/colour.h \
C:/wxWidgets-3.1.0/include/wx/defs.h \
C:/wxWidgets-3.1.0/include/wx/platform.h \
C:/wxWidgets-3.1.0/include/wx/compiler.h \
@@ -16,11 +17,7 @@ Release/Text.cpp.o: Text.cpp Text.h Element.h \
C:/wxWidgets-3.1.0/include/wx/windowid.h \
C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \
C:/wxWidgets-3.1.0/include/wx/features.h \
- C:/wxWidgets-3.1.0/include/wx/dialog.h \
- C:/wxWidgets-3.1.0/include/wx/toplevel.h \
- C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
- C:/wxWidgets-3.1.0/include/wx/window.h \
- C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
C:/wxWidgets-3.1.0/include/wx/object.h \
C:/wxWidgets-3.1.0/include/wx/memory.h \
C:/wxWidgets-3.1.0/include/wx/string.h \
@@ -39,10 +36,8 @@ Release/Text.cpp.o: Text.cpp Text.h Element.h \
C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \
C:/wxWidgets-3.1.0/include/wx/flags.h \
C:/wxWidgets-3.1.0/include/wx/xti2.h \
- C:/wxWidgets-3.1.0/include/wx/clntdata.h \
- C:/wxWidgets-3.1.0/include/wx/hashmap.h \
- C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
- C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/variant.h \
+ C:/wxWidgets-3.1.0/include/wx/arrstr.h \
C:/wxWidgets-3.1.0/include/wx/list.h \
C:/wxWidgets-3.1.0/include/wx/vector.h \
C:/wxWidgets-3.1.0/include/wx/scopeguard.h \
@@ -50,53 +45,81 @@ Release/Text.cpp.o: Text.cpp Text.h Element.h \
C:/wxWidgets-3.1.0/include/wx/meta/movable.h \
C:/wxWidgets-3.1.0/include/wx/meta/pod.h \
C:/wxWidgets-3.1.0/include/wx/meta/if.h \
+ C:/wxWidgets-3.1.0/include/wx/longlong.h \
+ C:/wxWidgets-3.1.0/include/wx/datetime.h \
+ C:/wxWidgets-3.1.0/include/wx/anystr.h \
+ C:/wxWidgets-3.1.0/include/wx/dynarray.h \
+ C:/wxWidgets-3.1.0/include/wx/any.h \
+ C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/font.h \
+ C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/hashmap.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
C:/wxWidgets-3.1.0/include/wx/math.h \
- C:/wxWidgets-3.1.0/include/wx/cursor.h \
- C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/font.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
+ C:/wxWidgets-3.1.0/include/wx/filesys.h \
+ C:/wxWidgets-3.1.0/include/wx/stream.h \
+ C:/wxWidgets-3.1.0/include/wx/filefn.h \
+ C:/wxWidgets-3.1.0/include/wx/filename.h \
+ C:/wxWidgets-3.1.0/include/wx/intl.h \
+ C:/wxWidgets-3.1.0/include/wx/translation.h \
+ C:/wxWidgets-3.1.0/include/wx/language.h \
+ C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
+ C:/wxWidgets-3.1.0/include/wx/file.h \
+ C:/wxWidgets-3.1.0/include/wx/convauto.h \
+ C:/wxWidgets-3.1.0/include/wx/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/image.h \
+ C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpng.h \
+ C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
+ C:/wxWidgets-3.1.0/include/wx/imaggif.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
+ C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtga.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagiff.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \
+ C:/wxWidgets-3.1.0/include/wx/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/iconloc.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/artprov.h \
+ C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \
+ C:/wxWidgets-3.1.0/include/wx/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/window.h \
+ C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/clntdata.h \
+ C:/wxWidgets-3.1.0/include/wx/cursor.h \
C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \
C:/wxWidgets-3.1.0/include/wx/utils.h \
- C:/wxWidgets-3.1.0/include/wx/filefn.h \
- C:/wxWidgets-3.1.0/include/wx/arrstr.h \
- C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \
C:/wxWidgets-3.1.0/include/wx/mousestate.h \
C:/wxWidgets-3.1.0/include/wx/kbdstate.h \
- C:/wxWidgets-3.1.0/include/wx/longlong.h \
C:/wxWidgets-3.1.0/include/wx/platinfo.h \
- C:/wxWidgets-3.1.0/include/wx/dynarray.h \
C:/wxWidgets-3.1.0/include/wx/thread.h \
C:/wxWidgets-3.1.0/include/wx/tracker.h \
- C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
- C:/wxWidgets-3.1.0/include/wx/any.h \
- C:/wxWidgets-3.1.0/include/wx/datetime.h \
- C:/wxWidgets-3.1.0/include/wx/anystr.h \
- C:/wxWidgets-3.1.0/include/wx/variant.h \
C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \
C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \
- C:/wxWidgets-3.1.0/include/wx/font.h \
- C:/wxWidgets-3.1.0/include/wx/msw/font.h \
- C:/wxWidgets-3.1.0/include/wx/colour.h \
- C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
C:/wxWidgets-3.1.0/include/wx/region.h \
C:/wxWidgets-3.1.0/include/wx/msw/region.h \
- C:/wxWidgets-3.1.0/include/wx/intl.h \
- C:/wxWidgets-3.1.0/include/wx/translation.h \
- C:/wxWidgets-3.1.0/include/wx/language.h \
- C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
- C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
C:/wxWidgets-3.1.0/include/wx/validate.h \
- C:/wxWidgets-3.1.0/include/wx/palette.h \
- C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
C:/wxWidgets-3.1.0/include/wx/accel.h \
C:/wxWidgets-3.1.0/include/wx/msw/accel.h \
C:/wxWidgets-3.1.0/include/wx/msw/window.h \
- C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \
+ C:/wxWidgets-3.1.0/include/wx/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h \
- C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
- C:/wxWidgets-3.1.0/include/wx/icon.h \
- C:/wxWidgets-3.1.0/include/wx/iconloc.h \
- C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
C:/wxWidgets-3.1.0/include/wx/weakref.h \
C:/wxWidgets-3.1.0/include/wx/meta/int2type.h \
C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h \
@@ -107,27 +130,97 @@ Release/Text.cpp.o: Text.cpp Text.h Element.h \
C:/wxWidgets-3.1.0/include/wx/msw/dialog.h \
C:/wxWidgets-3.1.0/include/wx/panel.h \
C:/wxWidgets-3.1.0/include/wx/msw/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/sizer.h \
+ C:/wxWidgets-3.1.0/include/wx/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/control.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/control.h \
+ C:/wxWidgets-3.1.0/include/wx/withimages.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
+ C:/wxWidgets-3.1.0/include/wx/button.h \
+ C:/wxWidgets-3.1.0/include/wx/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/button.h \
+ C:/wxWidgets-3.1.0/include/wx/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist.h \
+ C:/wxWidgets-3.1.0/include/wx/confbase.h \
+ C:/wxWidgets-3.1.0/include/wx/base64.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/window.h \
+ C:/wxWidgets-3.1.0/include/wx/display.h \
+ C:/wxWidgets-3.1.0/include/wx/vidmode.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/treebase.h \
+ C:/wxWidgets-3.1.0/include/wx/itemid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Text.h Element.h \
+ C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
C:/wxWidgets-3.1.0/include/wx/stockitem.h \
C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
C:/wxWidgets-3.1.0/include/wx/menu.h \
C:/wxWidgets-3.1.0/include/wx/menuitem.h \
C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
- C:/wxWidgets-3.1.0/include/wx/bitmap.h \
- C:/wxWidgets-3.1.0/include/wx/image.h \
- C:/wxWidgets-3.1.0/include/wx/stream.h \
- C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
- C:/wxWidgets-3.1.0/include/wx/imagpng.h \
- C:/wxWidgets-3.1.0/include/wx/imaggif.h \
- C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
- C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
- C:/wxWidgets-3.1.0/include/wx/imagtga.h \
- C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
- C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
- C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
- C:/wxWidgets-3.1.0/include/wx/imagiff.h \
- C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
@@ -142,150 +235,60 @@ Release/Text.cpp.o: Text.cpp Text.h Element.h \
C:/wxWidgets-3.1.0/include/wx/msw/init.h \
C:/wxWidgets-3.1.0/include/wx/msw/app.h \
C:/wxWidgets-3.1.0/include/wx/stopwatch.h \
- C:/wxWidgets-3.1.0/include/wx/time.h \
C:/wxWidgets-3.1.0/include/wx/timer.h \
C:/wxWidgets-3.1.0/include/wx/module.h \
C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h \
C:/wxWidgets-3.1.0/include/wx/frame.h \
C:/wxWidgets-3.1.0/include/wx/statusbr.h \
- C:/wxWidgets-3.1.0/include/wx/control.h \
- C:/wxWidgets-3.1.0/include/wx/msw/control.h \
C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h \
- C:/wxWidgets-3.1.0/include/wx/tooltip.h \
- C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
C:/wxWidgets-3.1.0/include/wx/msw/frame.h \
- C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
- C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
- C:/wxWidgets-3.1.0/include/wx/pen.h \
- C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
- C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
- C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
- C:/wxWidgets-3.1.0/include/wx/dcclient.h \
C:/wxWidgets-3.1.0/include/wx/dcmemory.h \
C:/wxWidgets-3.1.0/include/wx/dcprint.h \
C:/wxWidgets-3.1.0/include/wx/dcscreen.h \
- C:/wxWidgets-3.1.0/include/wx/button.h \
- C:/wxWidgets-3.1.0/include/wx/anybutton.h \
- C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
- C:/wxWidgets-3.1.0/include/wx/msw/button.h \
C:/wxWidgets-3.1.0/include/wx/dataobj.h \
C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h \
C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h \
C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h \
- C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
- C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h \
C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h \
- C:/wxWidgets-3.1.0/include/wx/checkbox.h \
- C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
- C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
C:/wxWidgets-3.1.0/include/wx/checklst.h \
- C:/wxWidgets-3.1.0/include/wx/listbox.h \
- C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
C:/wxWidgets-3.1.0/include/wx/msw/checklst.h \
- C:/wxWidgets-3.1.0/include/wx/choice.h \
- C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
C:/wxWidgets-3.1.0/include/wx/scrolbar.h \
C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h \
- C:/wxWidgets-3.1.0/include/wx/stattext.h \
- C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
C:/wxWidgets-3.1.0/include/wx/statbmp.h \
C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h \
- C:/wxWidgets-3.1.0/include/wx/statbox.h \
- C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
C:/wxWidgets-3.1.0/include/wx/radiobox.h \
C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h \
C:/wxWidgets-3.1.0/include/wx/radiobut.h \
C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h \
- C:/wxWidgets-3.1.0/include/wx/textctrl.h \
- C:/wxWidgets-3.1.0/include/wx/textentry.h \
- C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \
- C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
- C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
C:/wxWidgets-3.1.0/include/wx/slider.h \
C:/wxWidgets-3.1.0/include/wx/msw/slider.h \
C:/wxWidgets-3.1.0/include/wx/gauge.h \
C:/wxWidgets-3.1.0/include/wx/msw/gauge.h \
- C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
- C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
- C:/wxWidgets-3.1.0/include/wx/recguard.h \
C:/wxWidgets-3.1.0/include/wx/dirdlg.h \
C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h \
- C:/wxWidgets-3.1.0/include/wx/toolbar.h \
- C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
- C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
- C:/wxWidgets-3.1.0/include/wx/imaglist.h \
- C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \
C:/wxWidgets-3.1.0/include/wx/combobox.h \
C:/wxWidgets-3.1.0/include/wx/msw/combobox.h \
C:/wxWidgets-3.1.0/include/wx/layout.h \
- C:/wxWidgets-3.1.0/include/wx/sizer.h \
C:/wxWidgets-3.1.0/include/wx/choicdlg.h \
C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h \
C:/wxWidgets-3.1.0/include/wx/textdlg.h \
C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h \
- C:/wxWidgets-3.1.0/include/wx/valtext.h \
C:/wxWidgets-3.1.0/include/wx/filedlg.h \
C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h \
C:/wxWidgets-3.1.0/include/wx/mdi.h \
- C:/wxWidgets-3.1.0/include/wx/msw/mdi.h Bus.h BusForm.h ElementForm.h \
- C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
- C:/wxWidgets-3.1.0/include/wx/filesys.h \
- C:/wxWidgets-3.1.0/include/wx/filename.h \
- C:/wxWidgets-3.1.0/include/wx/file.h \
- C:/wxWidgets-3.1.0/include/wx/convauto.h \
- C:/wxWidgets-3.1.0/include/wx/artprov.h \
- C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \
- C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \
- C:/wxWidgets-3.1.0/include/wx/notebook.h \
- C:/wxWidgets-3.1.0/include/wx/bookctrl.h \
- C:/wxWidgets-3.1.0/include/wx/withimages.h \
- C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \
- C:/wxWidgets-3.1.0/include/wx/statline.h \
- C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
- C:/wxWidgets-3.1.0/include/wx/hashset.h \
- C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
- C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
- C:/wxWidgets-3.1.0/include/wx/headercol.h \
- C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
- C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
- C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
- C:/wxWidgets-3.1.0/include/wx/range.h \
- C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
- C:/wxWidgets-3.1.0/include/wx/listctrl.h \
- C:/wxWidgets-3.1.0/include/wx/listbase.h \
- C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
- C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
- C:/wxWidgets-3.1.0/include/wx/persist.h \
- C:/wxWidgets-3.1.0/include/wx/confbase.h \
- C:/wxWidgets-3.1.0/include/wx/base64.h \
- C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \
- C:/wxWidgets-3.1.0/include/wx/persist/window.h \
- C:/wxWidgets-3.1.0/include/wx/display.h \
- C:/wxWidgets-3.1.0/include/wx/vidmode.h \
- C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \
- C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \
- C:/wxWidgets-3.1.0/include/wx/treebook.h \
- C:/wxWidgets-3.1.0/include/wx/treectrl.h \
- C:/wxWidgets-3.1.0/include/wx/treebase.h \
- C:/wxWidgets-3.1.0/include/wx/itemid.h \
- C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Line.h LineForm.h Branch.h \
- Transformer.h SyncGenerator.h Machines.h IndMotor.h SyncMotor.h Load.h \
- LoadForm.h Shunt.h Inductor.h Capacitor.h
+ C:/wxWidgets-3.1.0/include/wx/msw/mdi.h ElectricCalculation.h Bus.h \
+ BusForm.h Capacitor.h Shunt.h IndMotor.h Machines.h Inductor.h Line.h \
+ LineForm.h Branch.h Load.h LoadForm.h SyncGenerator.h SyncMotor.h \
+ Transformer.h
-Text.h:
+TextForm.h:
-Element.h:
+ElementForm.h:
-C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+C:/wxWidgets-3.1.0/include/wx/settings.h:
+
+C:/wxWidgets-3.1.0/include/wx/colour.h:
C:/wxWidgets-3.1.0/include/wx/defs.h:
@@ -319,15 +322,7 @@ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h:
C:/wxWidgets-3.1.0/include/wx/features.h:
-C:/wxWidgets-3.1.0/include/wx/dialog.h:
-
-C:/wxWidgets-3.1.0/include/wx/toplevel.h:
-
-C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
-
-C:/wxWidgets-3.1.0/include/wx/window.h:
-
-C:/wxWidgets-3.1.0/include/wx/event.h:
+C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
C:/wxWidgets-3.1.0/include/wx/object.h:
@@ -367,13 +362,9 @@ C:/wxWidgets-3.1.0/include/wx/flags.h:
C:/wxWidgets-3.1.0/include/wx/xti2.h:
-C:/wxWidgets-3.1.0/include/wx/clntdata.h:
-
-C:/wxWidgets-3.1.0/include/wx/hashmap.h:
-
-C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
+C:/wxWidgets-3.1.0/include/wx/variant.h:
-C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
+C:/wxWidgets-3.1.0/include/wx/arrstr.h:
C:/wxWidgets-3.1.0/include/wx/list.h:
@@ -389,217 +380,239 @@ C:/wxWidgets-3.1.0/include/wx/meta/pod.h:
C:/wxWidgets-3.1.0/include/wx/meta/if.h:
-C:/wxWidgets-3.1.0/include/wx/math.h:
+C:/wxWidgets-3.1.0/include/wx/longlong.h:
-C:/wxWidgets-3.1.0/include/wx/cursor.h:
+C:/wxWidgets-3.1.0/include/wx/datetime.h:
-C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
+C:/wxWidgets-3.1.0/include/wx/anystr.h:
-C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
+C:/wxWidgets-3.1.0/include/wx/dynarray.h:
-C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+C:/wxWidgets-3.1.0/include/wx/any.h:
-C:/wxWidgets-3.1.0/include/wx/utils.h:
+C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
-C:/wxWidgets-3.1.0/include/wx/filefn.h:
+C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
-C:/wxWidgets-3.1.0/include/wx/arrstr.h:
+C:/wxWidgets-3.1.0/include/wx/font.h:
-C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
+C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
-C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+C:/wxWidgets-3.1.0/include/wx/hashmap.h:
-C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
-C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+C:/wxWidgets-3.1.0/include/wx/math.h:
-C:/wxWidgets-3.1.0/include/wx/longlong.h:
+C:/wxWidgets-3.1.0/include/wx/msw/font.h:
-C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h:
-C:/wxWidgets-3.1.0/include/wx/dynarray.h:
+C:/wxWidgets-3.1.0/include/wx/filesys.h:
-C:/wxWidgets-3.1.0/include/wx/thread.h:
+C:/wxWidgets-3.1.0/include/wx/stream.h:
-C:/wxWidgets-3.1.0/include/wx/tracker.h:
+C:/wxWidgets-3.1.0/include/wx/filefn.h:
-C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
+C:/wxWidgets-3.1.0/include/wx/filename.h:
-C:/wxWidgets-3.1.0/include/wx/any.h:
+C:/wxWidgets-3.1.0/include/wx/intl.h:
-C:/wxWidgets-3.1.0/include/wx/datetime.h:
+C:/wxWidgets-3.1.0/include/wx/translation.h:
-C:/wxWidgets-3.1.0/include/wx/anystr.h:
+C:/wxWidgets-3.1.0/include/wx/language.h:
-C:/wxWidgets-3.1.0/include/wx/variant.h:
+C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
-C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
-C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+C:/wxWidgets-3.1.0/include/wx/file.h:
-C:/wxWidgets-3.1.0/include/wx/font.h:
+C:/wxWidgets-3.1.0/include/wx/convauto.h:
-C:/wxWidgets-3.1.0/include/wx/msw/font.h:
+C:/wxWidgets-3.1.0/include/wx/bitmap.h:
-C:/wxWidgets-3.1.0/include/wx/colour.h:
+C:/wxWidgets-3.1.0/include/wx/image.h:
-C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
+C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
-C:/wxWidgets-3.1.0/include/wx/region.h:
+C:/wxWidgets-3.1.0/include/wx/imagpng.h:
-C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
-C:/wxWidgets-3.1.0/include/wx/intl.h:
+C:/wxWidgets-3.1.0/include/wx/imaggif.h:
-C:/wxWidgets-3.1.0/include/wx/translation.h:
+C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
-C:/wxWidgets-3.1.0/include/wx/language.h:
+C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
-C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
+C:/wxWidgets-3.1.0/include/wx/imagtga.h:
-C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
+C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
-C:/wxWidgets-3.1.0/include/wx/validate.h:
+C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
C:/wxWidgets-3.1.0/include/wx/palette.h:
C:/wxWidgets-3.1.0/include/wx/msw/palette.h:
-C:/wxWidgets-3.1.0/include/wx/accel.h:
-
-C:/wxWidgets-3.1.0/include/wx/msw/accel.h:
+C:/wxWidgets-3.1.0/include/wx/icon.h:
-C:/wxWidgets-3.1.0/include/wx/msw/window.h:
+C:/wxWidgets-3.1.0/include/wx/iconloc.h:
-C:/wxWidgets-3.1.0/include/wx/settings.h:
+C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
-C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
+C:/wxWidgets-3.1.0/include/wx/artprov.h:
C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
-C:/wxWidgets-3.1.0/include/wx/icon.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h:
-C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+C:/wxWidgets-3.1.0/include/wx/imaglist.h:
-C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h:
-C:/wxWidgets-3.1.0/include/wx/weakref.h:
+C:/wxWidgets-3.1.0/include/wx/window.h:
-C:/wxWidgets-3.1.0/include/wx/meta/int2type.h:
+C:/wxWidgets-3.1.0/include/wx/event.h:
-C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h:
+C:/wxWidgets-3.1.0/include/wx/clntdata.h:
-C:/wxWidgets-3.1.0/include/wx/containr.h:
+C:/wxWidgets-3.1.0/include/wx/cursor.h:
-C:/wxWidgets-3.1.0/include/wx/sharedptr.h:
+C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
-C:/wxWidgets-3.1.0/include/wx/atomic.h:
+C:/wxWidgets-3.1.0/include/wx/utils.h:
-C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h:
+C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
-C:/wxWidgets-3.1.0/include/wx/msw/dialog.h:
+C:/wxWidgets-3.1.0/include/wx/mousestate.h:
-C:/wxWidgets-3.1.0/include/wx/panel.h:
+C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
-C:/wxWidgets-3.1.0/include/wx/msw/panel.h:
+C:/wxWidgets-3.1.0/include/wx/platinfo.h:
-C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+C:/wxWidgets-3.1.0/include/wx/thread.h:
-C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+C:/wxWidgets-3.1.0/include/wx/tracker.h:
-C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
-C:/wxWidgets-3.1.0/include/wx/geometry.h:
+C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
-C:/wxWidgets-3.1.0/include/wx/menu.h:
+C:/wxWidgets-3.1.0/include/wx/region.h:
-C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+C:/wxWidgets-3.1.0/include/wx/msw/region.h:
-C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
+C:/wxWidgets-3.1.0/include/wx/validate.h:
-C:/wxWidgets-3.1.0/include/wx/bitmap.h:
+C:/wxWidgets-3.1.0/include/wx/accel.h:
-C:/wxWidgets-3.1.0/include/wx/image.h:
+C:/wxWidgets-3.1.0/include/wx/msw/accel.h:
-C:/wxWidgets-3.1.0/include/wx/stream.h:
+C:/wxWidgets-3.1.0/include/wx/msw/window.h:
-C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h:
-C:/wxWidgets-3.1.0/include/wx/imagpng.h:
+C:/wxWidgets-3.1.0/include/wx/dialog.h:
-C:/wxWidgets-3.1.0/include/wx/imaggif.h:
+C:/wxWidgets-3.1.0/include/wx/toplevel.h:
-C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
+C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
-C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
+C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
-C:/wxWidgets-3.1.0/include/wx/imagtga.h:
+C:/wxWidgets-3.1.0/include/wx/weakref.h:
-C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
+C:/wxWidgets-3.1.0/include/wx/meta/int2type.h:
-C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h:
-C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+C:/wxWidgets-3.1.0/include/wx/containr.h:
-C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+C:/wxWidgets-3.1.0/include/wx/sharedptr.h:
-C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+C:/wxWidgets-3.1.0/include/wx/atomic.h:
-C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
+C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h:
-C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
+C:/wxWidgets-3.1.0/include/wx/msw/dialog.h:
-C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+C:/wxWidgets-3.1.0/include/wx/panel.h:
-C:/wxWidgets-3.1.0/include/wx/log.h:
+C:/wxWidgets-3.1.0/include/wx/msw/panel.h:
-C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
+C:/wxWidgets-3.1.0/include/wx/sizer.h:
-wxGLString.h:
+C:/wxWidgets-3.1.0/include/wx/notebook.h:
-C:/wxWidgets-3.1.0/include/wx/wx.h:
+C:/wxWidgets-3.1.0/include/wx/bookctrl.h:
-C:/wxWidgets-3.1.0/include/wx/hash.h:
+C:/wxWidgets-3.1.0/include/wx/control.h:
-C:/wxWidgets-3.1.0/include/wx/app.h:
+C:/wxWidgets-3.1.0/include/wx/msw/control.h:
-C:/wxWidgets-3.1.0/include/wx/eventfilter.h:
+C:/wxWidgets-3.1.0/include/wx/withimages.h:
-C:/wxWidgets-3.1.0/include/wx/build.h:
+C:/wxWidgets-3.1.0/include/wx/msw/notebook.h:
-C:/wxWidgets-3.1.0/include/wx/cmdargs.h:
+C:/wxWidgets-3.1.0/include/wx/stattext.h:
-C:/wxWidgets-3.1.0/include/wx/init.h:
+C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
-C:/wxWidgets-3.1.0/include/wx/msw/init.h:
+C:/wxWidgets-3.1.0/include/wx/textctrl.h:
-C:/wxWidgets-3.1.0/include/wx/msw/app.h:
+C:/wxWidgets-3.1.0/include/wx/textentry.h:
-C:/wxWidgets-3.1.0/include/wx/stopwatch.h:
+C:/wxWidgets-3.1.0/include/wx/msw/textentry.h:
-C:/wxWidgets-3.1.0/include/wx/time.h:
+C:/wxWidgets-3.1.0/include/wx/ioswrap.h:
-C:/wxWidgets-3.1.0/include/wx/timer.h:
+C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h:
-C:/wxWidgets-3.1.0/include/wx/module.h:
+C:/wxWidgets-3.1.0/include/wx/choice.h:
-C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h:
+C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
-C:/wxWidgets-3.1.0/include/wx/frame.h:
+C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
-C:/wxWidgets-3.1.0/include/wx/statusbr.h:
+C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
-C:/wxWidgets-3.1.0/include/wx/control.h:
+C:/wxWidgets-3.1.0/include/wx/checkbox.h:
-C:/wxWidgets-3.1.0/include/wx/msw/control.h:
+C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
-C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h:
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
-C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+C:/wxWidgets-3.1.0/include/wx/button.h:
-C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+C:/wxWidgets-3.1.0/include/wx/anybutton.h:
-C:/wxWidgets-3.1.0/include/wx/msw/frame.h:
+C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
C:/wxWidgets-3.1.0/include/wx/dc.h:
@@ -615,247 +628,249 @@ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
-C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
-C:/wxWidgets-3.1.0/include/wx/dcmemory.h:
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
-C:/wxWidgets-3.1.0/include/wx/dcprint.h:
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
-C:/wxWidgets-3.1.0/include/wx/dcscreen.h:
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
-C:/wxWidgets-3.1.0/include/wx/button.h:
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
-C:/wxWidgets-3.1.0/include/wx/anybutton.h:
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
-C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+C:/wxWidgets-3.1.0/include/wx/time.h:
-C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
-C:/wxWidgets-3.1.0/include/wx/dataobj.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
-C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h:
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
-C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h:
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
-C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
-C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
-C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
-C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
-C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h:
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
-C:/wxWidgets-3.1.0/include/wx/checkbox.h:
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
-C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
-C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
-C:/wxWidgets-3.1.0/include/wx/checklst.h:
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
-C:/wxWidgets-3.1.0/include/wx/listbox.h:
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
-C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
-C:/wxWidgets-3.1.0/include/wx/msw/checklst.h:
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
-C:/wxWidgets-3.1.0/include/wx/choice.h:
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
-C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
-C:/wxWidgets-3.1.0/include/wx/scrolbar.h:
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
-C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h:
+C:/wxWidgets-3.1.0/include/wx/range.h:
-C:/wxWidgets-3.1.0/include/wx/stattext.h:
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
-C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
-C:/wxWidgets-3.1.0/include/wx/statbmp.h:
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
-C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h:
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
-C:/wxWidgets-3.1.0/include/wx/statbox.h:
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
-C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+C:/wxWidgets-3.1.0/include/wx/persist.h:
-C:/wxWidgets-3.1.0/include/wx/radiobox.h:
+C:/wxWidgets-3.1.0/include/wx/confbase.h:
-C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h:
+C:/wxWidgets-3.1.0/include/wx/base64.h:
-C:/wxWidgets-3.1.0/include/wx/radiobut.h:
+C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h:
-C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h:
+C:/wxWidgets-3.1.0/include/wx/persist/window.h:
-C:/wxWidgets-3.1.0/include/wx/textctrl.h:
+C:/wxWidgets-3.1.0/include/wx/display.h:
-C:/wxWidgets-3.1.0/include/wx/textentry.h:
+C:/wxWidgets-3.1.0/include/wx/vidmode.h:
-C:/wxWidgets-3.1.0/include/wx/msw/textentry.h:
+C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h:
-C:/wxWidgets-3.1.0/include/wx/ioswrap.h:
+C:/wxWidgets-3.1.0/include/wx/persist/treebook.h:
-C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h:
+C:/wxWidgets-3.1.0/include/wx/treebook.h:
-C:/wxWidgets-3.1.0/include/wx/slider.h:
+C:/wxWidgets-3.1.0/include/wx/treectrl.h:
-C:/wxWidgets-3.1.0/include/wx/msw/slider.h:
+C:/wxWidgets-3.1.0/include/wx/treebase.h:
-C:/wxWidgets-3.1.0/include/wx/gauge.h:
+C:/wxWidgets-3.1.0/include/wx/itemid.h:
-C:/wxWidgets-3.1.0/include/wx/msw/gauge.h:
+C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
-C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+Text.h:
-C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+Element.h:
-C:/wxWidgets-3.1.0/include/wx/recguard.h:
+C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
-C:/wxWidgets-3.1.0/include/wx/dirdlg.h:
+C:/wxWidgets-3.1.0/include/wx/stockitem.h:
-C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h:
+C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
-C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
-C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+C:/wxWidgets-3.1.0/include/wx/menu.h:
-C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+C:/wxWidgets-3.1.0/include/wx/menuitem.h:
-C:/wxWidgets-3.1.0/include/wx/imaglist.h:
+C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
-C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h:
+C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
-C:/wxWidgets-3.1.0/include/wx/combobox.h:
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
-C:/wxWidgets-3.1.0/include/wx/msw/combobox.h:
+C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
-C:/wxWidgets-3.1.0/include/wx/layout.h:
+C:/wxWidgets-3.1.0/include/wx/log.h:
-C:/wxWidgets-3.1.0/include/wx/sizer.h:
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
-C:/wxWidgets-3.1.0/include/wx/choicdlg.h:
+wxGLString.h:
-C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h:
+C:/wxWidgets-3.1.0/include/wx/wx.h:
-C:/wxWidgets-3.1.0/include/wx/textdlg.h:
+C:/wxWidgets-3.1.0/include/wx/hash.h:
-C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h:
+C:/wxWidgets-3.1.0/include/wx/app.h:
-C:/wxWidgets-3.1.0/include/wx/valtext.h:
+C:/wxWidgets-3.1.0/include/wx/eventfilter.h:
-C:/wxWidgets-3.1.0/include/wx/filedlg.h:
+C:/wxWidgets-3.1.0/include/wx/build.h:
-C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h:
+C:/wxWidgets-3.1.0/include/wx/cmdargs.h:
-C:/wxWidgets-3.1.0/include/wx/mdi.h:
+C:/wxWidgets-3.1.0/include/wx/init.h:
-C:/wxWidgets-3.1.0/include/wx/msw/mdi.h:
+C:/wxWidgets-3.1.0/include/wx/msw/init.h:
-Bus.h:
+C:/wxWidgets-3.1.0/include/wx/msw/app.h:
-BusForm.h:
+C:/wxWidgets-3.1.0/include/wx/stopwatch.h:
-ElementForm.h:
+C:/wxWidgets-3.1.0/include/wx/timer.h:
-C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h:
+C:/wxWidgets-3.1.0/include/wx/module.h:
-C:/wxWidgets-3.1.0/include/wx/filesys.h:
+C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h:
-C:/wxWidgets-3.1.0/include/wx/filename.h:
+C:/wxWidgets-3.1.0/include/wx/frame.h:
-C:/wxWidgets-3.1.0/include/wx/file.h:
+C:/wxWidgets-3.1.0/include/wx/statusbr.h:
-C:/wxWidgets-3.1.0/include/wx/convauto.h:
+C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h:
-C:/wxWidgets-3.1.0/include/wx/artprov.h:
+C:/wxWidgets-3.1.0/include/wx/msw/frame.h:
-C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h:
+C:/wxWidgets-3.1.0/include/wx/dcmemory.h:
-C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h:
+C:/wxWidgets-3.1.0/include/wx/dcprint.h:
-C:/wxWidgets-3.1.0/include/wx/notebook.h:
+C:/wxWidgets-3.1.0/include/wx/dcscreen.h:
-C:/wxWidgets-3.1.0/include/wx/bookctrl.h:
+C:/wxWidgets-3.1.0/include/wx/dataobj.h:
-C:/wxWidgets-3.1.0/include/wx/withimages.h:
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h:
-C:/wxWidgets-3.1.0/include/wx/msw/notebook.h:
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h:
-C:/wxWidgets-3.1.0/include/wx/statline.h:
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h:
-C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+C:/wxWidgets-3.1.0/include/wx/checklst.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+C:/wxWidgets-3.1.0/include/wx/msw/checklst.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+C:/wxWidgets-3.1.0/include/wx/scrolbar.h:
-C:/wxWidgets-3.1.0/include/wx/hashset.h:
+C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h:
-C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+C:/wxWidgets-3.1.0/include/wx/statbmp.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+C:/wxWidgets-3.1.0/include/wx/radiobox.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+C:/wxWidgets-3.1.0/include/wx/radiobut.h:
-C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h:
-C:/wxWidgets-3.1.0/include/wx/headercol.h:
+C:/wxWidgets-3.1.0/include/wx/slider.h:
-C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+C:/wxWidgets-3.1.0/include/wx/msw/slider.h:
-C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+C:/wxWidgets-3.1.0/include/wx/gauge.h:
-C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+C:/wxWidgets-3.1.0/include/wx/msw/gauge.h:
-C:/wxWidgets-3.1.0/include/wx/range.h:
+C:/wxWidgets-3.1.0/include/wx/dirdlg.h:
-C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h:
-C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+C:/wxWidgets-3.1.0/include/wx/combobox.h:
-C:/wxWidgets-3.1.0/include/wx/listbase.h:
+C:/wxWidgets-3.1.0/include/wx/msw/combobox.h:
-C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+C:/wxWidgets-3.1.0/include/wx/layout.h:
-C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+C:/wxWidgets-3.1.0/include/wx/choicdlg.h:
-C:/wxWidgets-3.1.0/include/wx/persist.h:
+C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h:
-C:/wxWidgets-3.1.0/include/wx/confbase.h:
+C:/wxWidgets-3.1.0/include/wx/textdlg.h:
-C:/wxWidgets-3.1.0/include/wx/base64.h:
+C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h:
-C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h:
+C:/wxWidgets-3.1.0/include/wx/filedlg.h:
-C:/wxWidgets-3.1.0/include/wx/persist/window.h:
+C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h:
-C:/wxWidgets-3.1.0/include/wx/display.h:
+C:/wxWidgets-3.1.0/include/wx/mdi.h:
-C:/wxWidgets-3.1.0/include/wx/vidmode.h:
+C:/wxWidgets-3.1.0/include/wx/msw/mdi.h:
-C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h:
+ElectricCalculation.h:
-C:/wxWidgets-3.1.0/include/wx/persist/treebook.h:
+Bus.h:
-C:/wxWidgets-3.1.0/include/wx/treebook.h:
+BusForm.h:
-C:/wxWidgets-3.1.0/include/wx/treectrl.h:
+Capacitor.h:
-C:/wxWidgets-3.1.0/include/wx/treebase.h:
+Shunt.h:
-C:/wxWidgets-3.1.0/include/wx/itemid.h:
+IndMotor.h:
-C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
+Machines.h:
+
+Inductor.h:
Line.h:
@@ -863,22 +878,12 @@ LineForm.h:
Branch.h:
-Transformer.h:
-
-SyncGenerator.h:
-
-Machines.h:
-
-IndMotor.h:
-
-SyncMotor.h:
-
Load.h:
LoadForm.h:
-Shunt.h:
+SyncGenerator.h:
-Inductor.h:
+SyncMotor.h:
-Capacitor.h:
+Transformer.h:
diff --git a/Project/Release/TextForm.cpp.o b/Project/Release/TextForm.cpp.o
new file mode 100644
index 0000000..eaa0a65
--- /dev/null
+++ b/Project/Release/TextForm.cpp.o
Binary files differ
diff --git a/Project/Release/TextForm.cpp.o.d b/Project/Release/TextForm.cpp.o.d
new file mode 100644
index 0000000..26a715b
--- /dev/null
+++ b/Project/Release/TextForm.cpp.o.d
@@ -0,0 +1,889 @@
+Release/TextForm.cpp.o: TextForm.cpp TextForm.h ElementForm.h \
+ C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/defs.h \
+ C:/wxWidgets-3.1.0/include/wx/platform.h \
+ C:/wxWidgets-3.1.0/include/wx/compiler.h \
+ C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/libraries.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h \
+ C:/wxWidgets-3.1.0/include/wx/chkconf.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h \
+ C:/wxWidgets-3.1.0/include/wx/version.h \
+ C:/wxWidgets-3.1.0/include/wx/cpp.h \
+ C:/wxWidgets-3.1.0/include/wx/dlimpexp.h \
+ C:/wxWidgets-3.1.0/include/wx/debug.h \
+ C:/wxWidgets-3.1.0/include/wx/chartype.h \
+ C:/wxWidgets-3.1.0/include/wx/windowid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \
+ C:/wxWidgets-3.1.0/include/wx/features.h \
+ C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
+ C:/wxWidgets-3.1.0/include/wx/object.h \
+ C:/wxWidgets-3.1.0/include/wx/memory.h \
+ C:/wxWidgets-3.1.0/include/wx/string.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h \
+ C:/wxWidgets-3.1.0/include/wx/strvararg.h \
+ C:/wxWidgets-3.1.0/include/wx/strconv.h \
+ C:/wxWidgets-3.1.0/include/wx/buffer.h \
+ C:/wxWidgets-3.1.0/include/wx/fontenc.h \
+ C:/wxWidgets-3.1.0/include/wx/unichar.h \
+ C:/wxWidgets-3.1.0/include/wx/stringimpl.h \
+ C:/wxWidgets-3.1.0/include/wx/beforestd.h \
+ C:/wxWidgets-3.1.0/include/wx/afterstd.h \
+ C:/wxWidgets-3.1.0/include/wx/stringops.h \
+ C:/wxWidgets-3.1.0/include/wx/iosfwrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msgout.h \
+ C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \
+ C:/wxWidgets-3.1.0/include/wx/flags.h \
+ C:/wxWidgets-3.1.0/include/wx/xti2.h \
+ C:/wxWidgets-3.1.0/include/wx/variant.h \
+ C:/wxWidgets-3.1.0/include/wx/arrstr.h \
+ C:/wxWidgets-3.1.0/include/wx/list.h \
+ C:/wxWidgets-3.1.0/include/wx/vector.h \
+ C:/wxWidgets-3.1.0/include/wx/scopeguard.h \
+ C:/wxWidgets-3.1.0/include/wx/except.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/movable.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/pod.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/if.h \
+ C:/wxWidgets-3.1.0/include/wx/longlong.h \
+ C:/wxWidgets-3.1.0/include/wx/datetime.h \
+ C:/wxWidgets-3.1.0/include/wx/anystr.h \
+ C:/wxWidgets-3.1.0/include/wx/dynarray.h \
+ C:/wxWidgets-3.1.0/include/wx/any.h \
+ C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/font.h \
+ C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/hashmap.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
+ C:/wxWidgets-3.1.0/include/wx/math.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/font.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
+ C:/wxWidgets-3.1.0/include/wx/filesys.h \
+ C:/wxWidgets-3.1.0/include/wx/stream.h \
+ C:/wxWidgets-3.1.0/include/wx/filefn.h \
+ C:/wxWidgets-3.1.0/include/wx/filename.h \
+ C:/wxWidgets-3.1.0/include/wx/intl.h \
+ C:/wxWidgets-3.1.0/include/wx/translation.h \
+ C:/wxWidgets-3.1.0/include/wx/language.h \
+ C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
+ C:/wxWidgets-3.1.0/include/wx/file.h \
+ C:/wxWidgets-3.1.0/include/wx/convauto.h \
+ C:/wxWidgets-3.1.0/include/wx/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/image.h \
+ C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpng.h \
+ C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
+ C:/wxWidgets-3.1.0/include/wx/imaggif.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
+ C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtga.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagiff.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \
+ C:/wxWidgets-3.1.0/include/wx/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/iconloc.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/artprov.h \
+ C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \
+ C:/wxWidgets-3.1.0/include/wx/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/window.h \
+ C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/clntdata.h \
+ C:/wxWidgets-3.1.0/include/wx/cursor.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \
+ C:/wxWidgets-3.1.0/include/wx/utils.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \
+ C:/wxWidgets-3.1.0/include/wx/mousestate.h \
+ C:/wxWidgets-3.1.0/include/wx/kbdstate.h \
+ C:/wxWidgets-3.1.0/include/wx/platinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/thread.h \
+ C:/wxWidgets-3.1.0/include/wx/tracker.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \
+ C:/wxWidgets-3.1.0/include/wx/region.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/region.h \
+ C:/wxWidgets-3.1.0/include/wx/validate.h \
+ C:/wxWidgets-3.1.0/include/wx/accel.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/accel.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/window.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \
+ C:/wxWidgets-3.1.0/include/wx/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h \
+ C:/wxWidgets-3.1.0/include/wx/weakref.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/int2type.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/containr.h \
+ C:/wxWidgets-3.1.0/include/wx/sharedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/atomic.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/sizer.h \
+ C:/wxWidgets-3.1.0/include/wx/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/control.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/control.h \
+ C:/wxWidgets-3.1.0/include/wx/withimages.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
+ C:/wxWidgets-3.1.0/include/wx/button.h \
+ C:/wxWidgets-3.1.0/include/wx/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/button.h \
+ C:/wxWidgets-3.1.0/include/wx/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist.h \
+ C:/wxWidgets-3.1.0/include/wx/confbase.h \
+ C:/wxWidgets-3.1.0/include/wx/base64.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/window.h \
+ C:/wxWidgets-3.1.0/include/wx/display.h \
+ C:/wxWidgets-3.1.0/include/wx/vidmode.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/treebase.h \
+ C:/wxWidgets-3.1.0/include/wx/itemid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Text.h Element.h \
+ C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/stockitem.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/menuitem.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
+ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h wxGLString.h \
+ C:/wxWidgets-3.1.0/include/wx/wx.h C:/wxWidgets-3.1.0/include/wx/hash.h \
+ C:/wxWidgets-3.1.0/include/wx/app.h \
+ C:/wxWidgets-3.1.0/include/wx/eventfilter.h \
+ C:/wxWidgets-3.1.0/include/wx/build.h \
+ C:/wxWidgets-3.1.0/include/wx/cmdargs.h \
+ C:/wxWidgets-3.1.0/include/wx/init.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/init.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/app.h \
+ C:/wxWidgets-3.1.0/include/wx/stopwatch.h \
+ C:/wxWidgets-3.1.0/include/wx/timer.h \
+ C:/wxWidgets-3.1.0/include/wx/module.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h \
+ C:/wxWidgets-3.1.0/include/wx/frame.h \
+ C:/wxWidgets-3.1.0/include/wx/statusbr.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/frame.h \
+ C:/wxWidgets-3.1.0/include/wx/dcmemory.h \
+ C:/wxWidgets-3.1.0/include/wx/dcprint.h \
+ C:/wxWidgets-3.1.0/include/wx/dcscreen.h \
+ C:/wxWidgets-3.1.0/include/wx/dataobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h \
+ C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h \
+ C:/wxWidgets-3.1.0/include/wx/checklst.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checklst.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/statbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/radiobox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h \
+ C:/wxWidgets-3.1.0/include/wx/radiobut.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h \
+ C:/wxWidgets-3.1.0/include/wx/slider.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/slider.h \
+ C:/wxWidgets-3.1.0/include/wx/gauge.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/gauge.h \
+ C:/wxWidgets-3.1.0/include/wx/dirdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/combobox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/combobox.h \
+ C:/wxWidgets-3.1.0/include/wx/layout.h \
+ C:/wxWidgets-3.1.0/include/wx/choicdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h \
+ C:/wxWidgets-3.1.0/include/wx/textdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h \
+ C:/wxWidgets-3.1.0/include/wx/filedlg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h \
+ C:/wxWidgets-3.1.0/include/wx/mdi.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/mdi.h ElectricCalculation.h Bus.h \
+ BusForm.h Capacitor.h Shunt.h IndMotor.h Machines.h Inductor.h Line.h \
+ LineForm.h Branch.h Load.h LoadForm.h SyncGenerator.h SyncMotor.h \
+ Transformer.h
+
+TextForm.h:
+
+ElementForm.h:
+
+C:/wxWidgets-3.1.0/include/wx/settings.h:
+
+C:/wxWidgets-3.1.0/include/wx/colour.h:
+
+C:/wxWidgets-3.1.0/include/wx/defs.h:
+
+C:/wxWidgets-3.1.0/include/wx/platform.h:
+
+C:/wxWidgets-3.1.0/include/wx/compiler.h:
+
+C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/libraries.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h:
+
+C:/wxWidgets-3.1.0/include/wx/chkconf.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h:
+
+C:/wxWidgets-3.1.0/include/wx/version.h:
+
+C:/wxWidgets-3.1.0/include/wx/cpp.h:
+
+C:/wxWidgets-3.1.0/include/wx/dlimpexp.h:
+
+C:/wxWidgets-3.1.0/include/wx/debug.h:
+
+C:/wxWidgets-3.1.0/include/wx/chartype.h:
+
+C:/wxWidgets-3.1.0/include/wx/windowid.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/winundef.h:
+
+C:/wxWidgets-3.1.0/include/wx/features.h:
+
+C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
+
+C:/wxWidgets-3.1.0/include/wx/object.h:
+
+C:/wxWidgets-3.1.0/include/wx/memory.h:
+
+C:/wxWidgets-3.1.0/include/wx/string.h:
+
+C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/strvararg.h:
+
+C:/wxWidgets-3.1.0/include/wx/strconv.h:
+
+C:/wxWidgets-3.1.0/include/wx/buffer.h:
+
+C:/wxWidgets-3.1.0/include/wx/fontenc.h:
+
+C:/wxWidgets-3.1.0/include/wx/unichar.h:
+
+C:/wxWidgets-3.1.0/include/wx/stringimpl.h:
+
+C:/wxWidgets-3.1.0/include/wx/beforestd.h:
+
+C:/wxWidgets-3.1.0/include/wx/afterstd.h:
+
+C:/wxWidgets-3.1.0/include/wx/stringops.h:
+
+C:/wxWidgets-3.1.0/include/wx/iosfwrap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msgout.h:
+
+C:/wxWidgets-3.1.0/include/wx/xti.h:
+
+C:/wxWidgets-3.1.0/include/wx/rtti.h:
+
+C:/wxWidgets-3.1.0/include/wx/flags.h:
+
+C:/wxWidgets-3.1.0/include/wx/xti2.h:
+
+C:/wxWidgets-3.1.0/include/wx/variant.h:
+
+C:/wxWidgets-3.1.0/include/wx/arrstr.h:
+
+C:/wxWidgets-3.1.0/include/wx/list.h:
+
+C:/wxWidgets-3.1.0/include/wx/vector.h:
+
+C:/wxWidgets-3.1.0/include/wx/scopeguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/except.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/movable.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/pod.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/if.h:
+
+C:/wxWidgets-3.1.0/include/wx/longlong.h:
+
+C:/wxWidgets-3.1.0/include/wx/datetime.h:
+
+C:/wxWidgets-3.1.0/include/wx/anystr.h:
+
+C:/wxWidgets-3.1.0/include/wx/dynarray.h:
+
+C:/wxWidgets-3.1.0/include/wx/any.h:
+
+C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
+
+C:/wxWidgets-3.1.0/include/wx/font.h:
+
+C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
+
+C:/wxWidgets-3.1.0/include/wx/math.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/font.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h:
+
+C:/wxWidgets-3.1.0/include/wx/filesys.h:
+
+C:/wxWidgets-3.1.0/include/wx/stream.h:
+
+C:/wxWidgets-3.1.0/include/wx/filefn.h:
+
+C:/wxWidgets-3.1.0/include/wx/filename.h:
+
+C:/wxWidgets-3.1.0/include/wx/intl.h:
+
+C:/wxWidgets-3.1.0/include/wx/translation.h:
+
+C:/wxWidgets-3.1.0/include/wx/language.h:
+
+C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
+
+C:/wxWidgets-3.1.0/include/wx/file.h:
+
+C:/wxWidgets-3.1.0/include/wx/convauto.h:
+
+C:/wxWidgets-3.1.0/include/wx/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/image.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagpng.h:
+
+C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/imaggif.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagtga.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
+
+C:/wxWidgets-3.1.0/include/wx/palette.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/palette.h:
+
+C:/wxWidgets-3.1.0/include/wx/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/artprov.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h:
+
+C:/wxWidgets-3.1.0/include/wx/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/event.h:
+
+C:/wxWidgets-3.1.0/include/wx/clntdata.h:
+
+C:/wxWidgets-3.1.0/include/wx/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/utils.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+
+C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+
+C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/thread.h:
+
+C:/wxWidgets-3.1.0/include/wx/tracker.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+
+C:/wxWidgets-3.1.0/include/wx/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/validate.h:
+
+C:/wxWidgets-3.1.0/include/wx/accel.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/accel.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/dialog.h:
+
+C:/wxWidgets-3.1.0/include/wx/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
+
+C:/wxWidgets-3.1.0/include/wx/weakref.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/int2type.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/containr.h:
+
+C:/wxWidgets-3.1.0/include/wx/sharedptr.h:
+
+C:/wxWidgets-3.1.0/include/wx/atomic.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/dialog.h:
+
+C:/wxWidgets-3.1.0/include/wx/panel.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/panel.h:
+
+C:/wxWidgets-3.1.0/include/wx/sizer.h:
+
+C:/wxWidgets-3.1.0/include/wx/notebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/withimages.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/notebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/ioswrap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist.h:
+
+C:/wxWidgets-3.1.0/include/wx/confbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/base64.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/display.h:
+
+C:/wxWidgets-3.1.0/include/wx/vidmode.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebase.h:
+
+C:/wxWidgets-3.1.0/include/wx/itemid.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
+
+Text.h:
+
+Element.h:
+
+C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
+
+wxGLString.h:
+
+C:/wxWidgets-3.1.0/include/wx/wx.h:
+
+C:/wxWidgets-3.1.0/include/wx/hash.h:
+
+C:/wxWidgets-3.1.0/include/wx/app.h:
+
+C:/wxWidgets-3.1.0/include/wx/eventfilter.h:
+
+C:/wxWidgets-3.1.0/include/wx/build.h:
+
+C:/wxWidgets-3.1.0/include/wx/cmdargs.h:
+
+C:/wxWidgets-3.1.0/include/wx/init.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/init.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/app.h:
+
+C:/wxWidgets-3.1.0/include/wx/stopwatch.h:
+
+C:/wxWidgets-3.1.0/include/wx/timer.h:
+
+C:/wxWidgets-3.1.0/include/wx/module.h:
+
+C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h:
+
+C:/wxWidgets-3.1.0/include/wx/frame.h:
+
+C:/wxWidgets-3.1.0/include/wx/statusbr.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statusbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/frame.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcmemory.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcprint.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcscreen.h:
+
+C:/wxWidgets-3.1.0/include/wx/dataobj.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h:
+
+C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h:
+
+C:/wxWidgets-3.1.0/include/wx/checklst.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checklst.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/radiobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/radiobut.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h:
+
+C:/wxWidgets-3.1.0/include/wx/slider.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/slider.h:
+
+C:/wxWidgets-3.1.0/include/wx/gauge.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gauge.h:
+
+C:/wxWidgets-3.1.0/include/wx/dirdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/combobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/combobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/layout.h:
+
+C:/wxWidgets-3.1.0/include/wx/choicdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/textdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/filedlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/mdi.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/mdi.h:
+
+ElectricCalculation.h:
+
+Bus.h:
+
+BusForm.h:
+
+Capacitor.h:
+
+Shunt.h:
+
+IndMotor.h:
+
+Machines.h:
+
+Inductor.h:
+
+Line.h:
+
+LineForm.h:
+
+Branch.h:
+
+Load.h:
+
+LoadForm.h:
+
+SyncGenerator.h:
+
+SyncMotor.h:
+
+Transformer.h:
diff --git a/Project/Release/Workspace.cpp.o b/Project/Release/Workspace.cpp.o
index 5b3493d..26ee31e 100644
--- a/Project/Release/Workspace.cpp.o
+++ b/Project/Release/Workspace.cpp.o
Binary files differ
diff --git a/Project/Text.cpp b/Project/Text.cpp
index 1a89d17..839e6f8 100644
--- a/Project/Text.cpp
+++ b/Project/Text.cpp
@@ -1,14 +1,7 @@
+#include "TextForm.h"
#include "Text.h"
-#include "Bus.h"
-#include "Line.h"
-#include "Transformer.h"
-#include "SyncGenerator.h"
-#include "IndMotor.h"
-#include "SyncMotor.h"
-#include "Load.h"
-#include "Inductor.h"
-#include "Capacitor.h"
+#include "ElectricCalculation.h"
Text::Text() : Element() { SetText(m_text); }
Text::Text(wxPoint2DDouble position) : Element()
@@ -84,3 +77,14 @@ void Text::Rotate(bool clockwise)
m_angle += rotAngle;
if(m_angle >= 360.0) m_angle = 0.0;
}
+
+bool Text::ShowForm(wxWindow* parent, std::vector<Element*> elementList)
+{
+ TextForm* textForm = new TextForm(parent, this, elementList);
+ if(textForm->ShowModal() == wxID_OK) {
+ textForm->Destroy();
+ return true;
+ }
+ textForm->Destroy();
+ return false;
+}
diff --git a/Project/Text.h b/Project/Text.h
index d54d927..24f9228 100644
--- a/Project/Text.h
+++ b/Project/Text.h
@@ -4,16 +4,34 @@
#include "Element.h"
#include "wxGLString.h"
-class wxGLString;
-class Bus;
-class Line;
-class Transformer;
-class SyncGenerator;
-class IndMotor;
-class SyncMotor;
-class Load;
-class Inductor;
-class Capacitor;
+class TextForm;
+
+enum ElementType {
+ TYPE_BUS,
+ TYPE_CAPACITOR,
+ TYPE_IND_MOTOR,
+ TYPE_INDUCTOR,
+ TYPE_LINE,
+ TYPE_LOAD,
+ TYPE_SYNC_GENERATOR,
+ TYPE_SYNC_MOTOR,
+ TYPE_TRANSFORMER
+};
+
+enum DataType {
+ DATA_NAME,
+ DATA_VOLTAGE,
+ DATA_ANGLE,
+ DATA_SC_CURRENT,
+ DATA_SC_VOLTAGE,
+ DATA_SC_POWER,
+ DATA_ACTIVE_POWER,
+ DATA_REACTIVE_POWER,
+ DATA_PF_ACTIVE,
+ DATA_PF_REACTIVE,
+ DATA_PF_LOSSES,
+ DATA_PF_CURRENT
+};
class Text : public Element
{
@@ -27,13 +45,35 @@ class Text : public Element
virtual void Draw(wxPoint2DDouble translation, double scale);
virtual bool Intersects(wxRect2DDouble rect) const;
virtual void Rotate(bool clockwise = true);
+ virtual bool ShowForm(wxWindow* parent, std::vector<Element*> elementList);
virtual wxString GetText() const { return m_text; }
virtual void SetText(wxString text);
-
-protected:
- wxString m_text = _("Barra 1");
+ void SetDataType(const DataType& dataType) { m_dataType = dataType; }
+ void SetDirection(int direction) { m_direction = direction; }
+ void SetElement(Element* element) { m_element = element; }
+ void SetElementNumber(int elementNumber) { m_elementNumber = elementNumber; }
+ void SetElementType(const ElementType elementType) { m_elementType = elementType; }
+ void SetFontSize(int fontSize) { m_fontSize = fontSize; }
+ void SetUnit(const ElectricalUnit unit) { m_unit = unit; }
+ const DataType GetDataType() const { return m_dataType; }
+ int GetDirection() const { return m_direction; }
+ Element* GetElement() { return m_element; }
+ int GetElementNumber() const { return m_elementNumber; }
+ const ElementType GetElementType() const { return m_elementType; }
+ int GetFontSize() const { return m_fontSize; }
+ const ElectricalUnit GetUnit() const { return m_unit; }
+
+ protected:
+ wxString m_text = _("Text");
int m_fontSize = 10;
+
+ Element* m_element;
+ ElementType m_elementType;
+ int m_elementNumber;
+ DataType m_dataType;
+ ElectricalUnit m_unit;
+ int m_direction;
};
#endif // TEXT_H
diff --git a/Project/TextForm.cpp b/Project/TextForm.cpp
new file mode 100644
index 0000000..a36e4b2
--- /dev/null
+++ b/Project/TextForm.cpp
@@ -0,0 +1,201 @@
+#include "TextForm.h"
+
+TextForm::TextForm(wxWindow* parent, Text* text, std::vector<Element*> elementList) : TextFormBase(parent)
+{
+ m_parent = parent;
+ m_text = text;
+ m_allElements.GetElementsFromList(elementList);
+
+ m_choiceName->Enable(false);
+ m_choiceTextType->Enable(false);
+ m_choiceTextFromBus->Enable(false);
+ m_choiceTextToBus->Enable(false);
+ m_choiceTextUnit->Enable(false);
+}
+
+TextForm::~TextForm() {}
+void TextForm::OnElementChoiceSelected(wxCommandEvent& event)
+{
+ switch(m_choiceElement->GetSelection()) {
+ case 0: {
+ m_text->SetElementType(TYPE_BUS);
+ } break;
+ case 1: {
+ m_text->SetElementType(TYPE_SYNC_GENERATOR);
+ } break;
+ case 2: {
+ m_text->SetElementType(TYPE_LINE);
+ } break;
+ case 3: {
+ m_text->SetElementType(TYPE_TRANSFORMER);
+ } break;
+ case 4: {
+ m_text->SetElementType(TYPE_LOAD);
+ } break;
+ case 5: {
+ m_text->SetElementType(TYPE_CAPACITOR);
+ } break;
+ case 6: {
+ m_text->SetElementType(TYPE_INDUCTOR);
+ } break;
+ case 7: {
+ m_text->SetElementType(TYPE_SYNC_MOTOR);
+ } break;
+ case 8: {
+ m_text->SetElementType(TYPE_IND_MOTOR);
+ } break;
+
+ default:
+ break;
+ }
+
+ ElementTypeChoice();
+}
+
+void TextForm::OnFromBusChoiceSelected(wxCommandEvent& event) {}
+void TextForm::OnNameChoiceSelected(wxCommandEvent& event)
+{
+ m_text->SetElementNumber(m_choiceName->GetSelection());
+ ElementNumberChoice();
+}
+
+void TextForm::OnTextEnter(wxCommandEvent& event) {}
+void TextForm::OnToBusChoiceSelected(wxCommandEvent& event) {}
+void TextForm::OnTypeChoiceSelected(wxCommandEvent& event) {}
+void TextForm::ElementTypeChoice()
+{
+ m_choiceName->Clear();
+ wxArrayString arrayString;
+ switch(m_text->GetElementType()) {
+ case TYPE_BUS: {
+ for(int i = 0; i < (int)m_allElements.GetBusList().size(); i++) {
+ Bus* bus = m_allElements.GetBusList()[i];
+ arrayString.Add(bus->GetEletricalData().name);
+ }
+ } break;
+ case TYPE_SYNC_GENERATOR: {
+ for(int i = 0; i < (int)m_allElements.GetSyncGeneratorList().size(); i++) {
+ SyncGenerator* syncGenerator = m_allElements.GetSyncGeneratorList()[i];
+ arrayString.Add(syncGenerator->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_LINE: {
+ for(int i = 0; i < (int)m_allElements.GetLineList().size(); i++) {
+ Line* line = m_allElements.GetLineList()[i];
+ arrayString.Add(line->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_TRANSFORMER: {
+ for(int i = 0; i < (int)m_allElements.GetTransformerList().size(); i++) {
+ Transformer* transformer = m_allElements.GetTransformerList()[i];
+ arrayString.Add(transformer->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_LOAD: {
+ for(int i = 0; i < (int)m_allElements.GetLoadList().size(); i++) {
+ Load* load = m_allElements.GetLoadList()[i];
+ arrayString.Add(load->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_CAPACITOR: {
+ for(int i = 0; i < (int)m_allElements.GetCapacitorList().size(); i++) {
+ Capacitor* capacitor = m_allElements.GetCapacitorList()[i];
+ arrayString.Add(capacitor->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_INDUCTOR: {
+ for(int i = 0; i < (int)m_allElements.GetInductorList().size(); i++) {
+ Inductor* inductor = m_allElements.GetInductorList()[i];
+ arrayString.Add(inductor->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_SYNC_MOTOR: {
+ for(int i = 0; i < (int)m_allElements.GetSyncMotorList().size(); i++) {
+ SyncMotor* syncMotor = m_allElements.GetSyncMotorList()[i];
+ arrayString.Add(syncMotor->GetElectricalData().name);
+ }
+ } break;
+ case TYPE_IND_MOTOR: {
+ for(int i = 0; i < (int)m_allElements.GetIndMotorList().size(); i++) {
+ IndMotor* indMotor = m_allElements.GetIndMotorList()[i];
+ arrayString.Add(indMotor->GetElectricalData().name);
+ }
+ } break;
+
+ default:
+ break;
+ }
+ m_choiceName->Append(arrayString);
+ m_choiceName->Enable();
+}
+
+void TextForm::ElementNumberChoice()
+{
+ m_choiceTextType->Clear();
+ wxArrayString arrayString;
+ switch(m_text->GetElementType()) {
+ case TYPE_BUS: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Voltage"));
+ arrayString.Add(_("Angle"));
+ arrayString.Add(_("Fault current"));
+ arrayString.Add(_("Fault voltage"));
+ arrayString.Add(_("Short-circuit power"));
+ } break;
+ case TYPE_SYNC_GENERATOR: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
+ arrayString.Add(_("Fault current"));
+ } break;
+ case TYPE_LINE: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Active power flow"));
+ arrayString.Add(_("Reactive power flow"));
+ arrayString.Add(_("Losses"));
+ arrayString.Add(_("Current"));
+ arrayString.Add(_("Fault current"));
+ } break;
+ case TYPE_TRANSFORMER: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Active power flow"));
+ arrayString.Add(_("Reactive power flow"));
+ arrayString.Add(_("Losses"));
+ arrayString.Add(_("Current"));
+ arrayString.Add(_("Fault current"));
+ } break;
+ case TYPE_LOAD: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
+ } break;
+ case TYPE_CAPACITOR: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Reactive power"));
+ } break;
+ case TYPE_INDUCTOR: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Reactive power"));
+ } break;
+ case TYPE_SYNC_MOTOR: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
+ } break;
+ case TYPE_IND_MOTOR: {
+ arrayString.Add(_("Name"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
+ } break;
+
+ default:
+ break;
+ }
+ m_choiceTextType->Append(arrayString);
+ m_choiceTextType->Enable();
+}
+
+void TextForm::DataTypeChoice() {}
+void TextForm::FromChoice() {}
+void TextForm::ToChoice() {}
+void TextForm::UnitChoice() {}
diff --git a/Project/TextForm.h b/Project/TextForm.h
new file mode 100644
index 0000000..b33d02b
--- /dev/null
+++ b/Project/TextForm.h
@@ -0,0 +1,32 @@
+#ifndef TEXTFORM_H
+#define TEXTFORM_H
+#include "ElementForm.h"
+
+#include "Text.h"
+#include "ElectricCalculation.h"
+
+class TextForm : public TextFormBase
+{
+ public:
+ TextForm(wxWindow* parent, Text* text, std::vector<Element*> elementList);
+ virtual ~TextForm();
+ virtual void ElementTypeChoice();
+ virtual void ElementNumberChoice();
+ virtual void DataTypeChoice();
+ virtual void FromChoice();
+ virtual void ToChoice();
+ virtual void UnitChoice();
+
+ protected:
+ virtual void OnElementChoiceSelected(wxCommandEvent& event);
+ virtual void OnFromBusChoiceSelected(wxCommandEvent& event);
+ virtual void OnNameChoiceSelected(wxCommandEvent& event);
+ virtual void OnTextEnter(wxCommandEvent& event);
+ virtual void OnToBusChoiceSelected(wxCommandEvent& event);
+ virtual void OnTypeChoiceSelected(wxCommandEvent& event);
+
+ Text* m_text;
+ wxWindow* m_parent;
+ ElectricCalculation m_allElements;
+};
+#endif // TEXTFORM_H
diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp
index 1a91bb0..7ada5e5 100644
--- a/Project/Workspace.cpp
+++ b/Project/Workspace.cpp
@@ -156,7 +156,7 @@ void Workspace::OnLeftClickDown(wxMouseEvent& event)
bool foundElement = false;
if(m_mode == MODE_INSERT_TEXT) {
m_mode = MODE_EDIT;
- } else if(m_mode == MODE_INSERT || m_mode == MODE_DRAG_INSERT) {
+ } else if(m_mode == MODE_INSERT || m_mode == MODE_DRAG_INSERT || m_mode == MODE_DRAG_INSERT_TEXT) {
// Get the last element inserted on the list.
Element* newElement = *(m_elementList.end() - 1);
for(auto it = m_elementList.begin(); it != m_elementList.end(); ++it) {
@@ -300,6 +300,14 @@ void Workspace::OnLeftDoubleClick(wxMouseEvent& event)
element->SetOnline(element->IsOnline() ? false : true);
}
}
+
+ //Text element
+ for(auto it = m_textList.begin(); it != m_textList.end(); ++it) {
+ Text* text = *it;
+ if(text->Contains(m_camera->ScreenToWorld(event.GetPosition()))) {
+ text->ShowForm(this, m_elementList);
+ }
+ }
}
void Workspace::OnRightClickDown(wxMouseEvent& event)
@@ -459,7 +467,8 @@ void Workspace::OnMouseMotion(wxMouseEvent& event)
} break;
case MODE_DRAG:
- case MODE_DRAG_INSERT: {
+ case MODE_DRAG_INSERT:
+ case MODE_DRAG_INSERT_TEXT: {
m_camera->SetTranslation(event.GetPosition());
redraw = true;
} break;
@@ -572,24 +581,32 @@ void Workspace::OnMouseMotion(wxMouseEvent& event)
void Workspace::OnMiddleDown(wxMouseEvent& event)
{
// Set to drag mode.
- if(m_mode != MODE_INSERT && m_mode != MODE_DRAG_INSERT) {
+ if(m_mode != MODE_INSERT && m_mode != MODE_INSERT_TEXT && m_mode != MODE_DRAG_INSERT &&
+ m_mode != MODE_DRAG_INSERT_TEXT) {
m_mode = MODE_DRAG;
+ } else if(m_mode == MODE_INSERT_TEXT) {
+ m_mode = MODE_DRAG_INSERT_TEXT;
} else {
m_mode = MODE_DRAG_INSERT;
}
m_camera->StartTranslation(m_camera->ScreenToWorld(event.GetPosition()));
UpdateStatusBar();
}
+
void Workspace::OnMiddleUp(wxMouseEvent& event)
{
- if(m_mode != MODE_INSERT && m_mode != MODE_DRAG_INSERT) {
+ if(m_mode != MODE_INSERT && m_mode != MODE_INSERT_TEXT && m_mode != MODE_DRAG_INSERT &&
+ m_mode != MODE_DRAG_INSERT_TEXT) {
// Set to edit mode back.
m_mode = MODE_EDIT;
+ } else if(m_mode == MODE_DRAG_INSERT_TEXT) {
+ m_mode = MODE_INSERT_TEXT;
} else if(m_mode == MODE_DRAG_INSERT) {
m_mode = MODE_INSERT;
}
UpdateStatusBar();
}
+
void Workspace::OnScroll(wxMouseEvent& event)
{
if(event.GetWheelRotation() > 0)
@@ -603,6 +620,9 @@ void Workspace::OnScroll(wxMouseEvent& event)
void Workspace::OnKeyDown(wxKeyEvent& event)
{
+ bool insertingElement = false;
+ if(m_mode == MODE_INSERT || m_mode == MODE_INSERT_TEXT) insertingElement = true;
+
char key = event.GetUnicodeKey();
if(key != WXK_NONE) {
switch(key) {
@@ -612,8 +632,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
m_elementList.pop_back(); // Removes the last element being inserted.
m_mode = MODE_EDIT;
Redraw();
- }
- else if(m_mode == MODE_INSERT_TEXT) {
+ } else if(m_mode == MODE_INSERT_TEXT) {
m_textList.pop_back();
m_mode = MODE_EDIT;
Redraw();
@@ -624,11 +643,13 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
DeleteSelectedElements();
} break;
case 'A': {
- Text* newBus = new Text(m_camera->ScreenToWorld(event.GetPosition()));
- m_textList.push_back(newBus);
- m_mode = MODE_INSERT_TEXT;
- m_statusBar->SetStatusText(_("Insert Text: Click to insert, ESC to cancel."));
- Redraw();
+ if(!insertingElement) {
+ Text* newBus = new Text(m_camera->ScreenToWorld(event.GetPosition()));
+ m_textList.push_back(newBus);
+ m_mode = MODE_INSERT_TEXT;
+ m_statusBar->SetStatusText(_("Insert Text: Click to insert, ESC to cancel."));
+ Redraw();
+ }
}
case 'F': {
if(event.GetModifiers() == wxMOD_SHIFT) {
@@ -641,7 +662,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
} break;
case 'B': // Insert a bus.
{
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
Bus* newBus = new Bus(m_camera->ScreenToWorld(event.GetPosition()),
wxString::Format(_("Bus %d"), GetElementNumber(ID_BUS)));
IncrementElementNumber(ID_BUS);
@@ -652,7 +673,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
}
} break;
case 'L': {
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
if(event.GetModifiers() == wxMOD_SHIFT) { // Insert a load.
Load* newLoad = new Load(wxString::Format(_("Load %d"), GetElementNumber(ID_LOAD)));
IncrementElementNumber(ID_LOAD);
@@ -671,7 +692,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
} break;
case 'T': // Insert a transformer.
{
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
Transformer* newTransformer =
new Transformer(wxString::Format(_("Transformer %d"), GetElementNumber(ID_TRANSFORMER)));
IncrementElementNumber(ID_TRANSFORMER);
@@ -683,7 +704,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
} break;
case 'G': // Insert a generator.
{
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
SyncGenerator* newGenerator =
new SyncGenerator(wxString::Format(_("Generator %d"), GetElementNumber(ID_SYNCGENERATOR)));
IncrementElementNumber(ID_SYNCGENERATOR);
@@ -694,7 +715,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
}
} break;
case 'I': {
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
if(event.GetModifiers() == wxMOD_SHIFT) { // Insert an inductor.
Inductor* newInductor =
new Inductor(wxString::Format(_("Inductor %d"), GetElementNumber(ID_INDUCTOR)));
@@ -716,7 +737,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
} break;
case 'K': // Insert a synchronous condenser.
{
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
SyncMotor* newSyncCondenser =
new SyncMotor(wxString::Format(_("Synchronous condenser %d"), GetElementNumber(ID_SYNCMOTOR)));
IncrementElementNumber(ID_SYNCMOTOR);
@@ -727,7 +748,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
}
} break;
case 'C': {
- if(m_mode != MODE_INSERT) {
+ if(!insertingElement) {
if(event.GetModifiers() == wxMOD_SHIFT) { // Insert a capacitor.
Capacitor* newCapacitor =
new Capacitor(wxString::Format(_("Capacitor %d"), GetElementNumber(ID_CAPACITOR)));
@@ -757,7 +778,8 @@ void Workspace::UpdateStatusBar()
case MODE_INSERT:
case MODE_INSERT_TEXT:
- case MODE_DRAG_INSERT: {
+ case MODE_DRAG_INSERT:
+ case MODE_DRAG_INSERT_TEXT: {
m_statusBar->SetStatusText(_("MODE: INSERT"), 1);
} break;
@@ -872,8 +894,8 @@ void Workspace::RotateSelectedElements(bool clockwise)
element->StartMove(m_camera->GetMousePosition());
}
}
-
- //Rotate text element
+
+ // Rotate text element
for(auto it = m_textList.begin(); it != m_textList.end(); it++) {
Text* text = *it;
if(text->IsSelected()) {
diff --git a/Project/Workspace.h b/Project/Workspace.h
index 93ea070..b4d1e54 100644
--- a/Project/Workspace.h
+++ b/Project/Workspace.h
@@ -34,6 +34,7 @@ enum WorkspaceMode
MODE_MOVE_NODE,
MODE_DRAG,
MODE_DRAG_INSERT,
+ MODE_DRAG_INSERT_TEXT,
MODE_INSERT,
MODE_INSERT_TEXT,
MODE_SELECTION_RECT