diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Project/AboutForm.h | 2 | ||||
| -rw-r--r-- | Project/BusForm.h | 2 | ||||
| -rw-r--r-- | Project/ChartView.cpp | 1 | ||||
| -rw-r--r-- | Project/ChartView.h | 2 | ||||
| -rw-r--r-- | Project/ChartView.wxcp | 2 | ||||
| -rw-r--r-- | Project/ChartViewBase.cpp (renamed from Project/base/ChartViewBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/ChartViewBase.h (renamed from Project/base/ChartViewBase.h) | 0 | ||||
| -rw-r--r-- | Project/ChartViewBitmaps.cpp (renamed from Project/base/ChartViewBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/ConnectionLine.cpp | 16 | ||||
| -rw-r--r-- | Project/ConnectionLine.h | 1 | ||||
| -rw-r--r-- | Project/ConstantForm.h | 2 | ||||
| -rw-r--r-- | Project/ControlEditor.h | 2 | ||||
| -rw-r--r-- | Project/ControlEditor.wxcp | 2 | ||||
| -rw-r--r-- | Project/ControlEditorBase.cpp (renamed from Project/base/ControlEditorBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/ControlEditorBase.h (renamed from Project/base/ControlEditorBase.h) | 0 | ||||
| -rw-r--r-- | Project/ControlEditorBitmaps.cpp (renamed from Project/base/ControlEditorBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/ControlSystemTest.h | 2 | ||||
| -rw-r--r-- | Project/DataReport.cpp | 60 | ||||
| -rw-r--r-- | Project/DataReport.h | 10 | ||||
| -rw-r--r-- | Project/DataReport.wxcp | 51 | ||||
| -rw-r--r-- | Project/DataReportBase.cpp (renamed from Project/base/DataReportBase.cpp) | 14 | ||||
| -rw-r--r-- | Project/DataReportBase.h (renamed from Project/base/DataReportBase.h) | 7 | ||||
| -rw-r--r-- | Project/DataReportBitmaps.cpp (renamed from Project/base/DataReportBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/ElementForm.wxcp | 2 | ||||
| -rw-r--r-- | Project/ElementFormBase.cpp (renamed from Project/base/ElementFormBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/ElementFormBase.h (renamed from Project/base/ElementFormBase.h) | 0 | ||||
| -rw-r--r-- | Project/ElementFormBitmaps.cpp (renamed from Project/base/ElementFormBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/ExponentialForm.h | 2 | ||||
| -rw-r--r-- | Project/FileHanding.cpp | 3 | ||||
| -rw-r--r-- | Project/GainForm.h | 2 | ||||
| -rw-r--r-- | Project/GeneralPropertiesForm.h | 2 | ||||
| -rw-r--r-- | Project/GeneratorStabForm.h | 2 | ||||
| -rw-r--r-- | Project/IOControlForm.h | 2 | ||||
| -rw-r--r-- | Project/ImportForm.cpp | 1042 | ||||
| -rw-r--r-- | Project/ImportForm.h | 210 | ||||
| -rw-r--r-- | Project/IndMotorForm.h | 2 | ||||
| -rw-r--r-- | Project/LimiterForm.h | 2 | ||||
| -rw-r--r-- | Project/LineForm.h | 2 | ||||
| -rw-r--r-- | Project/LoadForm.h | 2 | ||||
| -rw-r--r-- | Project/MainFrame.cpp | 96 | ||||
| -rw-r--r-- | Project/MainFrame.h | 6 | ||||
| -rw-r--r-- | Project/MainFrame.wxcp | 95 | ||||
| -rw-r--r-- | Project/MainFrameBase.cpp (renamed from Project/base/MainFrameBase.cpp) | 4 | ||||
| -rw-r--r-- | Project/MainFrameBase.h (renamed from Project/base/MainFrameBase.h) | 58 | ||||
| -rw-r--r-- | Project/MainFrameBitmaps.cpp (renamed from Project/base/MainFrameBitmaps.cpp) | 349 | ||||
| -rw-r--r-- | Project/MainFrameBitmaps.xrc | 1 | ||||
| -rw-r--r-- | Project/MathExpression.cpp | 5 | ||||
| -rw-r--r-- | Project/MathExpressionForm.h | 2 | ||||
| -rw-r--r-- | Project/PowerFlow.cpp | 6 | ||||
| -rw-r--r-- | Project/Project.mk | 856 | ||||
| -rw-r--r-- | Project/Project.project | 44 | ||||
| -rw-r--r-- | Project/Project.txt | 2 | ||||
| -rw-r--r-- | Project/PropertiesData.h | 1 | ||||
| -rw-r--r-- | Project/PropertiesForm.wxcp | 1464 | ||||
| -rw-r--r-- | Project/PropertiesFormBase.cpp (renamed from Project/base/PropertiesFormBase.cpp) | 152 | ||||
| -rw-r--r-- | Project/PropertiesFormBase.h (renamed from Project/base/PropertiesFormBase.h) | 41 | ||||
| -rw-r--r-- | Project/PropertiesFormBitmaps.cpp (renamed from Project/base/PropertiesFormBitmaps.cpp) | 4 | ||||
| -rw-r--r-- | Project/RateLimiterForm.h | 2 | ||||
| -rw-r--r-- | Project/ReactiveShuntElementForm.h | 2 | ||||
| -rw-r--r-- | Project/SimulationsSettingsForm.cpp | 3 | ||||
| -rw-r--r-- | Project/SimulationsSettingsForm.h | 2 | ||||
| -rw-r--r-- | Project/Sum.cpp | 5 | ||||
| -rw-r--r-- | Project/SumForm.h | 2 | ||||
| -rw-r--r-- | Project/SwitchingForm.h | 2 | ||||
| -rw-r--r-- | Project/SyncMachineForm.h | 2 | ||||
| -rw-r--r-- | Project/TextForm.h | 2 | ||||
| -rw-r--r-- | Project/TransferFunctionForm.h | 2 | ||||
| -rw-r--r-- | Project/TransformerForm.h | 2 | ||||
| -rw-r--r-- | Project/Workspace.cpp | 102 | ||||
| -rw-r--r-- | Project/Workspace.h | 2 | ||||
| -rw-r--r-- | Project/Workspace.wxcp | 2 | ||||
| -rw-r--r-- | Project/WorkspaceBase.cpp (renamed from Project/base/WorkspaceBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/WorkspaceBase.h (renamed from Project/base/WorkspaceBase.h) | 0 | ||||
| -rw-r--r-- | Project/WorkspaceBitmaps.cpp (renamed from Project/base/WorkspaceBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/data/lang/pt_BR/pt_BR.mo | bin | 48756 -> 49821 bytes | |||
| -rw-r--r-- | Project/data/lang/pt_BR/pt_BR.po | 2748 |
78 files changed, 4922 insertions, 2608 deletions
@@ -50,5 +50,6 @@ Thumbs.db *.xrc #*.workspace #*.project -#Project/Project.mk -#Project/Project.txt +Project/Project.mk +Project/Project.txt +Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 8d41f83..0000000 --- a/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -.PHONY: clean All - -All: - @echo "----------Building project:[ Project - Release_Windows_x64 ]----------" - @cd "Project" && "$(MAKE)" -f "Project.mk" -clean: - @echo "----------Cleaning project:[ Project - Release_Windows_x64 ]----------" - @cd "Project" && "$(MAKE)" -f "Project.mk" clean diff --git a/Project/AboutForm.h b/Project/AboutForm.h index 0ab9d9b..945402c 100644 --- a/Project/AboutForm.h +++ b/Project/AboutForm.h @@ -17,7 +17,7 @@ #ifndef ABOUTFORM_H #define ABOUTFORM_H -#include "base/PropertiesFormBase.h" +#include "PropertiesFormBase.h" #include <wx/textfile.h> #include <wx/stdpaths.h> diff --git a/Project/BusForm.h b/Project/BusForm.h index 14509d1..5dff2c7 100644 --- a/Project/BusForm.h +++ b/Project/BusForm.h @@ -18,7 +18,7 @@ #ifndef BUSFORM_H #define BUSFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Bus; /** diff --git a/Project/ChartView.cpp b/Project/ChartView.cpp index f1fd600..03b57b9 100644 --- a/Project/ChartView.cpp +++ b/Project/ChartView.cpp @@ -390,6 +390,7 @@ void ChartView::OnTreeItemSelectionChanged(wxTreeEvent& event) void ChartView::BuildColourList() { + m_colourList.push_back(wxColour(60, 60, 60)); m_colourList.push_back(wxColour(255, 0, 0)); m_colourList.push_back(wxColour(0, 0, 255)); m_colourList.push_back(wxColour(0, 255, 0)); diff --git a/Project/ChartView.h b/Project/ChartView.h index b5d1766..82bb621 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -17,7 +17,7 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include "base/ChartViewBase.h" +#include "ChartViewBase.h" #include "wxMathPlot/mathplot.h" #include <wx/msgdlg.h> diff --git a/Project/ChartView.wxcp b/Project/ChartView.wxcp index 0bc8535..db8c3a2 100644 --- a/Project/ChartView.wxcp +++ b/Project/ChartView.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": "base/", + "m_generatedFilesDir": ".", "m_objCounter": 82, "m_includeFiles": [], "m_bitmapFunction": "wxCE3EBInitBitmapResources", diff --git a/Project/base/ChartViewBase.cpp b/Project/ChartViewBase.cpp index 42e9beb..42e9beb 100644 --- a/Project/base/ChartViewBase.cpp +++ b/Project/ChartViewBase.cpp diff --git a/Project/base/ChartViewBase.h b/Project/ChartViewBase.h index 5801081..5801081 100644 --- a/Project/base/ChartViewBase.h +++ b/Project/ChartViewBase.h diff --git a/Project/base/ChartViewBitmaps.cpp b/Project/ChartViewBitmaps.cpp index ef6907a..ef6907a 100644 --- a/Project/base/ChartViewBitmaps.cpp +++ b/Project/ChartViewBitmaps.cpp diff --git a/Project/ConnectionLine.cpp b/Project/ConnectionLine.cpp index 672c6e8..80752da 100644 --- a/Project/ConnectionLine.cpp +++ b/Project/ConnectionLine.cpp @@ -22,9 +22,7 @@ ConnectionLine::ConnectionLine(Node* firstNode, int id) : ControlElement(id) { wxPoint2DDouble pt = firstNode->GetPosition(); m_tmpSndPt = pt; - for(int i = 0; i < 6; i++) { - m_pointList.push_back(pt); - } + for(int i = 0; i < 6; i++) { m_pointList.push_back(pt); } m_nodeList.push_back(firstNode); firstNode->SetConnected(); } @@ -52,9 +50,7 @@ void ConnectionLine::Draw(wxPoint2DDouble translation, double scale) const bool ConnectionLine::Contains(wxPoint2DDouble position) const { - if(PointToLineDistance(position) < 5.0) { - return true; - } + if(PointToLineDistance(position) < 5.0) { return true; } return false; } @@ -202,3 +198,11 @@ Element* ConnectionLine::GetCopy() *copy = *this; return copy; } + +bool ConnectionLine::Initialize() +{ + m_solved = false; + m_output = 0.0; + m_value = 0.0; + return true; +} diff --git a/Project/ConnectionLine.h b/Project/ConnectionLine.h index 768ef9f..92154d2 100644 --- a/Project/ConnectionLine.h +++ b/Project/ConnectionLine.h @@ -43,6 +43,7 @@ class ConnectionLine : public ControlElement virtual void Move(wxPoint2DDouble position); virtual bool AppendNode(Node* node, ControlElement* parent); virtual void UpdatePoints(); + virtual bool Initialize(); virtual void SetTemporarySecondPoint(wxPoint2DDouble point) { m_tmpSndPt = point; } virtual wxPoint2DDouble GetMidPoint() const; virtual double GetOffset() const { return m_lineOffset; } diff --git a/Project/ConstantForm.h b/Project/ConstantForm.h index 9f6be38..245f67a 100644 --- a/Project/ConstantForm.h +++ b/Project/ConstantForm.h @@ -17,7 +17,7 @@ #ifndef CONSTANTFORM_H #define CONSTANTFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Constant; diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index f799ca5..f77f350 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -18,7 +18,7 @@ #ifndef CONTROLEDITOR_H #define CONTROLEDITOR_H -#include "base/ControlEditorBase.h" +#include "ControlEditorBase.h" #include <wx/wrapsizer.h> #include <wx/dcclient.h> #include <wx/dcscreen.h> diff --git a/Project/ControlEditor.wxcp b/Project/ControlEditor.wxcp index 5b811cc..d83f53c 100644 --- a/Project/ControlEditor.wxcp +++ b/Project/ControlEditor.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": "base/", + "m_generatedFilesDir": ".", "m_objCounter": 423, "m_includeFiles": [], "m_bitmapFunction": "wxC870InitBitmapResources", diff --git a/Project/base/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index cf391b7..cf391b7 100644 --- a/Project/base/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp diff --git a/Project/base/ControlEditorBase.h b/Project/ControlEditorBase.h index 6580e73..6580e73 100644 --- a/Project/base/ControlEditorBase.h +++ b/Project/ControlEditorBase.h diff --git a/Project/base/ControlEditorBitmaps.cpp b/Project/ControlEditorBitmaps.cpp index b7212e1..b7212e1 100644 --- a/Project/base/ControlEditorBitmaps.cpp +++ b/Project/ControlEditorBitmaps.cpp diff --git a/Project/ControlSystemTest.h b/Project/ControlSystemTest.h index 2537517..e82caac 100644 --- a/Project/ControlSystemTest.h +++ b/Project/ControlSystemTest.h @@ -18,7 +18,7 @@ #ifndef CONTROLSYSTEMTEST_H #define CONTROLSYSTEMTEST_H -#include "base/ControlEditorBase.h" +#include "ControlEditorBase.h" class ControlEditor; diff --git a/Project/DataReport.cpp b/Project/DataReport.cpp index 1db2e2a..2742471 100644 --- a/Project/DataReport.cpp +++ b/Project/DataReport.cpp @@ -16,8 +16,8 @@ */ #include "DataReport.h" -#include "Workspace.h" #include "ElectricCalculation.h" +#include "Workspace.h" DataReport::DataReport(wxWindow* parent, Workspace* workspace) : DataReportBase(parent) { @@ -386,9 +386,7 @@ void DataReport::FillValues(GridSelection gridToFill) textColour = m_offlineColour; } for(int i = 0; i < 2; ++i) { - for(int j = 0; j < 7; ++j) { - m_gridPowerFlow->SetCellTextColour(rowNumber + i, j, textColour); - } + for(int j = 0; j < 7; ++j) { m_gridPowerFlow->SetCellTextColour(rowNumber + i, j, textColour); } } m_gridPowerFlow->SetCellValue(rowNumber, 9, isOnline); @@ -435,9 +433,7 @@ void DataReport::FillValues(GridSelection gridToFill) textColour = m_offlineColour; } for(int i = 0; i < 2; ++i) { - for(int j = 0; j < 7; ++j) { - m_gridPowerFlow->SetCellTextColour(rowNumber + i, j, textColour); - } + for(int j = 0; j < 7; ++j) { m_gridPowerFlow->SetCellTextColour(rowNumber + i, j, textColour); } } m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Transformer")); @@ -542,9 +538,7 @@ void DataReport::FillValues(GridSelection gridToFill) isOnline = _("No"); textColour = m_offlineColour; } - for(int j = 0; j < 10; ++j) { - m_gridPFBranches->SetCellTextColour(rowNumber, j, textColour); - } + for(int j = 0; j < 10; ++j) { m_gridPFBranches->SetCellTextColour(rowNumber, j, textColour); } m_gridPFBranches->SetCellValue(rowNumber, 0, _("Line")); m_gridPFBranches->SetCellValue(rowNumber, 1, data.name); @@ -593,9 +587,7 @@ void DataReport::FillValues(GridSelection gridToFill) isOnline = _("No"); textColour = m_offlineColour; } - for(int j = 0; j < 10; ++j) { - m_gridPFBranches->SetCellTextColour(rowNumber, j, textColour); - } + for(int j = 0; j < 10; ++j) { m_gridPFBranches->SetCellTextColour(rowNumber, j, textColour); } m_gridPFBranches->SetCellValue(rowNumber, 0, _("Transformer")); m_gridPFBranches->SetCellValue(rowNumber, 1, data.name); @@ -742,9 +734,7 @@ void DataReport::FillValues(GridSelection gridToFill) textColour = m_offlineColour; } for(int i = 0; i < 2; ++i) { - for(int j = 0; j < 11; ++j) { - m_gridFaultBranches->SetCellTextColour(rowNumber + i, j, textColour); - } + for(int j = 0; j < 11; ++j) { m_gridFaultBranches->SetCellTextColour(rowNumber + i, j, textColour); } } m_gridFaultBranches->SetCellValue(rowNumber, 0, _("Line")); @@ -846,9 +836,7 @@ void DataReport::FillValues(GridSelection gridToFill) textColour = m_offlineColour; } for(int i = 0; i < 2; ++i) { - for(int j = 0; j < 11; ++j) { - m_gridFaultBranches->SetCellTextColour(rowNumber + i, j, textColour); - } + for(int j = 0; j < 11; ++j) { m_gridFaultBranches->SetCellTextColour(rowNumber + i, j, textColour); } } m_gridFaultBranches->SetCellValue(rowNumber, 0, _("Transformer")); @@ -1018,3 +1006,37 @@ void DataReport::OnPowerFlowGridChanged(wxGridEvent& event) { if(!m_changingValues) FillValues(GRID_PF); } + +void DataReport::GridKeyHandler(wxGrid* grid, wxKeyEvent& event) +{ + if(event.GetKeyCode() == 'C' && event.GetModifiers() == wxMOD_CONTROL) { // Copy selection + // [Ref.] https://forums.wxwidgets.org/viewtopic.php?t=2200 + wxString copyData = ""; + bool lineNotEmpty; + + for(int i = 0; i < grid->GetNumberRows(); i++) { + lineNotEmpty = false; + for(int j = 0; j < grid->GetNumberCols(); j++) { + if(grid->IsInSelection(i, j)) { + if(lineNotEmpty == false) { + if(copyData.IsEmpty() == false) { + copyData.Append(wxT("\r\n")); // In Windows if copy to notepad need \r\n to new line. + } + lineNotEmpty = true; + } else { + copyData.Append(wxT("\t")); + } + copyData = copyData + grid->GetCellValue(i, j); + } + } + } + + wxOpenClipboard(); + wxEmptyClipboard(); + wxSetClipboardData(wxDF_TEXT, copyData.mb_str(), 0, 0); // In Windows need this for UNICODE + wxCloseClipboard(); + } else if(event.GetKeyCode() == 'A' && event.GetModifiers() == wxMOD_CONTROL) { // Select all + grid->SelectAll(); + } + event.Skip(); +} diff --git a/Project/DataReport.h b/Project/DataReport.h index 8f35a1b..e78d4cd 100644 --- a/Project/DataReport.h +++ b/Project/DataReport.h @@ -18,7 +18,7 @@ #ifndef DATAREPORT_H #define DATAREPORT_H -#include "base/DataReportBase.h" +#include "DataReportBase.h" class Workspace; class ElectricCalculation; @@ -51,6 +51,7 @@ class DataReport : public DataReportBase virtual void CreateGrids(); virtual void FillValues(GridSelection gridToFill = GRID_ALL); virtual void SetRowsColours(wxGrid* grid, int rowStart = 1); + virtual void GridKeyHandler(wxGrid* grid, wxKeyEvent& event); protected: virtual void OnFaulrGridChanged(wxGridEvent& event); @@ -60,6 +61,13 @@ class DataReport : public DataReportBase virtual void OnPFBranchesGridChanged(wxGridEvent& event); virtual void OnPowerFlowGridChanged(wxGridEvent& event); virtual void OnPFBusGridChanged(wxGridEvent& event); + virtual void OnGridFaultBranchesKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridFaultBranches, event); } + virtual void OnGridFaultBusesKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridFaultBuses, event); } + virtual void OnGridFaultGeneratorsKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridFaultGenerators, event); } + virtual void OnGridFaultKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridFault, event); } + virtual void OnGridPFBranchesKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridPFBranches, event); } + virtual void OnGridPFBusesKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridPFBuses, event); } + virtual void OnGridPFKeyDown(wxKeyEvent& event) { GridKeyHandler(m_gridPowerFlow, event); } Workspace* m_workspace = NULL; bool m_changingValues = false; diff --git a/Project/DataReport.wxcp b/Project/DataReport.wxcp index 3dc0a87..4c18d3c 100644 --- a/Project/DataReport.wxcp +++ b/Project/DataReport.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": "base/", + "m_generatedFilesDir": ".", "m_objCounter": 85, "m_includeFiles": [], "m_bitmapFunction": "wxC6A63InitBitmapResources", @@ -645,6 +645,13 @@ "m_functionNameAndSignature": "OnPowerFlowGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridPFKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] @@ -870,6 +877,13 @@ "m_functionNameAndSignature": "OnPFBusGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridPFBusesKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] @@ -1095,6 +1109,13 @@ "m_functionNameAndSignature": "OnPFBranchesGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridPFBranchesKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] @@ -1498,6 +1519,13 @@ "m_functionNameAndSignature": "OnFaulrGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridFaultKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] @@ -1723,6 +1751,13 @@ "m_functionNameAndSignature": "OnFaultBusesGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridFaultBusesKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] @@ -1948,6 +1983,13 @@ "m_functionNameAndSignature": "OnFaultBranchesGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridFaultBranchesKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] @@ -2173,6 +2215,13 @@ "m_functionNameAndSignature": "OnFaultGeneratorsGridChanged(wxGridEvent& event)", "m_description": "The user changed the data in a cell. The old cell value as string is available from GetString() event object method. Notice that vetoing this event still works for backwards compatibility reasons but any new code should only veto EVT_GRID_CELL_CHANGING event and not this one. Processes a wxEVT_GRID_CELL_CHANGED event type.", "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnGridFaultGeneratorsKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false }], "m_children": [] }] diff --git a/Project/base/DataReportBase.cpp b/Project/DataReportBase.cpp index 0e14d38..33bea44 100644 --- a/Project/base/DataReportBase.cpp +++ b/Project/DataReportBase.cpp @@ -255,23 +255,37 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString& #endif // Connect events m_gridPowerFlow->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnPowerFlowGridChanged), NULL, this); + m_gridPowerFlow->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridPFKeyDown), NULL, this); m_gridPFBuses->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnPFBusGridChanged), NULL, this); + m_gridPFBuses->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridPFBusesKeyDown), NULL, this); m_gridPFBranches->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnPFBranchesGridChanged), NULL, this); + m_gridPFBranches->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridPFBranchesKeyDown), NULL, this); m_gridFault->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaulrGridChanged), NULL, this); + m_gridFault->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultKeyDown), NULL, this); m_gridFaultBuses->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaultBusesGridChanged), NULL, this); + m_gridFaultBuses->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultBusesKeyDown), NULL, this); m_gridFaultBranches->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaultBranchesGridChanged), NULL, this); + m_gridFaultBranches->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultBranchesKeyDown), NULL, this); m_gridFaultGenerators->Connect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaultGeneratorsGridChanged), NULL, this); + m_gridFaultGenerators->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultGeneratorsKeyDown), NULL, this); } DataReportBase::~DataReportBase() { m_gridPowerFlow->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnPowerFlowGridChanged), NULL, this); + m_gridPowerFlow->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridPFKeyDown), NULL, this); m_gridPFBuses->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnPFBusGridChanged), NULL, this); + m_gridPFBuses->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridPFBusesKeyDown), NULL, this); m_gridPFBranches->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnPFBranchesGridChanged), NULL, this); + m_gridPFBranches->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridPFBranchesKeyDown), NULL, this); m_gridFault->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaulrGridChanged), NULL, this); + m_gridFault->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultKeyDown), NULL, this); m_gridFaultBuses->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaultBusesGridChanged), NULL, this); + m_gridFaultBuses->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultBusesKeyDown), NULL, this); m_gridFaultBranches->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaultBranchesGridChanged), NULL, this); + m_gridFaultBranches->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultBranchesKeyDown), NULL, this); m_gridFaultGenerators->Disconnect(wxEVT_GRID_CELL_CHANGED, wxGridEventHandler(DataReportBase::OnFaultGeneratorsGridChanged), NULL, this); + m_gridFaultGenerators->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(DataReportBase::OnGridFaultGeneratorsKeyDown), NULL, this); } diff --git a/Project/base/DataReportBase.h b/Project/DataReportBase.h index 3e6784c..a9fba20 100644 --- a/Project/base/DataReportBase.h +++ b/Project/DataReportBase.h @@ -60,12 +60,19 @@ protected: protected: virtual void OnPowerFlowGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridPFKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnPFBusGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridPFBusesKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnPFBranchesGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridPFBranchesKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnFaulrGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridFaultKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnFaultBusesGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridFaultBusesKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnFaultBranchesGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridFaultBranchesKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnFaultGeneratorsGridChanged(wxGridEvent& event) { event.Skip(); } + virtual void OnGridFaultGeneratorsKeyDown(wxKeyEvent& event) { event.Skip(); } public: wxGrid* GetGridPowerFlow() { return m_gridPowerFlow; } diff --git a/Project/base/DataReportBitmaps.cpp b/Project/DataReportBitmaps.cpp index 5d547ad..5d547ad 100644 --- a/Project/base/DataReportBitmaps.cpp +++ b/Project/DataReportBitmaps.cpp diff --git a/Project/ElementForm.wxcp b/Project/ElementForm.wxcp index a756e62..73f64ef 100644 --- a/Project/ElementForm.wxcp +++ b/Project/ElementForm.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": "base/", + "m_generatedFilesDir": ".", "m_objCounter": 1975, "m_includeFiles": [], "m_bitmapFunction": "wxC9EE9InitBitmapResources", diff --git a/Project/base/ElementFormBase.cpp b/Project/ElementFormBase.cpp index a42c34d..a42c34d 100644 --- a/Project/base/ElementFormBase.cpp +++ b/Project/ElementFormBase.cpp diff --git a/Project/base/ElementFormBase.h b/Project/ElementFormBase.h index 0c1ac13..0c1ac13 100644 --- a/Project/base/ElementFormBase.h +++ b/Project/ElementFormBase.h diff --git a/Project/base/ElementFormBitmaps.cpp b/Project/ElementFormBitmaps.cpp index b955c05..b955c05 100644 --- a/Project/base/ElementFormBitmaps.cpp +++ b/Project/ElementFormBitmaps.cpp diff --git a/Project/ExponentialForm.h b/Project/ExponentialForm.h index f911759..516156f 100644 --- a/Project/ExponentialForm.h +++ b/Project/ExponentialForm.h @@ -17,7 +17,7 @@ #ifndef EXPONENTIALFORM_H #define EXPONENTIALFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Exponential; diff --git a/Project/FileHanding.cpp b/Project/FileHanding.cpp index 7262c57..91ddcfe 100644 --- a/Project/FileHanding.cpp +++ b/Project/FileHanding.cpp @@ -70,6 +70,8 @@ void FileHanding::SaveProject(wxFileName path) XMLParser::SetNodeValue(doc, pfTolerance, simulationData.powerFlowTolerance); auto pfMaxIter = XMLParser::AppendNode(doc, powerFlowPropNode, "MaxIterations"); XMLParser::SetNodeValue(doc, pfMaxIter, simulationData.powerFlowMaxIterations); + auto pfSlackAngle = XMLParser::AppendNode(doc, powerFlowPropNode, "SlackAngle"); + XMLParser::SetNodeValue(doc, pfSlackAngle, simulationData.initAngle); auto stabilityPropNode = XMLParser::AppendNode(doc, simulationPropNode, "Stability"); auto timeStep = XMLParser::AppendNode(doc, stabilityPropNode, "TimeStep"); @@ -284,6 +286,7 @@ bool FileHanding::OpenProject(wxFileName path) simData.accFator = XMLParser::GetNodeValueDouble(powerFlow, "AccFactor"); simData.powerFlowTolerance = XMLParser::GetNodeValueDouble(powerFlow, "Tolerance"); simData.powerFlowMaxIterations = XMLParser::GetNodeValueInt(powerFlow, "MaxIterations"); + simData.initAngle = XMLParser::GetNodeValueDouble(powerFlow, "SlackAngle"); // Stability auto stability = simPropertiesNode->first_node("Stability"); diff --git a/Project/GainForm.h b/Project/GainForm.h index fdab652..3d1ab5d 100644 --- a/Project/GainForm.h +++ b/Project/GainForm.h @@ -17,7 +17,7 @@ #ifndef GAINFORM_H #define GAINFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Gain; diff --git a/Project/GeneralPropertiesForm.h b/Project/GeneralPropertiesForm.h index dae4dc9..2f5c70b 100644 --- a/Project/GeneralPropertiesForm.h +++ b/Project/GeneralPropertiesForm.h @@ -18,7 +18,7 @@ #ifndef GENERALPROPERTIESFORM_H #define GENERALPROPERTIESFORM_H -#include "base/PropertiesFormBase.h" +#include "PropertiesFormBase.h" #include <wx/textfile.h> #include <wx/msgdlg.h> diff --git a/Project/GeneratorStabForm.h b/Project/GeneratorStabForm.h index 57d9a5c..14bcd11 100644 --- a/Project/GeneratorStabForm.h +++ b/Project/GeneratorStabForm.h @@ -18,7 +18,7 @@ #ifndef GENERATORSTABFORM_H #define GENERATORSTABFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class SwitchingForm; class SyncGenerator; diff --git a/Project/IOControlForm.h b/Project/IOControlForm.h index 161e793..f9489c4 100644 --- a/Project/IOControlForm.h +++ b/Project/IOControlForm.h @@ -18,7 +18,7 @@ #ifndef IOCONTROLFORM_H #define IOCONTROLFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" #include "IOControl.h" /** diff --git a/Project/ImportForm.cpp b/Project/ImportForm.cpp new file mode 100644 index 0000000..9a8dc96 --- /dev/null +++ b/Project/ImportForm.cpp @@ -0,0 +1,1042 @@ +/* + * Copyright (C) 2018 Thales Lima Oliveira <thales@ufu.br> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +#include "Bus.h" +#include "Capacitor.h" +#include "ImportForm.h" +#include "IndMotor.h" +#include "Inductor.h" +#include "Line.h" +#include "Load.h" +#include "PropertiesData.h" +#include "SyncGenerator.h" +#include "SyncMotor.h" +#include "Transformer.h" +#include "Workspace.h" + +ImportForm::ImportForm(wxWindow* parent, Workspace* workspace) : ImportFormBase(parent) +{ + SetInitialSize(); + + m_parent = parent; + m_workspace = workspace; +} + +ImportForm::~ImportForm() {} + +void ImportForm::OnButtonCancelClick(wxCommandEvent& event) +{ + EndModal(wxID_CANCEL); + if(m_workspace) delete m_workspace; +} + +void ImportForm::OnButtonOKClick(wxCommandEvent& event) +{ + if(ImportSelectedFiles()) + EndModal(wxID_OK); + else { + // Error message + wxMessageDialog msgDialog(this, _("It was not possible to import the selected files."), _("Error"), + wxOK | wxCENTRE | wxICON_ERROR); + msgDialog.ShowModal(); + } +} + +bool ImportForm::ImportSelectedFiles() +{ + ParseAnarede parseAnarede(m_filePickerANAREDELST->GetFileName(), m_filePickerANAREDEPWF->GetFileName()); + if(!parseAnarede.Parse()) return false; + double scale = 1.25; + + double mvaBasePower = parseAnarede.GetMVAPowerBase(); + auto simProp = m_workspace->GetProperties()->GetSimulationPropertiesData(); + simProp.basePower = mvaBasePower; + m_workspace->GetProperties()->SetSimulationPropertiesData(simProp); + + std::vector<Element*> elementList; + + std::vector<Bus*> busList; + std::vector<SyncGenerator*> syncGeneratorList; + std::vector<SyncMotor*> syncMotorList; + std::vector<Load*> loadList; + std::vector<Inductor*> indList; + std::vector<Capacitor*> capList; + std::vector<IndMotor*> indMotorList; + std::vector<Transformer*> transformerList; + std::vector<Line*> lineList; + + auto components = parseAnarede.GetComponents(); + for(auto it = components.begin(), itEnd = components.end(); it != itEnd; ++it) { + switch((*it)->type) { + case ANA_BUS: { + Bus* bus = new Bus(wxPoint2DDouble((*it)->position.m_x * scale, (*it)->position.m_y * scale)); + bus->SetID((*it)->id); + bus->SetWidth((*it)->length * scale); + bus->StartMove(bus->GetPosition()); + if((*it)->rotationID == 0) { + bus->Move(bus->GetPosition() + wxPoint2DDouble(bus->GetWidth() / 2, bus->GetHeight() / 2)); + } else if((*it)->rotationID == 1) { + for(int i = 0; i < (*it)->rotationID * 2; ++i) bus->Rotate(); + bus->Move(bus->GetPosition() + wxPoint2DDouble(-bus->GetHeight() / 2, bus->GetWidth() / 2)); + } else if((*it)->rotationID == 2) { + for(int i = 0; i < (*it)->rotationID * 2; ++i) bus->Rotate(); + bus->Move(bus->GetPosition() + wxPoint2DDouble(-bus->GetWidth() / 2, -bus->GetHeight() / 2)); + } else if((*it)->rotationID == 3) { + for(int i = 0; i < (*it)->rotationID * 2; ++i) bus->Rotate(); + bus->Move(bus->GetPosition() + wxPoint2DDouble(-bus->GetHeight() / 2, -bus->GetWidth() / 2)); + } + + // Electrical data + auto data = bus->GetElectricalData(); + ParseAnarede::BusData* busData = parseAnarede.GetBusDataFromID((*it)->electricalID); + if(busData) { + data.number = busData->id; + data.name = busData->busName; + switch(busData->type) { + case 0: + case 3: { + data.isVoltageControlled = false; + data.slackBus = false; + } break; + case 1: { + data.isVoltageControlled = true; + data.slackBus = false; + } break; + case 2: { + data.isVoltageControlled = true; + data.slackBus = true; + } break; + default: { + return false; + } break; + } + data.voltage = std::complex<double>(busData->voltage * std::cos(wxDegToRad(busData->angle)), + busData->voltage * std::sin(wxDegToRad(busData->angle))); + data.controlledVoltage = busData->voltage; + } else + return false; + + bus->SetElectricalData(data); + busList.push_back(bus); + } break; + case ANA_GENERATOR: + case ANA_IND_GENERATOR: { + // Find parent bus + Bus* parentBus = GetBusFromID(busList, (*it)->busConnectionID[0].first); + wxPoint2DDouble nodePos = + parseAnarede.GetNodePositionFromID(parentBus, scale, (*it)->busConnectionNode[0].second); + + ParseAnarede::BusData* busData = parseAnarede.GetBusDataFromID((*it)->busConnectionID[0].second); + bool isMotor = false; + if(busData->genPower.real() <= 0.0) isMotor = true; + Machines* machine = NULL; + + if(!isMotor) { + SyncGenerator* syncGenerator = new SyncGenerator(); + + auto data = syncGenerator->GetElectricalData(); + data.name = + wxString::Format("%s %u (%s)", _("Generator"), syncGeneratorList.size() + 1, busData->busName); + if((*it)->type == ANA_IND_GENERATOR) { + ParseAnarede::IndGenData* genData = + static_cast<ParseAnarede::IndGenData*>(parseAnarede.GetIndElementDataFromID( + (*it)->electricalID, (*it)->busConnectionID[0].second, ANA_IND_GENERATOR)); + double numUnits = static_cast<double>(genData->numUnits); + data.activePower = genData->power.real() * numUnits; + data.reactivePower = genData->power.imag() * numUnits; + data.maxReactive = genData->maxReactivePower * numUnits; + data.minReactive = genData->minReactivePower * numUnits; + data.nominalPower = genData->ratedPower * numUnits; + double xd = genData->xd / (100.0 * numUnits); + data.syncXd = xd > 1e-3 ? xd : 1.0; + data.syncXq = genData->xq / (100.0 * numUnits); + data.potierReactance = genData->xl / (100.0 * numUnits); + } else { + data.activePower = busData->genPower.real(); + data.reactivePower = busData->genPower.imag(); + data.minReactive = busData->minReactivePower; + data.maxReactive = busData->maxReactivePower; + data.useMachineBase = false; // ANAREDE use system's base + } + + syncGenerator->SetElectricalData(data); + + machine = syncGenerator; + } else { + SyncMotor* syncMotor = new SyncMotor(); + + auto data = syncMotor->GetElectricalData(); + data.name = wxString::Format("%s %u (%s)", _("Synchronous compensator"), syncMotorList.size() + 1, + busData->busName); + data.activePower = busData->genPower.real() == 0.0 ? 0.0 : -busData->genPower.real(); + data.reactivePower = busData->genPower.imag(); + data.minReactive = busData->minReactivePower; + data.maxReactive = busData->maxReactivePower; + data.useMachineBase = false; // ANAREDE use system's base + + syncMotor->SetElectricalData(data); + + machine = syncMotor; + } + + if(machine) { + machine->SetID((*it)->id); + machine->AddParent(parentBus, nodePos); + + machine->StartMove(machine->GetPosition()); + machine->Move(wxPoint2DDouble((*it)->position.m_x * scale, (*it)->position.m_y * scale)); + + for(int i = 0; i < 2; ++i) machine->Rotate(false); // Set to ANAREDE default rotation + for(int i = 0; i < (*it)->rotationID * 2; ++i) machine->Rotate(); + + if(!isMotor) + syncGeneratorList.push_back(static_cast<SyncGenerator*>(machine)); + else + syncMotorList.push_back(static_cast<SyncMotor*>(machine)); + } + } break; + case ANA_LOAD: + case ANA_IND_LOAD: { + Bus* parentBus = GetBusFromID(busList, (*it)->busConnectionID[0].first); + wxPoint2DDouble nodePos = + parseAnarede.GetNodePositionFromID(parentBus, scale, (*it)->busConnectionNode[0].second); + + ParseAnarede::BusData* busData = parseAnarede.GetBusDataFromID((*it)->busConnectionID[0].second); + + Load* load = new Load(); + load->SetID((*it)->id); + load->AddParent(parentBus, nodePos); + + load->StartMove(load->GetPosition()); + load->Move(wxPoint2DDouble((*it)->position.m_x * scale, (*it)->position.m_y * scale)); + + auto data = load->GetElectricalData(); + data.name = wxString::Format("%s %u (%s)", _("Load"), loadList.size() + 1, busData->busName); + data.activePower = busData->loadPower.real(); + data.reactivePower = busData->loadPower.imag(); + load->SetElectricalData(data); + + for(int i = 0; i < (*it)->rotationID * 2; ++i) load->Rotate(); + + loadList.push_back(load); + } break; + case ANA_SHUNT: + case ANA_IND_SHUNT: { + Bus* parentBus = GetBusFromID(busList, (*it)->busConnectionID[0].first); + wxPoint2DDouble nodePos = + parseAnarede.GetNodePositionFromID(parentBus, scale, (*it)->busConnectionNode[0].second); + + ParseAnarede::BusData* busData = parseAnarede.GetBusDataFromID((*it)->busConnectionID[0].second); + bool isInductor = false; + Shunt* shuntElement = NULL; + + double ql = 0.0; + if((*it)->type == ANA_IND_SHUNT) { + ParseAnarede::IndElementData* shuntData = parseAnarede.GetIndElementDataFromID( + (*it)->electricalID, (*it)->busConnectionID[0].second, ANA_IND_SHUNT); + if(shuntData) { + double numUnits = static_cast<double>(shuntData->numUnits); + ql = shuntData->power.imag() * numUnits; + } + } else { + ql = busData->shuntReactive; + } + if(ql <= 0.0) isInductor = true; + + if(!isInductor) { + Capacitor* cap = new Capacitor(); + auto data = cap->GetElectricalData(); + data.name = wxString::Format("%s %u (%s)", _("Capacitor"), indList.size() + 1, busData->busName); + data.reactivePower = ql; + cap->SetElectricalData(data); + shuntElement = cap; + } else { + Inductor* ind = new Inductor(); + auto data = ind->GetElectricalData(); + data.name = wxString::Format("%s %u (%s)", _("Inductor"), indList.size() + 1, busData->busName); + data.reactivePower = std::abs(ql); + ind->SetElectricalData(data); + shuntElement = ind; + } + + if(shuntElement) { + shuntElement->SetID((*it)->id); + shuntElement->AddParent(parentBus, nodePos); + + shuntElement->StartMove(shuntElement->GetPosition()); + // Offset (ind->GetHeight() / 2 + 10) to adequate the y coordinate + shuntElement->Move(wxPoint2DDouble( + (*it)->position.m_x * scale, (*it)->position.m_y * scale + shuntElement->GetHeight() / 2 + 10)); + if((*it)->rotationID != 0) { + // Remove offset in position + shuntElement->Move(wxPoint2DDouble((*it)->position.m_x * scale, (*it)->position.m_y * scale)); + // Get the rotated point ralated to the offset + wxPoint2DDouble movePt = shuntElement->RotateAtPosition( + shuntElement->GetPosition() + wxPoint2DDouble(0, shuntElement->GetHeight() / 2 + 10), + (*it)->rotationID * 90.0, true); + shuntElement->Move(movePt); + + for(int i = 0; i < (*it)->rotationID * 2; ++i) shuntElement->Rotate(); + } + + if(!isInductor) + capList.push_back(static_cast<Capacitor*>(shuntElement)); + else + indList.push_back(static_cast<Inductor*>(shuntElement)); + } + } break; + case ANA_MIT: { + // Find parent bus + Bus* parentBus = GetBusFromID(busList, (*it)->busConnectionID[0].first); + wxPoint2DDouble nodePos = + parseAnarede.GetNodePositionFromID(parentBus, scale, (*it)->busConnectionNode[0].second); + + IndMotor* indMotor = new IndMotor(); + indMotor->SetID((*it)->id); + indMotor->AddParent(parentBus, nodePos); + + indMotor->StartMove(indMotor->GetPosition()); + indMotor->Move(wxPoint2DDouble((*it)->position.m_x * scale, (*it)->position.m_y * scale)); + + auto data = indMotor->GetElectricalData(); + data.name = wxString::Format("%s %u (%s)", _("Motor"), indMotorList.size() + 1, + parentBus->GetElectricalData().name); + data.activePower = 0.0; + data.reactivePower = 0.0; + indMotor->SetElectricalData(data); + + for(int i = 0; i < 2; ++i) indMotor->Rotate(false); // Set to ANAREDE default rotation + for(int i = 0; i < (*it)->rotationID * 2; ++i) indMotor->Rotate(); + + indMotorList.push_back(indMotor); + } break; + case ANA_TRANSFORMER: { + Bus* parentBus1 = GetBusFromID(busList, (*it)->busConnectionID[0].first); + Bus* parentBus2 = GetBusFromID(busList, (*it)->busConnectionID[1].first); + wxPoint2DDouble nodePos1 = + parseAnarede.GetNodePositionFromID(parentBus1, scale, (*it)->busConnectionNode[0].second); + wxPoint2DDouble nodePos2 = + parseAnarede.GetNodePositionFromID(parentBus2, scale, (*it)->busConnectionNode[1].second); + + ParseAnarede::BranchData* branchData = + parseAnarede.GetBranchDataFromID((*it)->electricalID, (*it)->busConnectionID[0].second, + (*it)->busConnectionID[1].second, ANA_TRANSFORMER); + + Transformer* transformer = new Transformer(); + transformer->SetID((*it)->id); + transformer->AddParent(parentBus1, nodePos1); + transformer->AddParent(parentBus2, nodePos2); + + transformer->StartMove(transformer->GetPosition()); + transformer->Move(wxPoint2DDouble((*it)->position.m_x * scale, (*it)->position.m_y * scale)); + + for(int i = 0; i < 2; ++i) transformer->Rotate(); // Set to ANAREDE default rotation + for(int i = 0; i < (*it)->rotationID * 2; ++i) transformer->Rotate(); + + auto data = transformer->GetElectricalData(); + data.name = + wxString::Format("%s %u (%s - %s)", _("Transformer"), transformerList.size() + 1, + parentBus1->GetElectricalData().name, parentBus2->GetElectricalData().name); + data.resistance = branchData->resistance / 100.0; + data.indReactance = branchData->indReactance / 100.0; + data.turnsRatio = branchData->tap; + data.phaseShift = branchData->phaseShift; + transformer->SetElectricaData(data); + + transformerList.push_back(transformer); + } break; + default: { + } break; + } + } + + auto powerLines = parseAnarede.GetLines(); + for(auto it = powerLines.begin(), itEnd = powerLines.end(); it != itEnd; ++it) { + if((*it)->type == ANA_LINE) { + Bus* parentBus1 = GetBusFromID(busList, (*it)->busConnectionID[0].first); + Bus* parentBus2 = GetBusFromID(busList, (*it)->busConnectionID[1].first); + wxPoint2DDouble nodePos1 = + parseAnarede.GetNodePositionFromID(parentBus1, scale, (*it)->busConnectionNode[0].second); + wxPoint2DDouble nodePos2 = + parseAnarede.GetNodePositionFromID(parentBus2, scale, (*it)->busConnectionNode[1].second); + + ParseAnarede::BranchData* branchData = + parseAnarede.GetBranchDataFromID((*it)->electricalID, (*it)->busConnectionID[0].second, + (*it)->busConnectionID[1].second, ANA_LINE); + + Line* line = new Line(); + line->SetID((*it)->id); + line->AddParent(parentBus1, nodePos1); + for(unsigned int i = 0; i < (*it)->nodesPosition.size(); ++i) + line->AddPoint( + wxPoint2DDouble((*it)->nodesPosition[i].m_x * scale, (*it)->nodesPosition[i].m_y * scale)); + line->AddParent(parentBus2, nodePos2); + + auto data = line->GetElectricalData(); + data.name = wxString::Format("%s %u (%s - %s)", _("Line"), lineList.size() + 1, + parentBus1->GetElectricalData().name, parentBus2->GetElectricalData().name); + data.resistance = branchData->resistance / 100.0; + data.indReactance = branchData->indReactance / 100.0; + data.capSusceptance = branchData->capSusceptance / mvaBasePower; + line->SetElectricalData(data); + + lineList.push_back(line); + } + } + + // Search for bus data without component + std::vector<ParseAnarede::BusData*> busDataVector = parseAnarede.GetBusData(); + for(auto it = busDataVector.begin(), itEnd = busDataVector.end(); it != itEnd; ++it) { + ParseAnarede::BusData* busData = *it; + + // Search for bus + Bus* bus = NULL; + for(auto itB = busList.begin(), itBEnd = busList.end(); itB != itBEnd; ++itB) { + if((*itB)->GetElectricalData().number == busData->id) { + bus = *itB; + break; + } + } + if(bus) { + // Check load data + if(std::abs(busData->loadPower.real()) > 1e-5 || + std::abs(busData->loadPower.imag()) > 1e-5) { // Have loads + // Find load associated with the bus + Load* load = NULL; + for(auto itL = loadList.begin(), itLEnd = loadList.end(); itL != itLEnd; ++itL) { + if((*itL)->GetParentList().size() > 0) { // Don't search in empty vectors + if((*itL)->GetParentList()[0] == bus) { // Found load + load = *itL; + break; + } + } + } + if(!load) { // The load don't exists, create a new one. + Load* newLoad = + new Load(wxString::Format("%s %u (%s)", _("Load"), loadList.size() + 1, busData->busName)); + newLoad->AddParent(bus, bus->GetPosition()); + auto data = newLoad->GetElectricalData(); + data.activePower = busData->loadPower.real(); + data.reactivePower = busData->loadPower.imag(); + newLoad->SetElectricalData(data); + + loadList.push_back(newLoad); + } + } + // Check generation data + if(std::abs(busData->genPower.real()) > 1e-5 || std::abs(busData->genPower.imag()) > 1e-5) { + // Find synchornous machine associated with bus + if(busData->genPower.real() > 0.0) { // Synchronous generator + SyncGenerator* syncGenerator = NULL; + for(auto itSM = syncGeneratorList.begin(), itSMEnd = syncGeneratorList.end(); itSM != itSMEnd; + ++itSM) { + if((*itSM)->GetParentList().size() > 0) { // Don't search in empty vectors + if((*itSM)->GetParentList()[0] == bus) { // Found load + syncGenerator = *itSM; + break; + } + } + } + if(!syncGenerator) { + SyncGenerator* newSyncGenerator = new SyncGenerator(wxString::Format( + "%s %u (%s)", _("Generator"), syncGeneratorList.size() + 1, busData->busName)); + newSyncGenerator->AddParent(bus, bus->GetPosition()); + auto data = newSyncGenerator->GetElectricalData(); + data.activePower = busData->genPower.real(); + data.reactivePower = busData->genPower.imag(); + newSyncGenerator->SetElectricalData(data); + + syncGeneratorList.push_back(newSyncGenerator); + } + } else { + SyncMotor* syncMotor = NULL; + for(auto itSM = syncMotorList.begin(), itSMEnd = syncMotorList.end(); itSM != itSMEnd; ++itSM) { + if((*itSM)->GetParentList().size() > 0) { // Don't search in empty vectors + if((*itSM)->GetParentList()[0] == bus) { // Found load + syncMotor = *itSM; + break; + } + } + } + if(!syncMotor) { + SyncMotor* newSyncMotor = new SyncMotor(wxString::Format( + "%s %u (%s)", _("Synchronous compensator"), syncMotorList.size() + 1, busData->busName)); + newSyncMotor->AddParent(bus, bus->GetPosition()); + auto data = newSyncMotor->GetElectricalData(); + data.activePower = std::abs(busData->genPower.real()); + data.reactivePower = busData->genPower.imag(); + newSyncMotor->SetElectricalData(data); + + syncMotorList.push_back(newSyncMotor); + } + } + } + } + } + // Check for branch data without component (?) + + for(auto it = busList.begin(), itEnd = busList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = transformerList.begin(), itEnd = transformerList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = lineList.begin(), itEnd = lineList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = syncGeneratorList.begin(), itEnd = syncGeneratorList.end(); it != itEnd; ++it) + elementList.push_back(*it); + for(auto it = syncMotorList.begin(), itEnd = syncMotorList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = loadList.begin(), itEnd = loadList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = indList.begin(), itEnd = indList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = capList.begin(), itEnd = capList.end(); it != itEnd; ++it) elementList.push_back(*it); + for(auto it = indMotorList.begin(), itEnd = indMotorList.end(); it != itEnd; ++it) elementList.push_back(*it); + + m_workspace->SetElementList(elementList); + m_workspace->SetName(parseAnarede.GetProjectName()); + return true; +} + +Bus* ImportForm::GetBusFromID(std::vector<Bus*> busList, int id) +{ + for(auto it = busList.begin(), itEnd = busList.end(); it != itEnd; ++it) { + if((*it)->GetID() == id) return *it; + } + return NULL; +} + +ParseAnarede::ParseAnarede(wxFileName lstFile, wxFileName pwfFile) +{ + m_lstFile = lstFile; + m_pwfFile = pwfFile; +} + +bool ParseAnarede::Parse() +{ + wxTextFile lst(m_lstFile.GetFullPath()); + wxTextFile pwf(m_pwfFile.GetFullPath()); + if(!lst.Open()) return false; + if(!pwf.Open()) return false; + + // Parse LST file + for(wxString line = lst.GetFirstLine(); !lst.Eof(); line = lst.GetNextLine()) { + // Current line + switch(static_cast<char>(line[0])) { + case 'C': { // Component + int parsePosition = 1; + + Component* component = new Component(); + + component->id = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + // Check if is component type is valid + if(StrToElementType(GetLSTLineNextValue(line, parsePosition), component->type)) { + if(component->type == ANA_BUS) { + if(!GetLenghtAndRotationFromBusCode(GetLSTLineNextValue(line, parsePosition), component->length, + component->rotationID)) + return false; + } else { + component->rotationID = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + } + parsePosition += 2; // Jump to position + if(!GetLSTLineNextValue(line, parsePosition).ToCDouble(&component->position.m_x)) return false; + if(!GetLSTLineNextValue(line, parsePosition).ToCDouble(&component->position.m_y)) return false; + parsePosition += 8; // Jump to electrical ID + component->electricalID = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + + // Bus connection IDs + if(component->type != ANA_BUS) { + int fromBus = wxAtoi(GetLSTLineNextValue(line, parsePosition)); // Origin bus + int toBus = 0; + // If the component is a transformer, parse the next value (toBus) + if(component->type == ANA_TRANSFORMER) { + toBus = wxAtoi(GetLSTLineNextValue(line, parsePosition)); // Destiny bus + } + // Iterate through the already parsed components (the buses is saved first) + for(auto it = m_components.begin(), itEnd = m_components.end(); it != itEnd; ++it) { + if((*it)->type == ANA_BUS) { + if(fromBus == (*it)->electricalID) { + component->busConnectionID[0] = std::make_pair((*it)->id, fromBus); + } else if(toBus == (*it)->electricalID) { + component->busConnectionID[1] = std::make_pair((*it)->id, toBus); + } + } + } + } + m_components.push_back(component); + } + } break; + case 'L': { // Line + int parsePosition = 1; + + PowerLine* pLine = new PowerLine(); + + pLine->id = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + pLine->type = static_cast<ElementTypeAnarede>(wxAtoi(GetLSTLineNextValue(line, parsePosition))); + parsePosition += 4; // Jump to from bus + + int fromBus = wxAtoi(GetLSTLineNextValue(line, parsePosition)); // Origin bus + int toBus = wxAtoi(GetLSTLineNextValue(line, parsePosition)); // Destiny bus + + // Iterate through the already parsed components + for(auto it = m_components.begin(), itEnd = m_components.end(); it != itEnd; ++it) { + if((*it)->type == ANA_BUS) { + if(fromBus == (*it)->id) { + pLine->busConnectionID[0] = std::make_pair((*it)->id, (*it)->electricalID); + } else if(toBus == (*it)->id) { + pLine->busConnectionID[1] = std::make_pair((*it)->id, (*it)->electricalID); + } + } + } + pLine->electricalID = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + + m_lines.push_back(pLine); + } break; + case 'U': { // Connection + // The connection data depends on the component type, so this data definition must be more generic. + int parsePosition = 1; + + int id = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + (void)id; // Unused id. + parsePosition += 5; // Jump to next relevant data + int data1 = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + int data2 = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + int data3 = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + int data4 = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + int data5 = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + int data6 = wxAtoi(GetLSTLineNextValue(line, parsePosition)); + + // If data5 differs from -1, the connection is power line data with data5's value as its ID, otherwise + // data1 is the ID of a component. + if(data5 != -1) { + // Iterate through parsed lines + for(auto it = m_lines.begin(), itEnd = m_lines.end(); it != itEnd; ++it) { + if(data5 == (*it)->id) { + (*it)->busConnectionNode[0] = std::make_pair(data1, data2); + (*it)->busConnectionNode[1] = std::make_pair(data3, data4); + for(int i = 0; i < data6; ++i) { + wxPoint2DDouble nodePt; + if(!GetLSTLineNextValue(line, parsePosition).ToCDouble(&nodePt.m_x)) return false; + if(!GetLSTLineNextValue(line, parsePosition).ToCDouble(&nodePt.m_y)) return false; + (*it)->nodesPosition.push_back(nodePt); + } + } + } + } else { + // Iterate through parsed components + for(auto it = m_components.begin(), itEnd = m_components.end(); it != itEnd; ++it) { + if(data1 == (*it)->id) { + if((*it)->type == ANA_BUS) { + // If the data1 is a bus ID, the element is a element with different data order. + // Find the correct element ID with data3 + for(auto itDiff = m_components.begin(), itDiffEnd = m_components.end(); + itDiff != itDiffEnd; ++itDiff) { + if(data3 == (*itDiff)->id) { + (*itDiff)->busConnectionNode[data4 - 1] = std::make_pair(data1, data2); + break; + } + } + } else { + (*it)->busConnectionNode[data2 - 1] = std::make_pair(data3, data4); + break; + } + } + } + } + } break; + default: + break; + } + } + // Last line + + // Parse PWF file + for(wxString line = pwf.GetFirstLine(); !pwf.Eof(); line = pwf.GetNextLine()) { + // Current line + if(line == "TITU") { // Title + m_projectName = pwf.GetNextLine().Trim(); + } else if(line != "") { + if(line == "FIM") break; + if(line[0] != '(') { // Ignore commented line + wxString exeCode = line; + wxString data = ""; + for(wxString lineData = pwf.GetNextLine(); lineData != "99999" && !pwf.Eof(); + lineData = pwf.GetNextLine()) { + if(lineData == "FIM") break; + if(lineData[0] != '(') { // Ignore commented line + data += lineData + "\n"; + } + } + if(data != "" || data != "FIM") { // Don't parse empty data + if(!ParsePWFExeCode(data, exeCode)) return false; + } + } + } + } + // Last line + + return true; +} + +wxString ParseAnarede::GetLSTLineNextValue(wxString line, int& currentPos) +{ + // Parse each line column + wxString strValue = "="; + for(; currentPos < static_cast<int>(line.length()); ++currentPos) { + if(line[currentPos] != ' ') { // Skip the firsts whitespaces + wxString parsedLine = line.Mid(currentPos); + strValue = parsedLine.BeforeFirst(' '); // Get the character before the first whitespace + currentPos += strValue.length(); // Set the current parse position + break; + } + } + return strValue; +} + +bool ParseAnarede::GetLenghtAndRotationFromBusCode(wxString code, double& lenght, int& rotationID) +{ + // Get code in decimal. + long longCode; + if(!code.ToLong(&longCode)) return false; + // Convert code to hex + std::stringstream hexCode; + hexCode << std::hex << longCode; + // Convert code to string + wxString hexCodeStr = hexCode.str(); + // Get length on the substring + wxString lenghtStr = hexCodeStr.Left(hexCodeStr.length() - 1); + // Convert lenght string (hex) to decimal + hexCode.str(""); + hexCode << lenghtStr.ToStdString(); + int intLenght; + hexCode >> std::hex >> intLenght; + lenght = static_cast<double>(intLenght); + // Get rotation ID from substring + wxString rotationIDStr = hexCodeStr.Right(1); + // Convert rotation ID string to int + long rotationIDLong; + if(!rotationIDStr.ToLong(&rotationIDLong)) return false; + rotationID = static_cast<int>(rotationIDLong); + // Calculate the true value of lenght + lenght = 3.0 * lenght - 16.0; + return true; +} + +wxPoint2DDouble ParseAnarede::GetNodePositionFromID(Bus* bus, double scale, int nodeID) +{ + wxPoint2DDouble nodePt; + + double offset = (static_cast<double>(nodeID) - 1.0) * 16.0; + nodePt = bus->GetPosition() + wxPoint2DDouble(offset * scale, 0) - + wxPoint2DDouble(bus->GetWidth() / 2, bus->GetHeight() / 2); + nodePt = bus->RotateAtPosition(nodePt, bus->GetAngle(), true); + + return nodePt; +} + +bool ParseAnarede::StrToElementType(wxString strType, ElementTypeAnarede& type) +{ + // Check if type exists, othewise return false + int typeInt = wxAtoi(strType); + switch(typeInt) { + case ANA_BUS: + case ANA_GENERATOR: + case ANA_LOAD: + case ANA_SHUNT: + case ANA_MIT: + case ANA_TRANSFORMER: + case ANA_LINE: + case ANA_IND_LOAD: + case ANA_IND_SHUNT: + case ANA_IND_GENERATOR: { + type = static_cast<ElementTypeAnarede>(typeInt); + return true; + } break; + default: + break; + } + return false; +} + +bool ParseAnarede::ParsePWFExeCode(wxString data, wxString exeCode) +{ + if(exeCode == "DCTE") { + // Parse data + wxString code = ""; + wxString value = ""; + for(unsigned int i = 0; i < data.length(); ++i) { + code = data.Mid(i, 4); + value = data.Mid(i + 5, 6).Trim(false); + i += 11; + if(code == "BASE") { + if(!value.ToCDouble(&m_mvaBase)) return false; + break; + } + } + } else if(exeCode == "DBAR") { + wxString lineData = ""; + while(data != "") { + wxString rest = ""; + lineData = data.BeforeFirst('\n', &rest); + data = rest; + BusData* busData = new BusData(); + + if(!GetPWFStructuredData(lineData, 0, 5, busData->id)) return false; + wxString isOnlineCode = lineData.Mid(6, 1); + if(isOnlineCode == "L" || isOnlineCode == " ") + busData->isOnline = true; + else if(isOnlineCode == "D") + busData->isOnline = false; + else + return false; + if(!GetPWFStructuredData(lineData, 7, 1, busData->type)) return false; + busData->voltageBase = lineData.Mid(8, 2); + busData->busName = lineData.Mid(10, 12).Trim(); + if(!GetPWFStructuredData(lineData, 24, 4, busData->voltage, 1)) return false; + if(!GetPWFStructuredData(lineData, 28, 4, busData->angle)) return false; + double pg, qg; + if(!GetPWFStructuredData(lineData, 32, 5, pg)) return false; + if(!GetPWFStructuredData(lineData, 37, 5, qg)) return false; + busData->genPower = std::complex<double>(pg, qg); + if(!GetPWFStructuredData(lineData, 42, 5, busData->minReactivePower)) return false; + if(!GetPWFStructuredData(lineData, 47, 5, busData->maxReactivePower)) return false; + if(!GetPWFStructuredData(lineData, 52, 6, busData->ctrlBusID)) return false; + double pl, ql; + if(!GetPWFStructuredData(lineData, 58, 5, pl)) return false; + if(!GetPWFStructuredData(lineData, 63, 5, ql)) return false; + busData->loadPower = std::complex<double>(pl, ql); + if(!GetPWFStructuredData(lineData, 68, 5, busData->shuntReactive)) return false; + + m_busData.push_back(busData); + } + } else if(exeCode == "DLIN") { + wxString lineData = ""; + while(data != "") { + wxString rest = ""; + lineData = data.BeforeFirst('\n', &rest); + data = rest; + BranchData* branchData = new BranchData(); + + if(!GetPWFStructuredData(lineData, 15, 2, branchData->id)) return false; + int from, to; + if(!GetPWFStructuredData(lineData, 0, 5, from)) return false; + if(!GetPWFStructuredData(lineData, 10, 5, to)) return false; + branchData->busConnections = std::make_pair(from, to); + + wxString isOnlineCode = lineData.Mid(6, 1) + lineData.Mid(9, 1) + lineData.Mid(17, 1); + if(isOnlineCode.Find('D') == wxNOT_FOUND) + branchData->isOnline = true; + else + branchData->isOnline = false; + if(!GetPWFStructuredData(lineData, 20, 6, branchData->resistance, 4)) return false; + if(!GetPWFStructuredData(lineData, 26, 6, branchData->indReactance, 4)) return false; + if(!GetPWFStructuredData(lineData, 32, 6, branchData->capSusceptance, 4)) return false; + if(!GetPWFStructuredData(lineData, 38, 5, branchData->tap, 2)) return false; + if(!GetPWFStructuredData(lineData, 53, 5, branchData->phaseShift, 3)) return false; + + if(branchData->tap < 1e-3) + branchData->type = ANA_LINE; + else + branchData->type = ANA_TRANSFORMER; + + m_branchData.push_back(branchData); + } + } else if(exeCode == "DCAI") { + wxString lineData = ""; + while(data != "") { + wxString rest = ""; + lineData = data.BeforeFirst('\n', &rest); + data = rest; + IndElementData* indData = new IndElementData(); + indData->type = ANA_IND_LOAD; + + if(!GetPWFStructuredData(lineData, 9, 2, indData->id)) return false; + if(!GetPWFStructuredData(lineData, 0, 5, indData->busConnection)) return false; + + wxString isOnlineCode = lineData.Mid(13, 1); + if(isOnlineCode == "L" || isOnlineCode == " ") + indData->isOnline = true; + else if(isOnlineCode == "D") + indData->isOnline = false; + else + return false; + + double pl, ql; + if(!GetPWFStructuredData(lineData, 22, 5, pl)) return false; + if(!GetPWFStructuredData(lineData, 28, 5, ql)) return false; + indData->power = std::complex<double>(pl, ql); + // Unities in operation + if(!GetPWFStructuredData(lineData, 18, 3, indData->numUnits)) return false; + + m_indElementData.push_back(indData); + } + } else if(exeCode == "DGEI") { + wxString lineData = ""; + while(data != "") { + wxString rest = ""; + lineData = data.BeforeFirst('\n', &rest); + data = rest; + IndGenData* genData = new IndGenData(); + genData->type = ANA_IND_GENERATOR; + + if(!GetPWFStructuredData(lineData, 9, 2, genData->id)) return false; + if(!GetPWFStructuredData(lineData, 0, 5, genData->busConnection)) return false; + + wxString isOnlineCode = lineData.Mid(12, 1); + if(isOnlineCode == "L" || isOnlineCode == " ") + genData->isOnline = true; + else if(isOnlineCode == "D") + genData->isOnline = false; + else + return false; + + double pg, qg; + if(!GetPWFStructuredData(lineData, 22, 5, pg)) return false; + if(!GetPWFStructuredData(lineData, 27, 5, qg)) return false; + genData->power = std::complex<double>(pg, qg); + // Unities in operation + if(!GetPWFStructuredData(lineData, 16, 3, genData->numUnits)) return false; + if(!GetPWFStructuredData(lineData, 32, 5, genData->minReactivePower)) return false; + if(!GetPWFStructuredData(lineData, 37, 5, genData->maxReactivePower)) return false; + if(!GetPWFStructuredData(lineData, 42, 6, genData->xt, 2)) return false; + if(!GetPWFStructuredData(lineData, 49, 5, genData->xd, 4)) return false; + if(!GetPWFStructuredData(lineData, 54, 5, genData->xq, 4)) return false; + if(!GetPWFStructuredData(lineData, 59, 5, genData->xl, 4)) return false; + if(!GetPWFStructuredData(lineData, 69, 5, genData->ratedPower, 3)) return false; + + m_indElementData.push_back(genData); + } + } else if(exeCode == "DBSH") { + int lineNumber = 1; + wxString lineData = ""; + int busNumber = -1; + + while(data != "") { + wxString rest = ""; + lineData = data.BeforeFirst('\n', &rest); + data = rest; + + if(lineNumber == 1) { + if(!GetPWFStructuredData(lineData, 0, 5, busNumber)) return false; + } else if(lineData == "FBAN") { + lineNumber = 0; + busNumber = -1; + } else if(lineNumber >= 2 && busNumber != -1) { + IndElementData* indShunt = new IndElementData(); + indShunt->type = ANA_IND_SHUNT; + indShunt->busConnection = busNumber; + + if(!GetPWFStructuredData(lineData, 0, 2, indShunt->id)) return false; + + wxString isOnlineCode = lineData.Mid(6, 1); + if(isOnlineCode == "L" || isOnlineCode == " ") + indShunt->isOnline = true; + else if(isOnlineCode == "D") + indShunt->isOnline = false; + else + return false; + + if(!GetPWFStructuredData(lineData, 12, 3, indShunt->numUnits)) return false; + double ql; + if(!GetPWFStructuredData(lineData, 16, 6, ql)) return false; + indShunt->power = std::complex<double>(0.0, ql); + m_indElementData.push_back(indShunt); + } + ++lineNumber; + } + } + + return true; +} + +bool ParseAnarede::GetPWFStructuredData(wxString data, + unsigned int startPos, + unsigned int dataLenght, + int& value, + int decimalPos) +{ + if(data.length() < startPos || data.length() < (startPos + dataLenght)) { + value = 0; + return true; + } + wxString strValue = data.Mid(startPos, dataLenght); + strValue.Replace(' ', '0'); + long lValue = 0; + if(!strValue.ToLong(&lValue)) return false; + value = static_cast<int>(lValue); + return true; +} + +bool ParseAnarede::GetPWFStructuredData(wxString data, + unsigned int startPos, + unsigned int dataLenght, + double& value, + int decimalPos) +{ + if(data.length() < startPos || data.length() < (startPos + dataLenght)) { + value = 0.0; + return true; + } + wxString strValue = data.Mid(startPos, dataLenght); + if(strValue.Find('-') == wxNOT_FOUND) strValue.Replace(' ', '0'); + if(decimalPos != -1 && strValue.Find('.') == wxNOT_FOUND) strValue.insert(decimalPos, '.'); + if(!strValue.ToCDouble(&value)) return false; + return true; +} + +ParseAnarede::BusData* ParseAnarede::GetBusDataFromID(int id) +{ + for(auto it = m_busData.begin(), itEnd = m_busData.end(); it != itEnd; ++it) { + if((*it)->id == id) return *it; + } + return NULL; +} + +ParseAnarede::BranchData* ParseAnarede::GetBranchDataFromID(int id, int fromBus, int toBus, ElementTypeAnarede type) +{ + for(auto it = m_branchData.begin(), itEnd = m_branchData.end(); it != itEnd; ++it) { + if((*it)->id == id && (*it)->busConnections.first == fromBus && (*it)->busConnections.second == toBus && + (*it)->type == type) + return *it; + } + return NULL; +} + +ParseAnarede::IndElementData* ParseAnarede::GetIndElementDataFromID(int id, int busID, ElementTypeAnarede type) +{ + for(auto it = m_indElementData.begin(), itEnd = m_indElementData.end(); it != itEnd; ++it) { + if((*it)->id == id && (*it)->busConnection == busID && (*it)->type == type) return *it; + } + return NULL; +} + +void ParseAnarede::ClearData() +{ + for(auto it = m_components.begin(), itEnd = m_components.end(); it != itEnd; ++it) { + if(*it) delete *it; + } + m_components.clear(); + for(auto it = m_lines.begin(), itEnd = m_lines.end(); it != itEnd; ++it) { + if(*it) delete *it; + } + m_lines.clear(); + for(auto it = m_busData.begin(), itEnd = m_busData.end(); it != itEnd; ++it) { + if(*it) delete *it; + } + m_busData.clear(); + for(auto it = m_branchData.begin(), itEnd = m_branchData.end(); it != itEnd; ++it) { + if(*it) delete *it; + } + m_branchData.clear(); + for(auto it = m_indElementData.begin(), itEnd = m_indElementData.end(); it != itEnd; ++it) { + if(*it) delete *it; + } + m_indElementData.clear(); +}
\ No newline at end of file diff --git a/Project/ImportForm.h b/Project/ImportForm.h new file mode 100644 index 0000000..280396b --- /dev/null +++ b/Project/ImportForm.h @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2018 Thales Lima Oliveira <thales@ufu.br> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +#ifndef IMPORTFORM_H +#define IMPORTFORM_H + +#include "PropertiesFormBase.h" + +#include <wx/geometry.h> +#include <wx/msgdlg.h> +#include <wx/textfile.h> +#include <bitset> + +class Workspace; +class Bus; +class SyncGenerator; +class SyncMotor; +class Load; +class Capacitor; +class Inductor; +class Capacitor; +class IndMotor; +class Transformer; +class Line; +class PropertiesData; + +/** + * @class ImportForm + * @author Thales Lima Oliveira <thales@ufu.br> + * @date 27/03/2018 + * @brief Form to import other programs files to PSP + * @file ImportForm.h + */ +class ImportForm : public ImportFormBase +{ + public: + ImportForm(wxWindow* parent, Workspace* workspace); + virtual ~ImportForm(); + + Workspace* GetWorkspace() { return m_workspace; } + + protected: + virtual void OnButtonCancelClick(wxCommandEvent& event); + virtual void OnButtonOKClick(wxCommandEvent& event); + bool ImportSelectedFiles(); + Bus* GetBusFromID(std::vector<Bus*> busList, int id); + + Workspace* m_workspace = NULL; + wxWindow* m_parent; +}; + +/** + * @enum ElementType + * @brief ID of ANAREDE's elements. + */ +enum ElementTypeAnarede { + ANA_BUS = 1, /**< Bus */ + ANA_GENERATOR = 4, /**< Generator */ + ANA_LOAD = 5, /**< Load */ + ANA_SHUNT = 6, /**< Shunt element */ + ANA_MIT = 7, /**< Induction motor */ + ANA_TRANSFORMER = 9, /**< Transformer */ + ANA_LINE = 14, /**< Power line */ + ANA_IND_LOAD = 22, /**< Independent load */ + ANA_IND_SHUNT = 23, /**< Independent shunt element */ + ANA_IND_GENERATOR = 24, /**< Independent generator */ +}; + +/** + * @class ParseAnarede + * @author Thales Lima Oliveira <thales@ufu.br> + * @date 27/03/2018 + * @brief Class responsible to parse ANAREDE files to import data to PSP. + * @file ImportForm.h + */ +class ParseAnarede +{ + public: + // Graphic files data structs + struct Component { + int id = 0; /**< Graphical ID */ + ElementTypeAnarede type = ANA_BUS; /**< Element type */ + double length = 0.0; /**< Element lenght (only buses) */ + int rotationID = 0; /**< Rotation ID (0, 1, 2 or 4) */ + wxPoint2DDouble position; /**< X and Y coordinates */ + int electricalID = 0; /**< Bus, Branch or Group electrical IDs */ + std::pair<int, int> busConnectionID[2] = { + std::make_pair(0, 0), std::make_pair(0, 0)}; /**< In the form <graphicalBusID,electricBusID> */ + std::pair<int, int> busConnectionNode[2] = {std::make_pair(0, 0), + std::make_pair(0, 0)}; /**< In the form <graphicalBusID,nodeID> */ + }; + struct PowerLine { + int id = 0; /**< Graphical ID */ + ElementTypeAnarede type = ANA_LINE; /**< Element type */ + int electricalID = 0; /**< Bus, Branch or Group electrical IDs */ + std::pair<int, int> busConnectionID[2] = { + std::make_pair(0, 0), std::make_pair(0, 0)}; /**< In the form <graphicalBusID,electricBusID> */ + std::pair<int, int> busConnectionNode[2] = {std::make_pair(0, 0), + std::make_pair(0, 0)}; /**< In the form <graphicalBusID,nodeID> */ + std::vector<wxPoint2DDouble> nodesPosition; /**< Coordinates of the line breaks, if any */ + }; + struct BusData { + int id = 0; /**< Bus electrical ID */ + bool isOnline = true; /**< Element is online */ + int type = 0; /**< Bus Type: 0 = PQ; 1 = PV; 2 = Ref.; 3 = PQ with voltage between */ + wxString voltageBase = "0"; /**< Voltage base identifier */ + wxString busName = "Bus"; /**< Bus name */ + double voltage = 1.0; /**< Bus abs voltage (controlled value for PV and Ref. types) */ + double angle = 0.0; /**< Angle of voltage */ + std::complex<double> genPower = std::complex<double>(0, 0); /**< Generated power */ + double minReactivePower = -9999.0; /**< Minimal reactive power */ + double maxReactivePower = 99999.0; /**< Maximum reactive power */ + int ctrlBusID = 0; /**< Controlled bus ID */ + std::complex<double> loadPower = std::complex<double>(0, 0); /**< Load power */ + double shuntReactive = + 0.0; /**< Reactive power of shunt element. Positive for capacitor, negative for inductor. */ + }; + struct BranchData { + int id = 0; /**< Branch electrical ID */ + ElementTypeAnarede type = ANA_LINE; /**< Element type */ + std::pair<int, int> busConnections = std::make_pair(0, 0); /**< Branch connection IDs */ + bool isOnline = true; /**< Element is online */ + double resistance = 0.0; /**< Branch resistance */ + double indReactance = 0.0; /**< Branch inductive reactance */ + double capSusceptance = 0.0; /**< Branch capacitive susceptance */ + double tap = 0.0; /**< Transformer tap */ + double phaseShift = 0.0; /**< Transformer phase shift */ + }; + struct IndElementData { + int id = 0; /**< Group electrical ID */ + int busConnection = 0; /**< Branch connection ID */ + ElementTypeAnarede type = ANA_IND_GENERATOR; /**< Element type */ + bool isOnline = true; /**< Element is online */ + std::complex<double> power = std::complex<double>(0, 0); /**< Element power */ + int numUnits = 0; /**< Number of unities */ + }; + struct IndGenData : IndElementData { + double minReactivePower = -9999.0; /**< Minimal reactive power */ + double maxReactivePower = 99999.0; /**< Maximum reactive power */ + double xt = 1.0; /**< Transformer reactance of each generator */ + double xd = 1.0; /**< Synchronous direct-axis reactance of each generator */ + double xq = 1.0; /**< Synchronous quadrature-axis reactance of each generator */ + double xl = 1.0; /**< Leakage reactance of each generator */ + double ratedPower = 100.0; /**< Rated power of each generator */ + }; + + ParseAnarede(wxFileName lstFile, wxFileName pwfFile); + ~ParseAnarede() { ClearData(); } + + bool Parse(); + + std::vector<Component*> GetComponents() const { return m_components; } + std::vector<PowerLine*> GetLines() const { return m_lines; } + std::vector<BranchData*> GetBranchData() const { return m_branchData; } + std::vector<BusData*> GetBusData() const { return m_busData; } + std::vector<IndElementData*> GetIndElementData() const { return m_indElementData; } + wxString GetProjectName() const { return m_projectName; } + double GetMVAPowerBase() const { return m_mvaBase; } + + wxPoint2DDouble GetNodePositionFromID(Bus* bus, double scale, int nodeID); + BusData* GetBusDataFromID(int id); + BranchData* GetBranchDataFromID(int id, int fromBus, int toBus, ElementTypeAnarede type); + IndElementData* GetIndElementDataFromID(int id, int busID, ElementTypeAnarede type); + + void ClearData(); + + protected: + bool GetLenghtAndRotationFromBusCode(wxString code, double& lenght, int& rotationID); + wxString GetLSTLineNextValue(wxString line, int& currentPos); + bool StrToElementType(wxString strType, ElementTypeAnarede& type); + bool ParsePWFExeCode(wxString data, wxString exeCode); + bool GetPWFStructuredData(wxString data, + unsigned int startPos, + unsigned int dataLenght, + int& value, + int decimalPos = -1); + bool GetPWFStructuredData(wxString data, + unsigned int startPos, + unsigned int dataLenght, + double& value, + int decimalPos = -1); + + wxFileName m_lstFile; + wxFileName m_pwfFile; + + std::vector<Component*> m_components; + std::vector<PowerLine*> m_lines; + std::vector<BusData*> m_busData; + std::vector<BranchData*> m_branchData; + std::vector<IndElementData*> m_indElementData; + + wxString m_projectName = _("Imported project"); + double m_mvaBase = 100.0; +}; + +#endif // IMPORTFORM_H diff --git a/Project/IndMotorForm.h b/Project/IndMotorForm.h index efbe0bf..e221a8b 100644 --- a/Project/IndMotorForm.h +++ b/Project/IndMotorForm.h @@ -17,7 +17,7 @@ #ifndef INDMOTORFORM_H #define INDMOTORFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class IndMotor; diff --git a/Project/LimiterForm.h b/Project/LimiterForm.h index 5657cb8..8f15b80 100644 --- a/Project/LimiterForm.h +++ b/Project/LimiterForm.h @@ -17,7 +17,7 @@ #ifndef LIMITERFORM_H #define LIMITERFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Limiter; diff --git a/Project/LineForm.h b/Project/LineForm.h index ab4b87e..857d31b 100644 --- a/Project/LineForm.h +++ b/Project/LineForm.h @@ -17,7 +17,7 @@ #ifndef LINEFORM_H #define LINEFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Line; class SwitchingForm; diff --git a/Project/LoadForm.h b/Project/LoadForm.h index 4e50b4e..1fc103f 100644 --- a/Project/LoadForm.h +++ b/Project/LoadForm.h @@ -17,7 +17,7 @@ #ifndef LOADFORM_H #define LOADFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Load; class SwitchingForm; diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 41fe59b..7d129b4 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -15,25 +15,26 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include "MainFrame.h" -#include "artProvider/ArtMetro.h" -#include "Workspace.h" +#include "AboutForm.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 "ChartView.h" +#include "DataReport.h" #include "FileHanding.h" #include "GeneralPropertiesForm.h" -#include "SimulationsSettingsForm.h" +#include "ImportForm.h" +#include "IndMotor.h" +#include "Inductor.h" +#include "Line.h" +#include "Load.h" +#include "MainFrame.h" #include "PropertiesData.h" -#include "ChartView.h" -#include "DataReport.h" -#include "AboutForm.h" +#include "SimulationsSettingsForm.h" +#include "SyncGenerator.h" +#include "SyncMotor.h" +#include "Transformer.h" +#include "Workspace.h" +#include "artProvider/ArtMetro.h" MainFrame::MainFrame() : MainFrameBase(NULL) {} MainFrame::MainFrame(wxWindow* parent, wxLocale* locale, PropertiesData* initProperties, wxString openPath) @@ -166,8 +167,8 @@ void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) { EnableCurrentProjectRibbon(); - Workspace* newWorkspace = - new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber), this->GetStatusBar(), m_sharedGLContext); + Workspace* newWorkspace = new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber), + this->GetStatusBar(), m_sharedGLContext); if(!m_sharedGLContext) m_sharedGLContext = newWorkspace->GetOpenGLContext(); m_workspaceList.push_back(newWorkspace); @@ -214,9 +215,7 @@ void MainFrame::OnDataReportClick(wxRibbonButtonBarEvent& event) void MainFrame::OnDeleteClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->DeleteSelectedElements(); - } + if(workspace) { workspace->DeleteSelectedElements(); } } void MainFrame::OnDisableSolutionClick(wxRibbonButtonBarEvent& event) { @@ -238,20 +237,16 @@ void MainFrame::OnEnableSolutionClick(wxRibbonButtonBarEvent& event) m_ribbonButtonBarContinuous->ToggleButton(ID_RIBBON_DISABLESOL, false); } -void MainFrame::OnExpImpClick(wxRibbonButtonBarEvent& event) {} +// void MainFrame::OnExpImpClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnFaultClick(wxRibbonButtonBarEvent& event) { - if(Workspace* workspace = dynamic_cast<Workspace*>(m_auiNotebook->GetCurrentPage())) { - workspace->RunFault(); - } + if(Workspace* workspace = dynamic_cast<Workspace*>(m_auiNotebook->GetCurrentPage())) { workspace->RunFault(); } } void MainFrame::OnFitClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->Fit(); - } + if(workspace) { workspace->Fit(); } } void MainFrame::OnMoveClick(wxRibbonButtonBarEvent& event) @@ -273,9 +268,7 @@ void MainFrame::OnMoveClick(wxRibbonButtonBarEvent& event) // Set the move position to the average of selected elements. for(auto it = elementList.begin(), itEnd = elementList.end(); it != itEnd; ++it) { Element* element = *it; - if(element->IsSelected()) { - element->StartMove(averagePos); - } + if(element->IsSelected()) { element->StartMove(averagePos); } } workspace->SetWorkspaceMode(Workspace::MODE_MOVE_ELEMENT); } @@ -320,9 +313,7 @@ void MainFrame::OnPasteClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnPowerFlowClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->RunPowerFlow(); - } + if(workspace) { workspace->RunPowerFlow(); } } void MainFrame::OnRedoClick(wxRibbonButtonBarEvent& event) {} @@ -330,17 +321,13 @@ void MainFrame::OnResetVoltagesClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnRunStabilityClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->RunStability(); - } + if(workspace) { workspace->RunStability(); } } void MainFrame::OnSCPowerClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->RunSCPower(); - } + if(workspace) { workspace->RunSCPower(); } } void MainFrame::OnSaveAsClick(wxRibbonButtonBarEvent& event) @@ -476,6 +463,31 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) } } } + +void MainFrame::OnImportClick(wxRibbonButtonBarEvent& event) +{ + // Create a new workspace to import + Workspace* impWorkspace = new Workspace(this, _("Imported project"), this->GetStatusBar(), m_sharedGLContext); + ImportForm importForm(this, impWorkspace); + if(importForm.ShowModal() == wxID_OK) { + // Import file(s) + EnableCurrentProjectRibbon(); + + if(!m_sharedGLContext) m_sharedGLContext = impWorkspace->GetOpenGLContext(); + m_workspaceList.push_back(impWorkspace); + + m_ribbonButtonBarContinuous->ToggleButton(ID_RIBBON_DISABLESOL, true); + m_ribbonButtonBarContinuous->ToggleButton(ID_RIBBON_ENABLESOL, false); + + m_auiNotebook->AddPage(impWorkspace, impWorkspace->GetName(), true); + m_auiNotebook->Layout(); + impWorkspace->Redraw(); + impWorkspace->SetJustOpened(true); + impWorkspace->Fit(); + m_projectNumber++; + } +} + void MainFrame::NotebookPageClosed(wxAuiNotebookEvent& event) { if(m_auiNotebook->GetPageCount() == 0) EnableCurrentProjectRibbon(false); @@ -501,17 +513,13 @@ void MainFrame::NotebookPageClosing(wxAuiNotebookEvent& event) void MainFrame::OnRotClockClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->RotateSelectedElements(); - } + if(workspace) { workspace->RotateSelectedElements(); } } void MainFrame::OnRotCounterClockClick(wxRibbonButtonBarEvent& event) { Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage()); - if(workspace) { - workspace->RotateSelectedElements(false); - } + if(workspace) { workspace->RotateSelectedElements(false); } } void MainFrame::OnGeneralSettingsClick(wxRibbonButtonBarEvent& event) diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 9d0aede..58e4824 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -23,7 +23,7 @@ #include <wx/filedlg.h> #include <wx/glcanvas.h> -#include "base/MainFrameBase.h" +#include "MainFrameBase.h" class MainFrameBase; class wxRibbonMetroArtProvider; @@ -35,6 +35,7 @@ class PropertiesData; class ChartView; class DataReport; class AboutForm; +class ImportForm; enum { ID_ADDMENU_BUS = 20000, @@ -94,7 +95,7 @@ class MainFrame : public MainFrameBase virtual void OnDragClick(wxRibbonButtonBarEvent& event); virtual void OnEnableSolutionClick(wxRibbonButtonBarEvent& event); virtual void OnExitClick(wxRibbonButtonBarEvent& event) { this->Close(); }; - virtual void OnExpImpClick(wxRibbonButtonBarEvent& event); + //virtual void OnExpImpClick(wxRibbonButtonBarEvent& event); virtual void OnFaultClick(wxRibbonButtonBarEvent& event); virtual void OnFitClick(wxRibbonButtonBarEvent& event); virtual void OnMoveClick(wxRibbonButtonBarEvent& event); @@ -111,6 +112,7 @@ class MainFrame : public MainFrameBase virtual void OnSnapshotClick(wxRibbonButtonBarEvent& event); virtual void OnUndoClick(wxRibbonButtonBarEvent& event); virtual void OnNewClick(wxRibbonButtonBarEvent& event); + virtual void OnImportClick(wxRibbonButtonBarEvent& event); std::vector<Workspace*> m_workspaceList; int m_projectNumber = 1; diff --git a/Project/MainFrame.wxcp b/Project/MainFrame.wxcp index ee0d33c..ef60bcc 100644 --- a/Project/MainFrame.wxcp +++ b/Project/MainFrame.wxcp @@ -1,7 +1,7 @@ { "metadata": { - "m_generatedFilesDir": "base/", - "m_objCounter": 150, + "m_generatedFilesDir": ".", + "m_objCounter": 151, "m_includeFiles": [], "m_bitmapFunction": "wxC9ED9InitBitmapResources", "m_bitmapsFile": "MainFrameBitmaps.cpp", @@ -665,6 +665,97 @@ "m_properties": [{ "type": "winid", "m_label": "ID:", + "m_winid": "ID_RIBBON_IMPORT" + }, { + "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_ribbonButtonImport" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "Import data" + }, { + "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": "Import" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "data/images/ribbon/imp32.png" + }, { + "type": "string", + "m_label": "Help String:", + "m_value": "Open saved project" + }, { + "type": "choice", + "m_label": "Kind:", + "m_selection": 0, + "m_options": ["wxRIBBON_BUTTON_NORMAL", "wxRIBBON_BUTTON_DROPDOWN", "wxRIBBON_BUTTON_HYBRID", "wxRIBBON_BUTTON_TOGGLE"] + }], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_RIBBONBUTTON_CLICKED", + "m_eventClass": "wxRibbonButtonBarEvent", + "m_eventHandler": "wxRibbonButtonBarEventHandler", + "m_functionNameAndSignature": "OnImportClick(wxRibbonButtonBarEvent& event)", + "m_description": "Triggered when the normal (non-dropdown) region of a button on the button bar is clicked.", + "m_noBody": false + }], + "m_children": [] + }, { + "m_type": 4492, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", "m_winid": "ID_RIBBON_GENSETTINGS" }, { "type": "string", diff --git a/Project/base/MainFrameBase.cpp b/Project/MainFrameBase.cpp index bcac269..ac91ff5 100644 --- a/Project/base/MainFrameBase.cpp +++ b/Project/MainFrameBase.cpp @@ -83,6 +83,8 @@ MainFrameBase::MainFrameBase(wxWindow* parent, wxWindowID id, const wxString& ti m_ribbonButtonBarProjects->AddButton(ID_RIBBON_OPEN, _("Open"), wxXmlResource::Get()->LoadBitmap(wxT("open32")), _("Open saved project"), wxRIBBON_BUTTON_NORMAL); + m_ribbonButtonBarProjects->AddButton(ID_RIBBON_IMPORT, _("Import"), wxXmlResource::Get()->LoadBitmap(wxT("imp32")), _("Open saved project"), wxRIBBON_BUTTON_NORMAL); + m_ribbonButtonBarProjects->AddButton(ID_RIBBON_GENSETTINGS, _("General Settings"), wxXmlResource::Get()->LoadBitmap(wxT("settings32")), _("Opens a dialog to set the main settings of the program"), wxRIBBON_BUTTON_NORMAL); m_ribbonButtonBarProjects->AddButton(ID_RIBBON_EXIT, _("Exit"), wxXmlResource::Get()->LoadBitmap(wxT("exit32")), _("Closes the application"), wxRIBBON_BUTTON_NORMAL); @@ -238,6 +240,7 @@ MainFrameBase::MainFrameBase(wxWindow* parent, wxWindowID id, const wxString& ti // Connect events m_ribbonButtonBarProjects->Connect(ID_RIBBON_NEW, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnNewClick), NULL, this); m_ribbonButtonBarProjects->Connect(ID_RIBBON_OPEN, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnOpenClick), NULL, this); + m_ribbonButtonBarProjects->Connect(ID_RIBBON_IMPORT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnImportClick), NULL, this); m_ribbonButtonBarProjects->Connect(ID_RIBBON_GENSETTINGS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnGeneralSettingsClick), NULL, this); m_ribbonButtonBarProjects->Connect(ID_RIBBON_EXIT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnExitClick), NULL, this); m_ribbonButtonBarCProject->Connect(ID_RIBBON_SAVE, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnSaveClick), NULL, this); @@ -276,6 +279,7 @@ MainFrameBase::~MainFrameBase() { m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_NEW, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnNewClick), NULL, this); m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_OPEN, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnOpenClick), NULL, this); + m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_IMPORT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnImportClick), NULL, this); m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_GENSETTINGS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnGeneralSettingsClick), NULL, this); m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_EXIT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnExitClick), NULL, this); m_ribbonButtonBarCProject->Disconnect(ID_RIBBON_SAVE, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnSaveClick), NULL, this); diff --git a/Project/base/MainFrameBase.h b/Project/MainFrameBase.h index 1886036..0b3dc45 100644 --- a/Project/base/MainFrameBase.h +++ b/Project/MainFrameBase.h @@ -46,34 +46,35 @@ public: ID_RIBBON_FAULT = 10002, ID_RIBBON_RUNSTAB = 10003, ID_RIBBON_POWERFLOW = 10004, - ID_RIBBON_RESETVOLT = 10005, - ID_RIBBON_DISABLESOL = 10006, - ID_RIBBON_ENABLESOL = 10007, - ID_RIBBON_CHARTS = 10008, - ID_RIBBON_COPY = 10009, - ID_RIBBON_ABOUT = 10010, - ID_RIBBON_SNAPSHOT = 10011, - ID_RIBBON_PASTE = 10012, - ID_RIBBON_ADDELEMENT = 10013, - ID_RIBBON_GUIDE = 10014, - ID_RIBBON_CLOSE = 10015, - ID_RIBBON_SAVEAS = 10016, - ID_RIBBON_OPEN = 10017, - ID_RIBBON_GENSETTINGS = 10018, - ID_RIBBON_FIT = 10019, - ID_RIBBON_SIMULSETTINGS = 10020, - ID_RIBBON_UNDO = 10021, - ID_RIBBON_REDO = 10022, - ID_RIBBON_ROTATECC = 10023, - ID_RIBBON_EXIT = 10024, - ID_RIBBON_DRAG = 10025, - ID_RIBBON_SAVE = 10026, - ID_RIBBON_NEW = 10027, - ID_RIBBON_MOVE = 10028, - ID_RIBBON_PROJSETTINGS = 10029, - ID_RIBBON_DELETE = 10030, - ID_RIBBON_ROTATEC = 10031, - ID_RIBBON_DATAREPORT = 10032, + ID_RIBBON_DISABLESOL = 10005, + ID_RIBBON_ENABLESOL = 10006, + ID_RIBBON_SNAPSHOT = 10007, + ID_RIBBON_PROJSETTINGS = 10008, + ID_RIBBON_CHARTS = 10009, + ID_RIBBON_ROTATEC = 10010, + ID_RIBBON_SIMULSETTINGS = 10011, + ID_RIBBON_DATAREPORT = 10012, + ID_RIBBON_FIT = 10013, + ID_RIBBON_MOVE = 10014, + ID_RIBBON_SAVE = 10015, + ID_RIBBON_EXIT = 10016, + ID_RIBBON_GENSETTINGS = 10017, + ID_RIBBON_SAVEAS = 10018, + ID_RIBBON_DRAG = 10019, + ID_RIBBON_RESETVOLT = 10020, + ID_RIBBON_NEW = 10021, + ID_RIBBON_OPEN = 10022, + ID_RIBBON_CLOSE = 10023, + ID_RIBBON_GUIDE = 10024, + ID_RIBBON_ABOUT = 10025, + ID_RIBBON_ROTATECC = 10026, + ID_RIBBON_IMPORT = 10027, + ID_RIBBON_COPY = 10028, + ID_RIBBON_DELETE = 10029, + ID_RIBBON_REDO = 10030, + ID_RIBBON_PASTE = 10031, + ID_RIBBON_UNDO = 10032, + ID_RIBBON_ADDELEMENT = 10033, }; protected: wxRibbonBar* m_ribbonBar; @@ -102,6 +103,7 @@ protected: protected: virtual void OnNewClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnOpenClick(wxRibbonButtonBarEvent& event) { event.Skip(); } + virtual void OnImportClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnGeneralSettingsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnExitClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnSaveClick(wxRibbonButtonBarEvent& event) { event.Skip(); } diff --git a/Project/base/MainFrameBitmaps.cpp b/Project/MainFrameBitmaps.cpp index 42f52fd..e21a35b 100644 --- a/Project/base/MainFrameBitmaps.cpp +++ b/Project/MainFrameBitmaps.cpp @@ -764,8 +764,47 @@ static unsigned char xml_res_file_12[] = { 138,213,184,157,255,111,233,106,246,127,200,29,191,29,255,3,97,2,5,212, 74,24,35,58,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_13 = 4246; +static size_t xml_res_size_13 = 760; static unsigned char xml_res_file_13[] = { +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, +0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,4,193,0,0,4,193,1,17,118,177,117,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,2,117,73,68,65,84,88,133,197,214,79,72, +20,81,28,192,241,239,155,93,214,178,40,91,18,81,195,130,214,139,183,16, +194,91,167,194,72,187,104,183,82,59,88,10,5,18,29,236,80,237,46,81,65,183, +2,65,48,180,162,32,219,254,128,10,81,68,80,212,33,84,232,207,169,164,75, +127,212,245,79,165,228,238,204,238,204,235,16,171,107,234,250,230,79,245, +187,189,223,204,111,230,195,239,189,55,111,4,0,225,161,16,194,122,133,203, +40,20,223,56,99,117,221,62,30,238,109,85,173,241,3,224,179,124,88,108,114, +11,208,164,164,85,139,181,136,72,253,218,99,103,99,77,74,53,0,232,115,26, +41,221,237,251,1,240,97,209,34,238,53,118,68,234,174,171,3,0,204,20,94, +34,142,138,251,135,58,162,245,55,212,1,25,68,218,240,4,161,97,209,34,239, +30,236,142,212,246,170,3,224,55,192,35,132,16,146,70,250,15,244,68,107, +238,168,3,20,17,229,193,53,84,22,231,83,89,156,79,40,152,151,19,209,32, +7,234,123,34,53,49,117,128,2,226,202,222,50,6,155,43,24,108,174,224,114, +117,89,78,172,16,146,6,49,80,119,53,186,191,79,29,160,128,176,19,2,201, +97,250,106,186,163,181,253,234,128,191,128,104,162,111,223,173,232,158, +71,153,156,95,169,50,3,240,7,114,222,54,73,1,219,229,131,101,95,92,192, +108,118,106,119,225,133,19,161,137,83,213,35,106,0,69,132,137,198,71,74, +21,159,103,10,80,153,130,63,17,30,77,71,38,212,59,144,141,240,48,236,117, +32,11,97,232,201,255,8,0,82,134,65,50,233,30,97,127,10,178,66,215,221,31, +94,142,59,144,141,72,25,206,33,174,1,0,134,174,59,94,156,158,0,0,199,91, +212,59,128,67,132,173,69,88,178,33,192,145,29,155,1,8,5,23,190,136,229, +193,60,194,187,74,0,232,28,158,100,52,97,172,250,217,206,132,173,14,124, +157,49,216,89,186,142,182,170,34,182,110,92,248,7,216,86,144,71,91,85,17, +85,91,214,51,54,107,216,234,132,237,41,104,127,242,25,83,202,37,121,83, +74,78,62,254,196,252,21,69,132,109,192,155,241,4,55,223,78,47,201,95,123, +61,197,187,120,98,113,82,1,225,104,17,158,123,54,202,140,110,206,143,127, +36,77,206,63,31,93,254,230,85,16,142,0,241,159,41,46,189,28,159,31,95,124, +49,198,228,92,122,229,130,28,8,199,219,176,115,40,206,135,233,36,239,167, +146,116,13,79,172,94,176,2,194,241,89,96,152,146,211,79,191,96,73,72,89, +75,23,229,138,8,88,180,69,93,29,70,15,71,102,236,23,101,16,1,159,123,128, +227,72,27,32,165,182,0,48,53,19,172,239,255,22,33,76,128,95,176,208,9,84, +8,125,2,62,0,0,0,0,73,69,78,68,174,66,96,130}; + +static size_t xml_res_size_14 = 4246; +static unsigned char xml_res_file_14[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0, 0,0,195,62,97,203,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,14,225,0,0,14,225,1,42,185,74,121,0,0,0,25,116,69,88,116, @@ -972,8 +1011,8 @@ static unsigned char xml_res_file_13[] = { 113,78,66,0,113,78,66,0,113,206,255,3,145,115,236,65,132,111,52,203,0,0, 0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_14 = 629; -static unsigned char xml_res_file_14[] = { +static size_t xml_res_size_15 = 629; +static unsigned char xml_res_file_15[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, 0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,1,220,0,0,1,220,1,5,161,33,96,0,0,0,25,116,69,88,116,83,111, @@ -1005,8 +1044,8 @@ static unsigned char xml_res_file_14[] = { 42,164,212,231,205,174,120,202,213,174,243,63,218,64,171,61,237,173,51, 184,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_15 = 8746; -static unsigned char xml_res_file_15[] = { +static size_t xml_res_size_16 = 8746; +static unsigned char xml_res_file_16[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,1,0,0,0,1,0,8,6,0,0,0, 92,114,168,102,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,72, 89,115,0,0,29,195,0,0,29,195,1,143,57,51,30,0,0,0,25,116,69,88,116,83,111, @@ -1435,8 +1474,8 @@ static unsigned char xml_res_file_15[] = { 148,74,48,109,0,74,37,152,54,0,165,18,76,27,128,82,9,246,255,1,12,204,192, 135,186,54,132,175,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_16 = 1184; -static unsigned char xml_res_file_16[] = { +static size_t xml_res_size_17 = 1184; +static unsigned char xml_res_file_17[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,3,184,0,0,3,184,1,3,78,7,200,0,0,0,25,116,69,88,116,83,111, @@ -1495,8 +1534,8 @@ static unsigned char xml_res_file_16[] = { 27,185,76,85,185,216,31,47,171,113,41,253,167,117,53,251,63,108,198,111, 199,255,0,65,159,207,163,152,64,70,71,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_17 = 2289; -static unsigned char xml_res_file_17[] = { +static size_t xml_res_size_18 = 2289; +static unsigned char xml_res_file_18[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,64,0,0,0,64,8,6,0,0, 0,170,105,113,222,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,7,113,0,0,7,113,1,220,215,168,124,0,0,0,25,116,69,88,116, @@ -1608,8 +1647,8 @@ static unsigned char xml_res_file_17[] = { 153,255,55,238,250,239,6,191,73,64,67,59,208,208,220,245,9,248,47,129,162, 138,91,51,247,7,138,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_18 = 1387; -static unsigned char xml_res_file_18[] = { +static size_t xml_res_size_19 = 1387; +static unsigned char xml_res_file_19[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,196,0,0,4,196,1,60,204,212,131,0,0,0,25,116,69,88,116,83, @@ -1678,8 +1717,8 @@ static unsigned char xml_res_file_18[] = { 101,229,39,141,62,207,255,3,52,228,253,72,11,53,84,78,0,0,0,0,73,69,78, 68,174,66,96,130}; -static size_t xml_res_size_19 = 834; -static unsigned char xml_res_file_19[] = { +static size_t xml_res_size_20 = 834; +static unsigned char xml_res_file_20[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,193,0,0,4,193,1,17,118,177,117,0,0,0,25,116,69,88,116,83, @@ -1721,8 +1760,8 @@ static unsigned char xml_res_file_19[] = { 82,150,72,50,157,133,177,57,249,3,235,9,253,190,72,67,151,122,0,0,0,0,73, 69,78,68,174,66,96,130}; -static size_t xml_res_size_20 = 544; -static unsigned char xml_res_file_20[] = { +static size_t xml_res_size_21 = 544; +static unsigned char xml_res_file_21[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,193,0,0,4,193,1,17,118,177,117,0,0,0,25,116,69,88,116,83, @@ -1749,8 +1788,8 @@ static unsigned char xml_res_file_20[] = { 129,136,31,208,66,252,230,231,167,52,59,37,60,61,150,99,69,100,167,4,224, 27,27,92,198,229,13,213,26,65,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_21 = 680; -static unsigned char xml_res_file_21[] = { +static size_t xml_res_size_22 = 680; +static unsigned char xml_res_file_22[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,68,0,0,4,68,1,25,255,88,16,0,0,0,25,116,69,88,116,83,111, @@ -1784,8 +1823,8 @@ static unsigned char xml_res_file_21[] = { 228,81,126,175,231,234,230,210,81,108,239,109,236,187,166,201,216,133,19, 45,128,63,147,180,205,25,132,236,135,65,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_22 = 934; -static unsigned char xml_res_file_22[] = { +static size_t xml_res_size_23 = 934; +static unsigned char xml_res_file_23[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,196,0,0,4,196,1,60,204,212,131,0,0,0,25,116,69,88,116,83, @@ -1832,8 +1871,8 @@ static unsigned char xml_res_file_22[] = { 188,96,189,170,254,1,114,143,78,253,94,211,73,63,204,123,223,0,202,222, 98,133,128,94,40,169,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_23 = 1152; -static unsigned char xml_res_file_23[] = { +static size_t xml_res_size_24 = 1152; +static unsigned char xml_res_file_24[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,196,0,0,4,196,1,60,204,212,131,0,0,0,25,116,69,88,116,83, @@ -1891,8 +1930,8 @@ static unsigned char xml_res_file_23[] = { 239,128,186,140,71,190,23,191,207,204,36,239,127,184,206,178,106,141,44, 108,8,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_24 = 637; -static unsigned char xml_res_file_24[] = { +static size_t xml_res_size_25 = 637; +static unsigned char xml_res_file_25[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,6,40,0,0,6,40,1,59,154,118,221,0,0,0,25,116,69,88,116,83, @@ -1925,8 +1964,8 @@ static unsigned char xml_res_file_24[] = { 99,128,162,1,254,2,87,167,156,99,57,199,119,147,0,0,0,0,73,69,78,68,174, 66,96,130}; -static size_t xml_res_size_25 = 708; -static unsigned char xml_res_file_25[] = { +static size_t xml_res_size_26 = 708; +static unsigned char xml_res_file_26[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,163,0,0,5,163,1,164,52,119,130,0,0,0,25,116,69,88,116,83, @@ -1962,8 +2001,8 @@ static unsigned char xml_res_file_25[] = { 143,76,0,195,36,223,106,159,63,132,231,183,174,19,196,144,63,0,0,0,0,73, 69,78,68,174,66,96,130}; -static size_t xml_res_size_26 = 915; -static unsigned char xml_res_file_26[] = { +static size_t xml_res_size_27 = 915; +static unsigned char xml_res_file_27[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,109,0,0,4,109,1,125,26,147,5,0,0,0,25,116,69,88,116,83, @@ -2009,8 +2048,8 @@ static unsigned char xml_res_file_26[] = { 239,136,213,133,111,102,88,205,181,31,221,164,248,13,195,123,60,251,33, 106,248,255,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_27 = 1139; -static unsigned char xml_res_file_27[] = { +static size_t xml_res_size_28 = 1139; +static unsigned char xml_res_file_28[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,63,0,0,5,63,1,19,100,100,172,0,0,0,25,116,69,88,116,83, @@ -2067,8 +2106,8 @@ static unsigned char xml_res_file_27[] = { 50,253,5,70,162,109,217,34,255,2,107,225,84,76,2,118,23,86,0,0,0,0,73,69, 78,68,174,66,96,130}; -static size_t xml_res_size_28 = 1110; -static unsigned char xml_res_file_28[] = { +static size_t xml_res_size_29 = 1110; +static unsigned char xml_res_file_29[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,59,0,0,5,59,1,236,153,227,190,0,0,0,25,116,69,88,116,83, @@ -2123,8 +2162,8 @@ static unsigned char xml_res_file_28[] = { 7,194,73,148,111,80,239,83,170,155,51,24,9,255,156,68,216,127,65,255,70, 162,172,242,156,128,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_29 = 555; -static unsigned char xml_res_file_29[] = { +static size_t xml_res_size_30 = 555; +static unsigned char xml_res_file_30[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,137,0,0,5,137,1,109,104,157,250,0,0,0,25,116,69,88,116, @@ -2152,8 +2191,8 @@ static unsigned char xml_res_file_29[] = { 208,3,244,74,121,255,72,134,71,142,100,14,25,147,66,98,227,246,202,248, 15,58,85,192,175,251,92,135,114,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_30 = 743; -static unsigned char xml_res_file_30[] = { +static size_t xml_res_size_31 = 743; +static unsigned char xml_res_file_31[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,186,0,0,5,186,1,27,237,141,201,0,0,0,25,116,69,88,116,83, @@ -2191,8 +2230,8 @@ static unsigned char xml_res_file_30[] = { 127,199,126,1,226,42,223,28,85,35,230,39,0,0,0,0,73,69,78,68,174,66,96, 130}; -static size_t xml_res_size_31 = 1110; -static unsigned char xml_res_file_31[] = { +static size_t xml_res_size_32 = 1110; +static unsigned char xml_res_file_32[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,4,198,0,0,4,198,1,67,50,23,10,0,0,0,25,116,69,88,116,83,111, @@ -2248,8 +2287,8 @@ static unsigned char xml_res_file_31[] = { 86,95,47,99,128,127,0,231,244,140,94,3,164,35,138,0,0,0,0,73,69,78,68,174, 66,96,130}; -static size_t xml_res_size_32 = 914; -static unsigned char xml_res_file_32[] = { +static size_t xml_res_size_33 = 914; +static unsigned char xml_res_file_33[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,7,0,0,5,7,1,236,210,93,151,0,0,0,25,116,69,88,116,83,111, @@ -2295,8 +2334,8 @@ static unsigned char xml_res_file_32[] = { 132,196,232,127,195,255,30,224,55,133,61,15,69,51,241,172,123,0,0,0,0,73, 69,78,68,174,66,96,130}; -static size_t xml_res_size_33 = 759; -static unsigned char xml_res_file_33[] = { +static size_t xml_res_size_34 = 759; +static unsigned char xml_res_file_34[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, 72,89,115,0,0,5,163,0,0,5,163,1,164,52,119,130,0,0,0,25,116,69,88,116,83, @@ -2334,8 +2373,8 @@ static unsigned char xml_res_file_33[] = { 125,92,181,157,226,96,91,87,53,118,180,232,47,234,15,114,76,236,98,147, 84,227,24,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_34 = 3670; -static unsigned char xml_res_file_34[] = { +static size_t xml_res_size_35 = 3769; +static unsigned char xml_res_file_35[] = { 60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, 110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, 115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, @@ -2409,113 +2448,118 @@ static unsigned char xml_res_file_34[] = { 100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,103, 117,105,100,101,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10, 32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105, -116,109,97,112,34,32,110,97,109,101,61,34,108,111,103,111,49,50,56,34,62, -77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112, -36,100,97,116,97,95,105,109,97,103,101,115,95,108,111,103,111,49,50,56, -46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101, -99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110, -97,109,101,61,34,108,111,103,111,49,54,34,62,77,97,105,110,70,114,97,109, -101,66,105,116,109,97,112,115,46,99,112,112,36,100,97,116,97,95,105,109, -97,103,101,115,95,108,111,103,111,49,54,46,112,110,103,60,47,111,98,106, -101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, -34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,108,111,103, -111,50,53,54,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112, -115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,108,111, -103,111,50,53,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32, -60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116, -109,97,112,34,32,110,97,109,101,61,34,108,111,103,111,51,50,34,62,77,97, +116,109,97,112,34,32,110,97,109,101,61,34,105,109,112,51,50,34,62,77,97, 105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100, -97,116,97,95,105,109,97,103,101,115,95,108,111,103,111,51,50,46,112,110, +97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,105,109, +112,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111, +98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97, +112,34,32,110,97,109,101,61,34,108,111,103,111,49,50,56,34,62,77,97,105, +110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97, +116,97,95,105,109,97,103,101,115,95,108,111,103,111,49,50,56,46,112,110, 103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32, 99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109, -101,61,34,108,111,103,111,54,52,34,62,77,97,105,110,70,114,97,109,101,66, +101,61,34,108,111,103,111,49,54,34,62,77,97,105,110,70,114,97,109,101,66, 105,116,109,97,112,115,46,99,112,112,36,100,97,116,97,95,105,109,97,103, -101,115,95,108,111,103,111,54,52,46,112,110,103,60,47,111,98,106,101,99, +101,115,95,108,111,103,111,49,54,46,112,110,103,60,47,111,98,106,101,99, 116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119, -120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,111,118,101,51, -50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99, -112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111, -110,95,109,111,118,101,51,50,46,112,110,103,60,47,111,98,106,101,99,116, -62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120, -66,105,116,109,97,112,34,32,110,97,109,101,61,34,110,101,119,51,50,34,62, +120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,108,111,103,111,50, +53,54,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46, +99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,108,111,103,111, +50,53,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111, +98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97, +112,34,32,110,97,109,101,61,34,108,111,103,111,51,50,34,62,77,97,105,110, +70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97,116, +97,95,105,109,97,103,101,115,95,108,111,103,111,51,50,46,112,110,103,60, +47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108, +97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61, +34,108,111,103,111,54,52,34,62,77,97,105,110,70,114,97,109,101,66,105,116, +109,97,112,115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115, +95,108,111,103,111,54,52,46,112,110,103,60,47,111,98,106,101,99,116,62, +10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66, +105,116,109,97,112,34,32,110,97,109,101,61,34,109,111,118,101,51,50,34, +62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112, +112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110, +95,109,111,118,101,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62, +10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66, +105,116,109,97,112,34,32,110,97,109,101,61,34,110,101,119,51,50,34,62,77, +97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36, +100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,110, +101,119,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, +111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109, +97,112,34,32,110,97,109,101,61,34,111,112,101,110,51,50,34,62,77,97,105, +110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97, +116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,111,112,101, +110,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111, +98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97, +112,34,32,110,97,109,101,61,34,112,97,115,116,101,51,50,34,62,77,97,105, +110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97, +116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,112,97,115, +116,101,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, +111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109, +97,112,34,32,110,97,109,101,61,34,112,97,117,115,101,83,116,111,112,112, +101,100,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112, +115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105, +98,98,111,110,95,112,97,117,115,101,83,116,111,112,112,101,100,51,50,46, +112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99, +116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110, +97,109,101,61,34,112,108,97,121,83,116,111,112,112,101,100,51,50,34,62, 77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112, 36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95, -110,101,119,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32, -60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116, -109,97,112,34,32,110,97,109,101,61,34,111,112,101,110,51,50,34,62,77,97, -105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100, -97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,111,112, -101,110,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, -111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109, -97,112,34,32,110,97,109,101,61,34,112,97,115,116,101,51,50,34,62,77,97, -105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100, -97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,112,97, -115,116,101,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32, -60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116, -109,97,112,34,32,110,97,109,101,61,34,112,97,117,115,101,83,116,111,112, -112,101,100,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109, -97,112,115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95, -114,105,98,98,111,110,95,112,97,117,115,101,83,116,111,112,112,101,100, +112,108,97,121,83,116,111,112,112,101,100,51,50,46,112,110,103,60,47,111, +98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,112, +111,119,101,114,70,76,111,119,51,50,34,62,77,97,105,110,70,114,97,109,101, +66,105,116,109,97,112,115,46,99,112,112,36,100,97,116,97,95,105,109,97, +103,101,115,95,114,105,98,98,111,110,95,112,111,119,101,114,70,76,111,119, 51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98, 106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112, -34,32,110,97,109,101,61,34,112,108,97,121,83,116,111,112,112,101,100,51, +34,32,110,97,109,101,61,34,114,101,100,111,51,50,34,62,77,97,105,110,70, +114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97,116,97, +95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,114,101,100,111,51, +50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106, +101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34, +32,110,97,109,101,61,34,114,101,115,101,116,51,50,34,62,77,97,105,110,70, +114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97,116,97, +95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,114,101,115,101,116, +51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98, +106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112, +34,32,110,97,109,101,61,34,114,111,116,97,116,101,67,108,111,99,107,51, 50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99, 112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111, -110,95,112,108,97,121,83,116,111,112,112,101,100,51,50,46,112,110,103,60, +110,95,114,111,116,97,116,101,67,108,111,99,107,51,50,46,112,110,103,60, 47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108, 97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61, -34,112,111,119,101,114,70,76,111,119,51,50,34,62,77,97,105,110,70,114,97, -109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97,116,97,95,105, -109,97,103,101,115,95,114,105,98,98,111,110,95,112,111,119,101,114,70,76, -111,119,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, +34,114,111,116,97,116,101,67,111,117,110,116,101,114,67,108,111,99,107, +51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46, +99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98, +111,110,95,114,111,116,97,116,101,67,111,117,110,116,101,114,67,108,111, +99,107,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, 111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109, -97,112,34,32,110,97,109,101,61,34,114,101,100,111,51,50,34,62,77,97,105, +97,112,34,32,110,97,109,101,61,34,115,97,118,101,51,50,34,62,77,97,105, 110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97, -116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,114,101,100, -111,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111, +116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,115,97,118, +101,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111, 98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97, -112,34,32,110,97,109,101,61,34,114,101,115,101,116,51,50,34,62,77,97,105, -110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100,97, -116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,114,101,115, -101,116,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, -111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109, -97,112,34,32,110,97,109,101,61,34,114,111,116,97,116,101,67,108,111,99, -107,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115, -46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98, -98,111,110,95,114,111,116,97,116,101,67,108,111,99,107,51,50,46,112,110, -103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32, -99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109, -101,61,34,114,111,116,97,116,101,67,111,117,110,116,101,114,67,108,111, -99,107,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112, -115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105, -98,98,111,110,95,114,111,116,97,116,101,67,111,117,110,116,101,114,67,108, -111,99,107,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32, -60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116, -109,97,112,34,32,110,97,109,101,61,34,115,97,118,101,51,50,34,62,77,97, +112,34,32,110,97,109,101,61,34,115,97,118,101,65,115,51,50,34,62,77,97, 105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36,100, 97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,115,97, -118,101,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60, -111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109, -97,112,34,32,110,97,109,101,61,34,115,97,118,101,65,115,51,50,34,62,77, -97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99,112,112,36, -100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111,110,95,115, -97,118,101,65,115,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10, -32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105, -116,109,97,112,34,32,110,97,109,101,61,34,115,101,116,116,105,110,103,115, +118,101,65,115,51,50,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32, +32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116, +109,97,112,34,32,110,97,109,101,61,34,115,101,116,116,105,110,103,115,51, +50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46,99, +112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98,111, +110,95,115,101,116,116,105,110,103,115,51,50,46,112,110,103,60,47,111,98, +106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, +61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,115,110, +97,112,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112, +115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105, +98,98,111,110,95,115,110,97,112,51,50,46,112,110,103,60,47,111,98,106,101, +99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34, +119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,117,110,100,111, 51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115,46, 99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98,98, -111,110,95,115,101,116,116,105,110,103,115,51,50,46,112,110,103,60,47,111, -98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115, -115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,115, -110,97,112,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97, -112,115,46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114, -105,98,98,111,110,95,115,110,97,112,51,50,46,112,110,103,60,47,111,98,106, -101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, -34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,117,110,100, -111,51,50,34,62,77,97,105,110,70,114,97,109,101,66,105,116,109,97,112,115, -46,99,112,112,36,100,97,116,97,95,105,109,97,103,101,115,95,114,105,98, -98,111,110,95,117,110,100,111,51,50,46,112,110,103,60,47,111,98,106,101, -99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10}; +111,110,95,117,110,100,111,51,50,46,112,110,103,60,47,111,98,106,101,99, +116,62,10,60,47,114,101,115,111,117,114,99,101,62,10}; void wxC9ED9InitBitmapResources() { @@ -2543,27 +2587,28 @@ void wxC9ED9InitBitmapResources() XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_faultPower32.png"), xml_res_file_10, xml_res_size_10, wxT("image/png")); XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_fit32.png"), xml_res_file_11, xml_res_size_11, wxT("image/png")); XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_guide32.png"), xml_res_file_12, xml_res_size_12, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo128.png"), xml_res_file_13, xml_res_size_13, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo16.png"), xml_res_file_14, xml_res_size_14, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo256.png"), xml_res_file_15, xml_res_size_15, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo32.png"), xml_res_file_16, xml_res_size_16, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo64.png"), xml_res_file_17, xml_res_size_17, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_move32.png"), xml_res_file_18, xml_res_size_18, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_new32.png"), xml_res_file_19, xml_res_size_19, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_open32.png"), xml_res_file_20, xml_res_size_20, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_paste32.png"), xml_res_file_21, xml_res_size_21, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_pauseStopped32.png"), xml_res_file_22, xml_res_size_22, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_playStopped32.png"), xml_res_file_23, xml_res_size_23, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_powerFLow32.png"), xml_res_file_24, xml_res_size_24, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_redo32.png"), xml_res_file_25, xml_res_size_25, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_reset32.png"), xml_res_file_26, xml_res_size_26, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_rotateClock32.png"), xml_res_file_27, xml_res_size_27, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_rotateCounterClock32.png"), xml_res_file_28, xml_res_size_28, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_save32.png"), xml_res_file_29, xml_res_size_29, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_saveAs32.png"), xml_res_file_30, xml_res_size_30, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_settings32.png"), xml_res_file_31, xml_res_size_31, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_snap32.png"), xml_res_file_32, xml_res_size_32, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_undo32.png"), xml_res_file_33, xml_res_size_33, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_MainFrameBitmaps.xrc"), xml_res_file_34, xml_res_size_34, wxT("text/xml")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_imp32.png"), xml_res_file_13, xml_res_size_13, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo128.png"), xml_res_file_14, xml_res_size_14, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo16.png"), xml_res_file_15, xml_res_size_15, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo256.png"), xml_res_file_16, xml_res_size_16, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo32.png"), xml_res_file_17, xml_res_size_17, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_logo64.png"), xml_res_file_18, xml_res_size_18, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_move32.png"), xml_res_file_19, xml_res_size_19, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_new32.png"), xml_res_file_20, xml_res_size_20, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_open32.png"), xml_res_file_21, xml_res_size_21, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_paste32.png"), xml_res_file_22, xml_res_size_22, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_pauseStopped32.png"), xml_res_file_23, xml_res_size_23, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_playStopped32.png"), xml_res_file_24, xml_res_size_24, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_powerFLow32.png"), xml_res_file_25, xml_res_size_25, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_redo32.png"), xml_res_file_26, xml_res_size_26, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_reset32.png"), xml_res_file_27, xml_res_size_27, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_rotateClock32.png"), xml_res_file_28, xml_res_size_28, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_rotateCounterClock32.png"), xml_res_file_29, xml_res_size_29, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_save32.png"), xml_res_file_30, xml_res_size_30, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_saveAs32.png"), xml_res_file_31, xml_res_size_31, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_settings32.png"), xml_res_file_32, xml_res_size_32, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_snap32.png"), xml_res_file_33, xml_res_size_33, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$data_images_ribbon_undo32.png"), xml_res_file_34, xml_res_size_34, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/MainFrameBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_MainFrameBitmaps.xrc"), xml_res_file_35, xml_res_size_35, wxT("text/xml")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/MainFrameBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_MainFrameBitmaps.xrc")); } diff --git a/Project/MainFrameBitmaps.xrc b/Project/MainFrameBitmaps.xrc index 83f5979..8f58aaf 100644 --- a/Project/MainFrameBitmaps.xrc +++ b/Project/MainFrameBitmaps.xrc @@ -14,6 +14,7 @@ <object class="wxBitmap" name="faultPower32">data\images\ribbon\faultPower32.png</object> <object class="wxBitmap" name="fit32">data\images\ribbon\fit32.png</object> <object class="wxBitmap" name="guide32">data\images\ribbon\guide32.png</object> + <object class="wxBitmap" name="imp32">data\images\ribbon\imp32.png</object> <object class="wxBitmap" name="logo128">data\images\logo128.png</object> <object class="wxBitmap" name="logo16">data\images\logo16.png</object> <object class="wxBitmap" name="logo256">data\images\logo256.png</object> diff --git a/Project/MathExpression.cpp b/Project/MathExpression.cpp index 0577c32..1657880 100644 --- a/Project/MathExpression.cpp +++ b/Project/MathExpression.cpp @@ -175,10 +175,7 @@ bool MathExpression::Solve(double* input, double timeStep) for(auto itCN = nodeList.begin(), itCNEnd = nodeList.end(); itCN != itCNEnd; ++itCN) { Node* childNode = *itCN; if(childNode == node) { - if(!cLine->IsSolved()) - m_inputValues[i] = 0.0; - else - m_inputValues[i] = cLine->GetValue(); + m_inputValues[i] = cLine->GetValue(); break; } } diff --git a/Project/MathExpressionForm.h b/Project/MathExpressionForm.h index c0ff4b9..3c549ee 100644 --- a/Project/MathExpressionForm.h +++ b/Project/MathExpressionForm.h @@ -18,7 +18,7 @@ #ifndef MATHEXPRESSIONFORM_H #define MATHEXPRESSIONFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" #include <wx/msgdlg.h> class MathExpression; diff --git a/Project/PowerFlow.cpp b/Project/PowerFlow.cpp index 4a2b7c9..bafbbfb 100644 --- a/Project/PowerFlow.cpp +++ b/Project/PowerFlow.cpp @@ -26,6 +26,7 @@ bool PowerFlow::RunGaussSeidel(double systemPowerBase, double initAngle, double accFactor) { + double radInitAngle = wxDegToRad(initAngle); // Calculate the Ybus. if(!GetYBus(m_yBus, systemPowerBase)) { m_errorMsg = _("No buses found on the system."); @@ -73,9 +74,10 @@ bool PowerFlow::RunGaussSeidel(double systemPowerBase, // Fill the voltages array if(data.isVoltageControlled && busType[busNumber] != BUS_PQ) { - voltage.push_back(std::complex<double>(data.controlledVoltage, 0.0)); + voltage.push_back(std::complex<double>(data.controlledVoltage * std::cos(radInitAngle), + data.controlledVoltage * std::sin(radInitAngle))); } else { - voltage.push_back(std::complex<double>(1.0, 0.0)); + voltage.push_back(std::complex<double>(std::cos(radInitAngle), std::sin(radInitAngle))); } // Fill the power array diff --git a/Project/Project.mk b/Project/Project.mk deleted file mode 100644 index 451b5d7..0000000 --- a/Project/Project.mk +++ /dev/null @@ -1,856 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Release_Windows_x64 -ProjectName :=Project -ConfigurationName :=Release_Windows_x64 -WorkspacePath :=C:/Users/NDSE-69/Documents/GitHub/PSP -ProjectPath :=C:/Users/NDSE-69/Documents/GitHub/PSP/Project -IntermediateDirectory :=./Release_Windows_x64 -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=NDSE-69 -Date :=19/03/2018 -CodeLitePath :="C:/Program Files/CodeLite" -LinkerName :=C:/TDM-GCC-64/bin/g++.exe -SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.i -DebugSwitch :=-g -IncludeSwitch :=-I -LibrarySwitch :=-l -OutputSwitch :=-o -LibraryPathSwitch :=-L -PreprocessorSwitch :=-D -SourceSwitch :=-c -OutputFile :=$(IntermediateDirectory)/pspufu -Preprocessors :=$(PreprocessorSwitch)NDEBUG $(PreprocessorSwitch)UNICODE -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="Project.txt" -PCHCompileFlags := -MakeDirCommand :=makedir -RcCmpOptions := $(shell wx-config --rcflags) -RcCompilerName :=C:/TDM-GCC-64/bin/windres.exe -LinkOptions := $(shell wx-config --libs std,ribbon,aui,propgrid,richtext,gl) -mwindows -IncludePath := $(IncludeSwitch). $(IncludeSwitch). -IncludePCH := -RcIncludePath := -Libs := -ArLibs := -LibPath := $(LibraryPathSwitch). - -## -## Common variables -## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables -## -AR := C:/TDM-GCC-64/bin/ar.exe rcu -CXX := C:/TDM-GCC-64/bin/g++.exe -CC := C:/TDM-GCC-64/bin/gcc.exe -CXXFLAGS := -O2 -Wall $(shell wx-config --cflags) -std=gnu++11 $(Preprocessors) -CFLAGS := -O2 -Wall $(Preprocessors) -ASFLAGS := -AS := C:/TDM-GCC-64/bin/as.exe - - -## -## User defined environment variables -## -CodeLiteDir:=C:\Program Files\CodeLite -WXWIN:=C:\wxWidgets-3.1.0 -WXCFG:=gcc_dll\mswu -Objects0=$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/XMLParser.cpp$(ObjectSuffix) $(IntermediateDirectory)/fparser_fpoptimizer.cc$(ObjectSuffix) \ - $(IntermediateDirectory)/fparser_fparser.cc$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Divider.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExprParser.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) - -Objects1=$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExpression.cpp$(ObjectSuffix) $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/AboutForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExpressionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) - - - -Objects=$(Objects0) $(Objects1) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs -all: $(OutputFile) - -$(OutputFile): $(IntermediateDirectory)/.d $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects0) > $(ObjectsFileList) - @echo $(Objects1) >> $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -MakeIntermediateDirs: - @$(MakeDirCommand) "./Release_Windows_x64" - - -$(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Release_Windows_x64" - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix): TransformerForm.cpp $(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransformerForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix): TransformerForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix) -MM TransformerForm.cpp - -$(IntermediateDirectory)/TransformerForm.cpp$(PreprocessSuffix): TransformerForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TransformerForm.cpp$(PreprocessSuffix) TransformerForm.cpp - -$(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix): ElementPlotData.cpp $(IntermediateDirectory)/ElementPlotData.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementPlotData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ElementPlotData.cpp$(DependSuffix): ElementPlotData.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementPlotData.cpp$(DependSuffix) -MM ElementPlotData.cpp - -$(IntermediateDirectory)/ElementPlotData.cpp$(PreprocessSuffix): ElementPlotData.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementPlotData.cpp$(PreprocessSuffix) ElementPlotData.cpp - -$(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix): ChartView.cpp $(IntermediateDirectory)/ChartView.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartView.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ChartView.cpp$(DependSuffix): ChartView.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartView.cpp$(DependSuffix) -MM ChartView.cpp - -$(IntermediateDirectory)/ChartView.cpp$(PreprocessSuffix): ChartView.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartView.cpp$(PreprocessSuffix) ChartView.cpp - -$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix): ElectricCalculation.cpp $(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElectricCalculation.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix): ElectricCalculation.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix) -MM ElectricCalculation.cpp - -$(IntermediateDirectory)/ElectricCalculation.cpp$(PreprocessSuffix): ElectricCalculation.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElectricCalculation.cpp$(PreprocessSuffix) ElectricCalculation.cpp - -$(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix): GainForm.cpp $(IntermediateDirectory)/GainForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GainForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/GainForm.cpp$(DependSuffix): GainForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GainForm.cpp$(DependSuffix) -MM GainForm.cpp - -$(IntermediateDirectory)/GainForm.cpp$(PreprocessSuffix): GainForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GainForm.cpp$(PreprocessSuffix) GainForm.cpp - -$(IntermediateDirectory)/Constant.cpp$(ObjectSuffix): Constant.cpp $(IntermediateDirectory)/Constant.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Constant.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Constant.cpp$(DependSuffix): Constant.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Constant.cpp$(DependSuffix) -MM Constant.cpp - -$(IntermediateDirectory)/Constant.cpp$(PreprocessSuffix): Constant.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Constant.cpp$(PreprocessSuffix) Constant.cpp - -$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix): Camera.cpp $(IntermediateDirectory)/Camera.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Camera.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Camera.cpp$(DependSuffix): Camera.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Camera.cpp$(DependSuffix) -MM Camera.cpp - -$(IntermediateDirectory)/Camera.cpp$(PreprocessSuffix): Camera.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Camera.cpp$(PreprocessSuffix) Camera.cpp - -$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix): wxMathPlot/mathplot.cpp $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/wxMathPlot/mathplot.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix): wxMathPlot/mathplot.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix) -MM wxMathPlot/mathplot.cpp - -$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(PreprocessSuffix): wxMathPlot/mathplot.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(PreprocessSuffix) wxMathPlot/mathplot.cpp - -$(IntermediateDirectory)/XMLParser.cpp$(ObjectSuffix): XMLParser.cpp $(IntermediateDirectory)/XMLParser.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/XMLParser.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/XMLParser.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/XMLParser.cpp$(DependSuffix): XMLParser.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/XMLParser.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/XMLParser.cpp$(DependSuffix) -MM XMLParser.cpp - -$(IntermediateDirectory)/XMLParser.cpp$(PreprocessSuffix): XMLParser.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/XMLParser.cpp$(PreprocessSuffix) XMLParser.cpp - -$(IntermediateDirectory)/fparser_fpoptimizer.cc$(ObjectSuffix): fparser/fpoptimizer.cc $(IntermediateDirectory)/fparser_fpoptimizer.cc$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/fparser/fpoptimizer.cc" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/fparser_fpoptimizer.cc$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/fparser_fpoptimizer.cc$(DependSuffix): fparser/fpoptimizer.cc - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fparser_fpoptimizer.cc$(ObjectSuffix) -MF$(IntermediateDirectory)/fparser_fpoptimizer.cc$(DependSuffix) -MM fparser/fpoptimizer.cc - -$(IntermediateDirectory)/fparser_fpoptimizer.cc$(PreprocessSuffix): fparser/fpoptimizer.cc - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fparser_fpoptimizer.cc$(PreprocessSuffix) fparser/fpoptimizer.cc - -$(IntermediateDirectory)/fparser_fparser.cc$(ObjectSuffix): fparser/fparser.cc $(IntermediateDirectory)/fparser_fparser.cc$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/fparser/fparser.cc" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/fparser_fparser.cc$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/fparser_fparser.cc$(DependSuffix): fparser/fparser.cc - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fparser_fparser.cc$(ObjectSuffix) -MF$(IntermediateDirectory)/fparser_fparser.cc$(DependSuffix) -MM fparser/fparser.cc - -$(IntermediateDirectory)/fparser_fparser.cc$(PreprocessSuffix): fparser/fparser.cc - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fparser_fparser.cc$(PreprocessSuffix) fparser/fparser.cc - -$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix): MainFrame.cpp $(IntermediateDirectory)/MainFrame.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrame.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MainFrame.cpp$(DependSuffix): MainFrame.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrame.cpp$(DependSuffix) -MM MainFrame.cpp - -$(IntermediateDirectory)/MainFrame.cpp$(PreprocessSuffix): MainFrame.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrame.cpp$(PreprocessSuffix) MainFrame.cpp - -$(IntermediateDirectory)/Divider.cpp$(ObjectSuffix): Divider.cpp $(IntermediateDirectory)/Divider.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Divider.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Divider.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Divider.cpp$(DependSuffix): Divider.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Divider.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Divider.cpp$(DependSuffix) -MM Divider.cpp - -$(IntermediateDirectory)/Divider.cpp$(PreprocessSuffix): Divider.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Divider.cpp$(PreprocessSuffix) Divider.cpp - -$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix): ElementDataObject.cpp $(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementDataObject.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix): ElementDataObject.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix) -MM ElementDataObject.cpp - -$(IntermediateDirectory)/ElementDataObject.cpp$(PreprocessSuffix): ElementDataObject.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementDataObject.cpp$(PreprocessSuffix) ElementDataObject.cpp - -$(IntermediateDirectory)/Fault.cpp$(ObjectSuffix): Fault.cpp $(IntermediateDirectory)/Fault.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Fault.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Fault.cpp$(DependSuffix): Fault.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Fault.cpp$(DependSuffix) -MM Fault.cpp - -$(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix): Fault.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix) Fault.cpp - -$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix): base/ChartViewBase.cpp $(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix): base/ChartViewBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix) -MM base/ChartViewBase.cpp - -$(IntermediateDirectory)/base_ChartViewBase.cpp$(PreprocessSuffix): base/ChartViewBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ChartViewBase.cpp$(PreprocessSuffix) base/ChartViewBase.cpp - -$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix): SumForm.cpp $(IntermediateDirectory)/SumForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SumForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/SumForm.cpp$(DependSuffix): SumForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SumForm.cpp$(DependSuffix) -MM SumForm.cpp - -$(IntermediateDirectory)/SumForm.cpp$(PreprocessSuffix): SumForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SumForm.cpp$(PreprocessSuffix) SumForm.cpp - -$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix): PropertiesData.cpp $(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix): PropertiesData.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix) -MM PropertiesData.cpp - -$(IntermediateDirectory)/PropertiesData.cpp$(PreprocessSuffix): PropertiesData.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesData.cpp$(PreprocessSuffix) PropertiesData.cpp - -$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix): BusFormBitmaps.cpp $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/BusFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix): BusFormBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix) -MM BusFormBitmaps.cpp - -$(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix): BusFormBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix) BusFormBitmaps.cpp - -$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix): base/ControlEditorBase.cpp $(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix): base/ControlEditorBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix) -MM base/ControlEditorBase.cpp - -$(IntermediateDirectory)/base_ControlEditorBase.cpp$(PreprocessSuffix): base/ControlEditorBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ControlEditorBase.cpp$(PreprocessSuffix) base/ControlEditorBase.cpp - -$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix): ConstantForm.cpp $(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ConstantForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix): ConstantForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix) -MM ConstantForm.cpp - -$(IntermediateDirectory)/ConstantForm.cpp$(PreprocessSuffix): ConstantForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ConstantForm.cpp$(PreprocessSuffix) ConstantForm.cpp - -$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix): IndMotorForm.cpp $(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IndMotorForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix): IndMotorForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix) -MM IndMotorForm.cpp - -$(IntermediateDirectory)/IndMotorForm.cpp$(PreprocessSuffix): IndMotorForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IndMotorForm.cpp$(PreprocessSuffix) IndMotorForm.cpp - -$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix): ControlElement.cpp $(IntermediateDirectory)/ControlElement.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlElement.cpp$(DependSuffix): ControlElement.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElement.cpp$(DependSuffix) -MM ControlElement.cpp - -$(IntermediateDirectory)/ControlElement.cpp$(PreprocessSuffix): ControlElement.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElement.cpp$(PreprocessSuffix) ControlElement.cpp - -$(IntermediateDirectory)/Gain.cpp$(ObjectSuffix): Gain.cpp $(IntermediateDirectory)/Gain.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Gain.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Gain.cpp$(DependSuffix): Gain.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Gain.cpp$(DependSuffix) -MM Gain.cpp - -$(IntermediateDirectory)/Gain.cpp$(PreprocessSuffix): Gain.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Gain.cpp$(PreprocessSuffix) Gain.cpp - -$(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix): DataReport.cpp $(IntermediateDirectory)/DataReport.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReport.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/DataReport.cpp$(DependSuffix): DataReport.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReport.cpp$(DependSuffix) -MM DataReport.cpp - -$(IntermediateDirectory)/DataReport.cpp$(PreprocessSuffix): DataReport.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReport.cpp$(PreprocessSuffix) DataReport.cpp - -$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix): base/PropertiesFormBitmaps.cpp $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix): base/PropertiesFormBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix) -MM base/PropertiesFormBitmaps.cpp - -$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(PreprocessSuffix): base/PropertiesFormBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(PreprocessSuffix) base/PropertiesFormBitmaps.cpp - -$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix): base/MainFrameBase.cpp $(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix): base/MainFrameBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix) -MM base/MainFrameBase.cpp - -$(IntermediateDirectory)/base_MainFrameBase.cpp$(PreprocessSuffix): base/MainFrameBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_MainFrameBase.cpp$(PreprocessSuffix) base/MainFrameBase.cpp - -$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix): SimulationsSettingsForm.cpp $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SimulationsSettingsForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix): SimulationsSettingsForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix) -MM SimulationsSettingsForm.cpp - -$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(PreprocessSuffix): SimulationsSettingsForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(PreprocessSuffix) SimulationsSettingsForm.cpp - -$(IntermediateDirectory)/MathExprParser.cpp$(ObjectSuffix): MathExprParser.cpp $(IntermediateDirectory)/MathExprParser.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MathExprParser.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MathExprParser.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MathExprParser.cpp$(DependSuffix): MathExprParser.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MathExprParser.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MathExprParser.cpp$(DependSuffix) -MM MathExprParser.cpp - -$(IntermediateDirectory)/MathExprParser.cpp$(PreprocessSuffix): MathExprParser.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MathExprParser.cpp$(PreprocessSuffix) MathExprParser.cpp - -$(IntermediateDirectory)/Line.cpp$(ObjectSuffix): Line.cpp $(IntermediateDirectory)/Line.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Line.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Line.cpp$(DependSuffix): Line.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Line.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Line.cpp$(DependSuffix) -MM Line.cpp - -$(IntermediateDirectory)/Line.cpp$(PreprocessSuffix): Line.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Line.cpp$(PreprocessSuffix) Line.cpp - -$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix): Transformer.cpp $(IntermediateDirectory)/Transformer.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Transformer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Transformer.cpp$(DependSuffix): Transformer.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Transformer.cpp$(DependSuffix) -MM Transformer.cpp - -$(IntermediateDirectory)/Transformer.cpp$(PreprocessSuffix): Transformer.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Transformer.cpp$(PreprocessSuffix) Transformer.cpp - -$(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix): ControlSystemTest.cpp $(IntermediateDirectory)/ControlSystemTest.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlSystemTest.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlSystemTest.cpp$(DependSuffix): ControlSystemTest.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlSystemTest.cpp$(DependSuffix) -MM ControlSystemTest.cpp - -$(IntermediateDirectory)/ControlSystemTest.cpp$(PreprocessSuffix): ControlSystemTest.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlSystemTest.cpp$(PreprocessSuffix) ControlSystemTest.cpp - -$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix): ControlEditor.cpp $(IntermediateDirectory)/ControlEditor.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlEditor.cpp$(DependSuffix): ControlEditor.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditor.cpp$(DependSuffix) -MM ControlEditor.cpp - -$(IntermediateDirectory)/ControlEditor.cpp$(PreprocessSuffix): ControlEditor.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditor.cpp$(PreprocessSuffix) ControlEditor.cpp - -$(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix): SyncGenerator.cpp $(IntermediateDirectory)/SyncGenerator.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SyncGenerator.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/SyncGenerator.cpp$(DependSuffix): SyncGenerator.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncGenerator.cpp$(DependSuffix) -MM SyncGenerator.cpp - -$(IntermediateDirectory)/SyncGenerator.cpp$(PreprocessSuffix): SyncGenerator.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncGenerator.cpp$(PreprocessSuffix) SyncGenerator.cpp - -$(IntermediateDirectory)/main.cpp$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/main.cpp$(DependSuffix) -MM main.cpp - -$(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix) main.cpp - -$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix): base/MainFrameBitmaps.cpp $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix): base/MainFrameBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix) -MM base/MainFrameBitmaps.cpp - -$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(PreprocessSuffix): base/MainFrameBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(PreprocessSuffix) base/MainFrameBitmaps.cpp - -$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix): base/DataReportBase.cpp $(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix): base/DataReportBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix) -MM base/DataReportBase.cpp - -$(IntermediateDirectory)/base_DataReportBase.cpp$(PreprocessSuffix): base/DataReportBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_DataReportBase.cpp$(PreprocessSuffix) base/DataReportBase.cpp - -$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix): win_resources.rc - $(RcCompilerName) -i "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/win_resources.rc" $(RcCmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(RcIncludePath) -$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix): base/WorkspaceBase.cpp $(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix): base/WorkspaceBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix) -MM base/WorkspaceBase.cpp - -$(IntermediateDirectory)/base_WorkspaceBase.cpp$(PreprocessSuffix): base/WorkspaceBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_WorkspaceBase.cpp$(PreprocessSuffix) base/WorkspaceBase.cpp - -$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix): base/WorkspaceBitmaps.cpp $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix): base/WorkspaceBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix) -MM base/WorkspaceBitmaps.cpp - -$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(PreprocessSuffix): base/WorkspaceBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(PreprocessSuffix) base/WorkspaceBitmaps.cpp - -$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix): ConnectionLine.cpp $(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ConnectionLine.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix): ConnectionLine.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix) -MM ConnectionLine.cpp - -$(IntermediateDirectory)/ConnectionLine.cpp$(PreprocessSuffix): ConnectionLine.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ConnectionLine.cpp$(PreprocessSuffix) ConnectionLine.cpp - -$(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix): IOControlForm.cpp $(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IOControlForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix): IOControlForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix) -MM IOControlForm.cpp - -$(IntermediateDirectory)/IOControlForm.cpp$(PreprocessSuffix): IOControlForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IOControlForm.cpp$(PreprocessSuffix) IOControlForm.cpp - -$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix): base/ControlEditorBitmaps.cpp $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix): base/ControlEditorBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix) -MM base/ControlEditorBitmaps.cpp - -$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(PreprocessSuffix): base/ControlEditorBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(PreprocessSuffix) base/ControlEditorBitmaps.cpp - -$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix): FileHanding.cpp $(IntermediateDirectory)/FileHanding.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/FileHanding.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/FileHanding.cpp$(DependSuffix): FileHanding.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/FileHanding.cpp$(DependSuffix) -MM FileHanding.cpp - -$(IntermediateDirectory)/FileHanding.cpp$(PreprocessSuffix): FileHanding.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/FileHanding.cpp$(PreprocessSuffix) FileHanding.cpp - -$(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix): PowerFlow.cpp $(IntermediateDirectory)/PowerFlow.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PowerFlow.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/PowerFlow.cpp$(DependSuffix): PowerFlow.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PowerFlow.cpp$(DependSuffix) -MM PowerFlow.cpp - -$(IntermediateDirectory)/PowerFlow.cpp$(PreprocessSuffix): PowerFlow.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PowerFlow.cpp$(PreprocessSuffix) PowerFlow.cpp - -$(IntermediateDirectory)/Element.cpp$(ObjectSuffix): Element.cpp $(IntermediateDirectory)/Element.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Element.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Element.cpp$(DependSuffix): Element.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Element.cpp$(DependSuffix) -MM Element.cpp - -$(IntermediateDirectory)/Element.cpp$(PreprocessSuffix): Element.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Element.cpp$(PreprocessSuffix) Element.cpp - -$(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix): RateLimiterForm.cpp $(IntermediateDirectory)/RateLimiterForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/RateLimiterForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/RateLimiterForm.cpp$(DependSuffix): RateLimiterForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/RateLimiterForm.cpp$(DependSuffix) -MM RateLimiterForm.cpp - -$(IntermediateDirectory)/RateLimiterForm.cpp$(PreprocessSuffix): RateLimiterForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/RateLimiterForm.cpp$(PreprocessSuffix) RateLimiterForm.cpp - -$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix): Electromechanical.cpp $(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Electromechanical.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix): Electromechanical.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix) -MM Electromechanical.cpp - -$(IntermediateDirectory)/Electromechanical.cpp$(PreprocessSuffix): Electromechanical.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Electromechanical.cpp$(PreprocessSuffix) Electromechanical.cpp - -$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix): base/PropertiesFormBase.cpp $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/PropertiesFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix): base/PropertiesFormBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix) -MM base/PropertiesFormBase.cpp - -$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(PreprocessSuffix): base/PropertiesFormBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(PreprocessSuffix) base/PropertiesFormBase.cpp - -$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix): Multiplier.cpp $(IntermediateDirectory)/Multiplier.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Multiplier.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Multiplier.cpp$(DependSuffix): Multiplier.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Multiplier.cpp$(DependSuffix) -MM Multiplier.cpp - -$(IntermediateDirectory)/Multiplier.cpp$(PreprocessSuffix): Multiplier.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Multiplier.cpp$(PreprocessSuffix) Multiplier.cpp - -$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix): Shunt.cpp $(IntermediateDirectory)/Shunt.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Shunt.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Shunt.cpp$(DependSuffix): Shunt.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Shunt.cpp$(DependSuffix) -MM Shunt.cpp - -$(IntermediateDirectory)/Shunt.cpp$(PreprocessSuffix): Shunt.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Shunt.cpp$(PreprocessSuffix) Shunt.cpp - -$(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix): ControlElementContainer.cpp $(IntermediateDirectory)/ControlElementContainer.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlElementContainer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlElementContainer.cpp$(DependSuffix): ControlElementContainer.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElementContainer.cpp$(DependSuffix) -MM ControlElementContainer.cpp - -$(IntermediateDirectory)/ControlElementContainer.cpp$(PreprocessSuffix): ControlElementContainer.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElementContainer.cpp$(PreprocessSuffix) ControlElementContainer.cpp - -$(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix): Exponential.cpp $(IntermediateDirectory)/Exponential.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Exponential.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Exponential.cpp$(DependSuffix): Exponential.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Exponential.cpp$(DependSuffix) -MM Exponential.cpp - -$(IntermediateDirectory)/Exponential.cpp$(PreprocessSuffix): Exponential.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Exponential.cpp$(PreprocessSuffix) Exponential.cpp - -$(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix): Limiter.cpp $(IntermediateDirectory)/Limiter.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Limiter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Limiter.cpp$(DependSuffix): Limiter.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Limiter.cpp$(DependSuffix) -MM Limiter.cpp - -$(IntermediateDirectory)/Limiter.cpp$(PreprocessSuffix): Limiter.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Limiter.cpp$(PreprocessSuffix) Limiter.cpp - -$(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix): RateLimiter.cpp $(IntermediateDirectory)/RateLimiter.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/RateLimiter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/RateLimiter.cpp$(DependSuffix): RateLimiter.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/RateLimiter.cpp$(DependSuffix) -MM RateLimiter.cpp - -$(IntermediateDirectory)/RateLimiter.cpp$(PreprocessSuffix): RateLimiter.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/RateLimiter.cpp$(PreprocessSuffix) RateLimiter.cpp - -$(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix): MathOperation.cpp $(IntermediateDirectory)/MathOperation.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MathOperation.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MathOperation.cpp$(DependSuffix): MathOperation.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MathOperation.cpp$(DependSuffix) -MM MathOperation.cpp - -$(IntermediateDirectory)/MathOperation.cpp$(PreprocessSuffix): MathOperation.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MathOperation.cpp$(PreprocessSuffix) MathOperation.cpp - -$(IntermediateDirectory)/MathExpression.cpp$(ObjectSuffix): MathExpression.cpp $(IntermediateDirectory)/MathExpression.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MathExpression.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MathExpression.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MathExpression.cpp$(DependSuffix): MathExpression.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MathExpression.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MathExpression.cpp$(DependSuffix) -MM MathExpression.cpp - -$(IntermediateDirectory)/MathExpression.cpp$(PreprocessSuffix): MathExpression.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MathExpression.cpp$(PreprocessSuffix) MathExpression.cpp - -$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix): artProvider/ArtMetro.cpp $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/artProvider/ArtMetro.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(DependSuffix): artProvider/ArtMetro.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(DependSuffix) -MM artProvider/ArtMetro.cpp - -$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(PreprocessSuffix): artProvider/ArtMetro.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(PreprocessSuffix) artProvider/ArtMetro.cpp - -$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix): Workspace.cpp $(IntermediateDirectory)/Workspace.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Workspace.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Workspace.cpp$(DependSuffix): Workspace.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Workspace.cpp$(DependSuffix) -MM Workspace.cpp - -$(IntermediateDirectory)/Workspace.cpp$(PreprocessSuffix): Workspace.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Workspace.cpp$(PreprocessSuffix) Workspace.cpp - -$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix): GraphicalElement.cpp $(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GraphicalElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix): GraphicalElement.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix) -MM GraphicalElement.cpp - -$(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix): GraphicalElement.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix) GraphicalElement.cpp - -$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix): base/DataReportBitmaps.cpp $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix): base/DataReportBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix) -MM base/DataReportBitmaps.cpp - -$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(PreprocessSuffix): base/DataReportBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(PreprocessSuffix) base/DataReportBitmaps.cpp - -$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix): TextForm.cpp $(IntermediateDirectory)/TextForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/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 - -$(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix): OpenGLText.cpp $(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/OpenGLText.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix): OpenGLText.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix) -MM OpenGLText.cpp - -$(IntermediateDirectory)/OpenGLText.cpp$(PreprocessSuffix): OpenGLText.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/OpenGLText.cpp$(PreprocessSuffix) OpenGLText.cpp - -$(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix): IndMotor.cpp $(IntermediateDirectory)/IndMotor.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IndMotor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/IndMotor.cpp$(DependSuffix): IndMotor.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IndMotor.cpp$(DependSuffix) -MM IndMotor.cpp - -$(IntermediateDirectory)/IndMotor.cpp$(PreprocessSuffix): IndMotor.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IndMotor.cpp$(PreprocessSuffix) IndMotor.cpp - -$(IntermediateDirectory)/Text.cpp$(ObjectSuffix): Text.cpp $(IntermediateDirectory)/Text.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Text.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Text.cpp$(DependSuffix): Text.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Text.cpp$(DependSuffix) -MM Text.cpp - -$(IntermediateDirectory)/Text.cpp$(PreprocessSuffix): Text.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Text.cpp$(PreprocessSuffix) Text.cpp - -$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix): Branch.cpp $(IntermediateDirectory)/Branch.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Branch.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Branch.cpp$(DependSuffix): Branch.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Branch.cpp$(DependSuffix) -MM Branch.cpp - -$(IntermediateDirectory)/Branch.cpp$(PreprocessSuffix): Branch.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Branch.cpp$(PreprocessSuffix) Branch.cpp - -$(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix): TransferFunction.cpp $(IntermediateDirectory)/TransferFunction.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransferFunction.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/TransferFunction.cpp$(DependSuffix): TransferFunction.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TransferFunction.cpp$(DependSuffix) -MM TransferFunction.cpp - -$(IntermediateDirectory)/TransferFunction.cpp$(PreprocessSuffix): TransferFunction.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TransferFunction.cpp$(PreprocessSuffix) TransferFunction.cpp - -$(IntermediateDirectory)/Bus.cpp$(ObjectSuffix): Bus.cpp $(IntermediateDirectory)/Bus.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Bus.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Bus.cpp$(DependSuffix): Bus.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Bus.cpp$(DependSuffix) -MM Bus.cpp - -$(IntermediateDirectory)/Bus.cpp$(PreprocessSuffix): Bus.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Bus.cpp$(PreprocessSuffix) Bus.cpp - -$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix): Inductor.cpp $(IntermediateDirectory)/Inductor.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Inductor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Inductor.cpp$(DependSuffix): Inductor.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Inductor.cpp$(DependSuffix) -MM Inductor.cpp - -$(IntermediateDirectory)/Inductor.cpp$(PreprocessSuffix): Inductor.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Inductor.cpp$(PreprocessSuffix) Inductor.cpp - -$(IntermediateDirectory)/Load.cpp$(ObjectSuffix): Load.cpp $(IntermediateDirectory)/Load.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Load.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Load.cpp$(DependSuffix): Load.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Load.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Load.cpp$(DependSuffix) -MM Load.cpp - -$(IntermediateDirectory)/Load.cpp$(PreprocessSuffix): Load.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Load.cpp$(PreprocessSuffix) Load.cpp - -$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix): TransferFunctionForm.cpp $(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransferFunctionForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix): TransferFunctionForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix) -MM TransferFunctionForm.cpp - -$(IntermediateDirectory)/TransferFunctionForm.cpp$(PreprocessSuffix): TransferFunctionForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TransferFunctionForm.cpp$(PreprocessSuffix) TransferFunctionForm.cpp - -$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix): base/ElementFormBase.cpp $(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ElementFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix): base/ElementFormBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix) -MM base/ElementFormBase.cpp - -$(IntermediateDirectory)/base_ElementFormBase.cpp$(PreprocessSuffix): base/ElementFormBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ElementFormBase.cpp$(PreprocessSuffix) base/ElementFormBase.cpp - -$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix): Machines.cpp $(IntermediateDirectory)/Machines.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Machines.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Machines.cpp$(DependSuffix): Machines.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Machines.cpp$(DependSuffix) -MM Machines.cpp - -$(IntermediateDirectory)/Machines.cpp$(PreprocessSuffix): Machines.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Machines.cpp$(PreprocessSuffix) Machines.cpp - -$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix): PowerElement.cpp $(IntermediateDirectory)/PowerElement.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PowerElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/PowerElement.cpp$(DependSuffix): PowerElement.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PowerElement.cpp$(DependSuffix) -MM PowerElement.cpp - -$(IntermediateDirectory)/PowerElement.cpp$(PreprocessSuffix): PowerElement.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PowerElement.cpp$(PreprocessSuffix) PowerElement.cpp - -$(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix): IOControl.cpp $(IntermediateDirectory)/IOControl.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IOControl.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/IOControl.cpp$(DependSuffix): IOControl.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IOControl.cpp$(DependSuffix) -MM IOControl.cpp - -$(IntermediateDirectory)/IOControl.cpp$(PreprocessSuffix): IOControl.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IOControl.cpp$(PreprocessSuffix) IOControl.cpp - -$(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix): SyncMotor.cpp $(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SyncMotor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix): SyncMotor.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix) -MM SyncMotor.cpp - -$(IntermediateDirectory)/SyncMotor.cpp$(PreprocessSuffix): SyncMotor.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMotor.cpp$(PreprocessSuffix) SyncMotor.cpp - -$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix): base/ChartViewBitmaps.cpp $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix): base/ChartViewBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix) -MM base/ChartViewBitmaps.cpp - -$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(PreprocessSuffix): base/ChartViewBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(PreprocessSuffix) base/ChartViewBitmaps.cpp - -$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix): ExponentialForm.cpp $(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ExponentialForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix): ExponentialForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix) -MM ExponentialForm.cpp - -$(IntermediateDirectory)/ExponentialForm.cpp$(PreprocessSuffix): ExponentialForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ExponentialForm.cpp$(PreprocessSuffix) ExponentialForm.cpp - -$(IntermediateDirectory)/AboutForm.cpp$(ObjectSuffix): AboutForm.cpp $(IntermediateDirectory)/AboutForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/AboutForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/AboutForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/AboutForm.cpp$(DependSuffix): AboutForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/AboutForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/AboutForm.cpp$(DependSuffix) -MM AboutForm.cpp - -$(IntermediateDirectory)/AboutForm.cpp$(PreprocessSuffix): AboutForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/AboutForm.cpp$(PreprocessSuffix) AboutForm.cpp - -$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix): ControlElementSolver.cpp $(IntermediateDirectory)/ControlElementSolver.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlElementSolver.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlElementSolver.cpp$(DependSuffix): ControlElementSolver.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElementSolver.cpp$(DependSuffix) -MM ControlElementSolver.cpp - -$(IntermediateDirectory)/ControlElementSolver.cpp$(PreprocessSuffix): ControlElementSolver.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElementSolver.cpp$(PreprocessSuffix) ControlElementSolver.cpp - -$(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix): LimiterForm.cpp $(IntermediateDirectory)/LimiterForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/LimiterForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/LimiterForm.cpp$(DependSuffix): LimiterForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/LimiterForm.cpp$(DependSuffix) -MM LimiterForm.cpp - -$(IntermediateDirectory)/LimiterForm.cpp$(PreprocessSuffix): LimiterForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/LimiterForm.cpp$(PreprocessSuffix) LimiterForm.cpp - -$(IntermediateDirectory)/MathExpressionForm.cpp$(ObjectSuffix): MathExpressionForm.cpp $(IntermediateDirectory)/MathExpressionForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MathExpressionForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MathExpressionForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MathExpressionForm.cpp$(DependSuffix): MathExpressionForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MathExpressionForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MathExpressionForm.cpp$(DependSuffix) -MM MathExpressionForm.cpp - -$(IntermediateDirectory)/MathExpressionForm.cpp$(PreprocessSuffix): MathExpressionForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MathExpressionForm.cpp$(PreprocessSuffix) MathExpressionForm.cpp - -$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix): BusForm.cpp $(IntermediateDirectory)/BusForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/BusForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/BusForm.cpp$(DependSuffix): BusForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/BusForm.cpp$(DependSuffix) -MM BusForm.cpp - -$(IntermediateDirectory)/BusForm.cpp$(PreprocessSuffix): BusForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusForm.cpp$(PreprocessSuffix) BusForm.cpp - -$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix): GeneratorStabForm.cpp $(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GeneratorStabForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix): GeneratorStabForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix) -MM GeneratorStabForm.cpp - -$(IntermediateDirectory)/GeneratorStabForm.cpp$(PreprocessSuffix): GeneratorStabForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GeneratorStabForm.cpp$(PreprocessSuffix) GeneratorStabForm.cpp - -$(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix): LineForm.cpp $(IntermediateDirectory)/LineForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/LineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/LineForm.cpp$(DependSuffix): LineForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/LineForm.cpp$(DependSuffix) -MM LineForm.cpp - -$(IntermediateDirectory)/LineForm.cpp$(PreprocessSuffix): LineForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/LineForm.cpp$(PreprocessSuffix) LineForm.cpp - -$(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix): Capacitor.cpp $(IntermediateDirectory)/Capacitor.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Capacitor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Capacitor.cpp$(DependSuffix): Capacitor.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Capacitor.cpp$(DependSuffix) -MM Capacitor.cpp - -$(IntermediateDirectory)/Capacitor.cpp$(PreprocessSuffix): Capacitor.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Capacitor.cpp$(PreprocessSuffix) Capacitor.cpp - -$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix): LoadForm.cpp $(IntermediateDirectory)/LoadForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/LoadForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/LoadForm.cpp$(DependSuffix): LoadForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/LoadForm.cpp$(DependSuffix) -MM LoadForm.cpp - -$(IntermediateDirectory)/LoadForm.cpp$(PreprocessSuffix): LoadForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/LoadForm.cpp$(PreprocessSuffix) LoadForm.cpp - -$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix): ReactiveShuntElementForm.cpp $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ReactiveShuntElementForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix): ReactiveShuntElementForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix) -MM ReactiveShuntElementForm.cpp - -$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(PreprocessSuffix): ReactiveShuntElementForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(PreprocessSuffix) ReactiveShuntElementForm.cpp - -$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix): SyncMachineForm.cpp $(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SyncMachineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix): SyncMachineForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix) -MM SyncMachineForm.cpp - -$(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix): SyncMachineForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix) SyncMachineForm.cpp - -$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix): base/ElementFormBitmaps.cpp $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix): base/ElementFormBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix) -MM base/ElementFormBitmaps.cpp - -$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(PreprocessSuffix): base/ElementFormBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(PreprocessSuffix) base/ElementFormBitmaps.cpp - -$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix): GeneralPropertiesForm.cpp $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GeneralPropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix): GeneralPropertiesForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix) -MM GeneralPropertiesForm.cpp - -$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(PreprocessSuffix): GeneralPropertiesForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(PreprocessSuffix) GeneralPropertiesForm.cpp - -$(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix): SwitchingForm.cpp $(IntermediateDirectory)/SwitchingForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SwitchingForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/SwitchingForm.cpp$(DependSuffix): SwitchingForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SwitchingForm.cpp$(DependSuffix) -MM SwitchingForm.cpp - -$(IntermediateDirectory)/SwitchingForm.cpp$(PreprocessSuffix): SwitchingForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SwitchingForm.cpp$(PreprocessSuffix) SwitchingForm.cpp - -$(IntermediateDirectory)/Sum.cpp$(ObjectSuffix): Sum.cpp $(IntermediateDirectory)/Sum.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Sum.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/Sum.cpp$(DependSuffix): Sum.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Sum.cpp$(DependSuffix) -MM Sum.cpp - -$(IntermediateDirectory)/Sum.cpp$(PreprocessSuffix): Sum.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Sum.cpp$(PreprocessSuffix) Sum.cpp - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) -r ./Release_Windows_x64/ - - diff --git a/Project/Project.project b/Project/Project.project index e1e6d09..1447966 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -80,6 +80,7 @@ <VirtualDirectory Name="controller"> <VirtualDirectory Name="forms"> <VirtualDirectory Name="properties"> + <File Name="ImportForm.cpp"/> <File Name="GeneralPropertiesForm.cpp"/> <File Name="SimulationsSettingsForm.cpp"/> <File Name="AboutForm.cpp"/> @@ -232,6 +233,7 @@ <File Name="TransformerForm.h"/> </VirtualDirectory> <VirtualDirectory Name="properties"> + <File Name="ImportForm.h"/> <File Name="GeneralPropertiesForm.h"/> <File Name="SimulationsSettingsForm.h"/> <File Name="AboutForm.h"/> @@ -254,30 +256,30 @@ </VirtualDirectory> <VirtualDirectory Name="wxcrafter"> <VirtualDirectory Name="resources"> + <File Name="WorkspaceBitmaps.cpp"/> + <File Name="PropertiesFormBitmaps.cpp"/> + <File Name="MainFrameBitmaps.cpp"/> + <File Name="ElementFormBitmaps.cpp"/> + <File Name="ControlEditorBitmaps.cpp"/> + <File Name="ChartViewBitmaps.cpp"/> + <File Name="DataReportBitmaps.cpp"/> <File Name="BusFormBitmaps.cpp"/> - <File Name="base/ChartViewBitmaps.cpp"/> - <File Name="base/ControlEditorBitmaps.cpp"/> - <File Name="base/DataReportBitmaps.cpp"/> - <File Name="base/ElementFormBitmaps.cpp"/> - <File Name="base/MainFrameBitmaps.cpp"/> - <File Name="base/PropertiesFormBitmaps.cpp"/> - <File Name="base/WorkspaceBitmaps.cpp"/> </VirtualDirectory> <VirtualDirectory Name="base"> - <File Name="base/ChartViewBase.h"/> - <File Name="base/ChartViewBase.cpp"/> - <File Name="base/ControlEditorBase.h"/> - <File Name="base/ControlEditorBase.cpp"/> - <File Name="base/DataReportBase.h"/> - <File Name="base/DataReportBase.cpp"/> - <File Name="base/ElementFormBase.h"/> - <File Name="base/ElementFormBase.cpp"/> - <File Name="base/MainFrameBase.h"/> - <File Name="base/MainFrameBase.cpp"/> - <File Name="base/PropertiesFormBase.h"/> - <File Name="base/PropertiesFormBase.cpp"/> - <File Name="base/WorkspaceBase.h"/> - <File Name="base/WorkspaceBase.cpp"/> + <File Name="WorkspaceBase.cpp"/> + <File Name="WorkspaceBase.h"/> + <File Name="PropertiesFormBase.cpp"/> + <File Name="PropertiesFormBase.h"/> + <File Name="MainFrameBase.cpp"/> + <File Name="MainFrameBase.h"/> + <File Name="ElementFormBase.cpp"/> + <File Name="ElementFormBase.h"/> + <File Name="ControlEditorBase.cpp"/> + <File Name="ControlEditorBase.h"/> + <File Name="ChartViewBase.cpp"/> + <File Name="ChartViewBase.h"/> + <File Name="DataReportBase.cpp"/> + <File Name="DataReportBase.h"/> </VirtualDirectory> <File Name="MainFrame.wxcp"/> <File Name="Workspace.wxcp"/> diff --git a/Project/Project.txt b/Project/Project.txt deleted file mode 100644 index 53822df..0000000 --- a/Project/Project.txt +++ /dev/null @@ -1,2 +0,0 @@ -./Release_Windows_x64/TransformerForm.cpp.o ./Release_Windows_x64/ElementPlotData.cpp.o ./Release_Windows_x64/ChartView.cpp.o ./Release_Windows_x64/ElectricCalculation.cpp.o ./Release_Windows_x64/GainForm.cpp.o ./Release_Windows_x64/Constant.cpp.o ./Release_Windows_x64/Camera.cpp.o ./Release_Windows_x64/wxMathPlot_mathplot.cpp.o ./Release_Windows_x64/XMLParser.cpp.o ./Release_Windows_x64/fparser_fpoptimizer.cc.o ./Release_Windows_x64/fparser_fparser.cc.o ./Release_Windows_x64/MainFrame.cpp.o ./Release_Windows_x64/Divider.cpp.o ./Release_Windows_x64/ElementDataObject.cpp.o ./Release_Windows_x64/Fault.cpp.o ./Release_Windows_x64/base_ChartViewBase.cpp.o ./Release_Windows_x64/SumForm.cpp.o ./Release_Windows_x64/PropertiesData.cpp.o ./Release_Windows_x64/BusFormBitmaps.cpp.o ./Release_Windows_x64/base_ControlEditorBase.cpp.o ./Release_Windows_x64/ConstantForm.cpp.o ./Release_Windows_x64/IndMotorForm.cpp.o ./Release_Windows_x64/ControlElement.cpp.o ./Release_Windows_x64/Gain.cpp.o ./Release_Windows_x64/DataReport.cpp.o ./Release_Windows_x64/base_PropertiesFormBitmaps.cpp.o ./Release_Windows_x64/base_MainFrameBase.cpp.o ./Release_Windows_x64/SimulationsSettingsForm.cpp.o ./Release_Windows_x64/MathExprParser.cpp.o ./Release_Windows_x64/Line.cpp.o ./Release_Windows_x64/Transformer.cpp.o ./Release_Windows_x64/ControlSystemTest.cpp.o ./Release_Windows_x64/ControlEditor.cpp.o ./Release_Windows_x64/SyncGenerator.cpp.o ./Release_Windows_x64/main.cpp.o ./Release_Windows_x64/base_MainFrameBitmaps.cpp.o ./Release_Windows_x64/base_DataReportBase.cpp.o ./Release_Windows_x64/win_resources.rc.o ./Release_Windows_x64/base_WorkspaceBase.cpp.o ./Release_Windows_x64/base_WorkspaceBitmaps.cpp.o ./Release_Windows_x64/ConnectionLine.cpp.o ./Release_Windows_x64/IOControlForm.cpp.o ./Release_Windows_x64/base_ControlEditorBitmaps.cpp.o ./Release_Windows_x64/FileHanding.cpp.o ./Release_Windows_x64/PowerFlow.cpp.o -./Release_Windows_x64/Element.cpp.o ./Release_Windows_x64/RateLimiterForm.cpp.o ./Release_Windows_x64/Electromechanical.cpp.o ./Release_Windows_x64/base_PropertiesFormBase.cpp.o ./Release_Windows_x64/Multiplier.cpp.o ./Release_Windows_x64/Shunt.cpp.o ./Release_Windows_x64/ControlElementContainer.cpp.o ./Release_Windows_x64/Exponential.cpp.o ./Release_Windows_x64/Limiter.cpp.o ./Release_Windows_x64/RateLimiter.cpp.o ./Release_Windows_x64/MathOperation.cpp.o ./Release_Windows_x64/MathExpression.cpp.o ./Release_Windows_x64/artProvider_ArtMetro.cpp.o ./Release_Windows_x64/Workspace.cpp.o ./Release_Windows_x64/GraphicalElement.cpp.o ./Release_Windows_x64/base_DataReportBitmaps.cpp.o ./Release_Windows_x64/TextForm.cpp.o ./Release_Windows_x64/OpenGLText.cpp.o ./Release_Windows_x64/IndMotor.cpp.o ./Release_Windows_x64/Text.cpp.o ./Release_Windows_x64/Branch.cpp.o ./Release_Windows_x64/TransferFunction.cpp.o ./Release_Windows_x64/Bus.cpp.o ./Release_Windows_x64/Inductor.cpp.o ./Release_Windows_x64/Load.cpp.o ./Release_Windows_x64/TransferFunctionForm.cpp.o ./Release_Windows_x64/base_ElementFormBase.cpp.o ./Release_Windows_x64/Machines.cpp.o ./Release_Windows_x64/PowerElement.cpp.o ./Release_Windows_x64/IOControl.cpp.o ./Release_Windows_x64/SyncMotor.cpp.o ./Release_Windows_x64/base_ChartViewBitmaps.cpp.o ./Release_Windows_x64/ExponentialForm.cpp.o ./Release_Windows_x64/AboutForm.cpp.o ./Release_Windows_x64/ControlElementSolver.cpp.o ./Release_Windows_x64/LimiterForm.cpp.o ./Release_Windows_x64/MathExpressionForm.cpp.o ./Release_Windows_x64/BusForm.cpp.o ./Release_Windows_x64/GeneratorStabForm.cpp.o ./Release_Windows_x64/LineForm.cpp.o ./Release_Windows_x64/Capacitor.cpp.o ./Release_Windows_x64/LoadForm.cpp.o ./Release_Windows_x64/ReactiveShuntElementForm.cpp.o ./Release_Windows_x64/SyncMachineForm.cpp.o ./Release_Windows_x64/base_ElementFormBitmaps.cpp.o ./Release_Windows_x64/GeneralPropertiesForm.cpp.o ./Release_Windows_x64/SwitchingForm.cpp.o ./Release_Windows_x64/Sum.cpp.o diff --git a/Project/PropertiesData.h b/Project/PropertiesData.h index deba3e9..127eb59 100644 --- a/Project/PropertiesData.h +++ b/Project/PropertiesData.h @@ -37,6 +37,7 @@ struct SimulationData { double accFator = 1.0; double powerFlowTolerance = 1e-7; int powerFlowMaxIterations = 5000; + double initAngle = 0.0; // Stability double stabilityFrequency = 60.0; diff --git a/Project/PropertiesForm.wxcp b/Project/PropertiesForm.wxcp index 5f2dc93..87420ee 100644 --- a/Project/PropertiesForm.wxcp +++ b/Project/PropertiesForm.wxcp @@ -1,7 +1,7 @@ { "metadata": { - "m_generatedFilesDir": "base/", - "m_objCounter": 415, + "m_generatedFilesDir": ".", + "m_objCounter": 791, "m_includeFiles": [], "m_bitmapFunction": "wxCDAD0InitBitmapResources", "m_bitmapsFile": "PropertiesFormBitmaps.cpp", @@ -2616,6 +2616,299 @@ "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_20" + }, { + "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_staticTextPFSlackBusAngle" + }, { + "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": "Slack bus angle" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "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": "boxSizerLvl5_17" + }, { + "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": 4406, + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "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": "20,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_textCtrlPFSlackBusAngle" + }, { + "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": "0,0" + }, { + "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": 4405, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "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_staticTextDeg_1" + }, { + "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": "degrees" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }] + }] }] }] }] @@ -8544,7 +8837,7 @@ }, { "type": "multi-string", "m_label": "Label:", - "m_value": "Alpha 2017w45a" + "m_value": "Alpha 2018w15a" }, { "type": "string", "m_label": "Wrap:", @@ -8812,5 +9105,1170 @@ "m_children": [] }] }] + }, { + "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": "ImportFormBase" + }, { + "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": "Import files" + }, { + "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": "ImportForm" + }, { + "type": "string", + "m_label": "File:", + "m_value": "ImportForm" + }, { + "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": "boxSizerMain" + }, { + "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": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "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_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_panelCEPEL" + }, { + "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": "CEPEL" + }, { + "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": 4449, + "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": "staticBoxSizerLvl3_1" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "choice", + "m_label": "Orientation:", + "m_selection": 0, + "m_options": ["Vertical", "Horizontal"] + }, { + "type": "string", + "m_label": "Label:", + "m_value": "ANAREDE" + }], + "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_staticTextBasePWFFile" + }, { + "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": ".PWF file" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4431, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_SMALL"], + "m_sizerFlags": ["wxLEFT", "wxRIGHT", "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": "300,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_filePickerANAREDEPWF" + }, { + "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": "Message:", + "m_value": "Select a ANAREDE PWF file" + }, { + "type": "string", + "m_label": "Wildcard:", + "m_value": "PWF files (*.pwf)|*.pwf" + }], + "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_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_staticTextBaseLSTFile" + }, { + "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": ".LST file" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4431, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_SMALL"], + "m_sizerFlags": ["wxLEFT", "wxRIGHT", "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": "300,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_filePickerANAREDELST" + }, { + "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": "Message:", + "m_value": "Select a ANAREDE LST file" + }, { + "type": "string", + "m_label": "Wildcard:", + "m_value": "LST files (*.lst)|*.lst" + }], + "m_events": [], + "m_children": [] + }] + }] + }, { + "m_type": 4449, + "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": "staticBoxSizerLvl3_2" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "choice", + "m_label": "Orientation:", + "m_selection": 0, + "m_options": ["Vertical", "Horizontal"] + }, { + "type": "string", + "m_label": "Label:", + "m_value": "ANATEM" + }], + "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_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_staticTextBaseSTBFile" + }, { + "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": true + }, { + "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": ".STB file" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4431, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_SMALL"], + "m_sizerFlags": ["wxLEFT", "wxRIGHT", "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": "300,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_filePickerANATEMSTB" + }, { + "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": true + }, { + "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": "Message:", + "m_value": "Select a ANATEM STB file" + }, { + "type": "string", + "m_label": "Wildcard:", + "m_value": "STB files (*.stb)|*.stb" + }], + "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": "boxSizer_bottonButtons" + }, { + "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_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnButtonOKClick(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }], + "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_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnButtonCancelClick(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }], + "m_children": [] + }] + }] + }] }] }
\ No newline at end of file diff --git a/Project/base/PropertiesFormBase.cpp b/Project/PropertiesFormBase.cpp index b451f01..3d2a7a0 100644 --- a/Project/base/PropertiesFormBase.cpp +++ b/Project/PropertiesFormBase.cpp @@ -259,6 +259,30 @@ SimulationsSettingsFormBase::SimulationsSettingsFormBase(wxWindow* parent, wxWin boxSizerLvl4_4->Add(m_textCtrlPFMaxIterations, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxBoxSizer* boxSizerLvl4_20 = new wxBoxSizer(wxVERTICAL); + + gridSizerLvl_3_4->Add(boxSizerLvl4_20, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_staticTextPFSlackBusAngle = new wxStaticText(m_panelPF, wxID_ANY, _("Slack bus angle"), wxDefaultPosition, wxDLG_UNIT(m_panelPF, wxSize(-1,-1)), 0); + + boxSizerLvl4_20->Add(m_staticTextPFSlackBusAngle, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + wxBoxSizer* boxSizerLvl5_17 = new wxBoxSizer(wxHORIZONTAL); + + boxSizerLvl4_20->Add(boxSizerLvl5_17, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_textCtrlPFSlackBusAngle = new wxTextCtrl(m_panelPF, wxID_ANY, wxT("0,0"), wxDefaultPosition, wxDLG_UNIT(m_panelPF, wxSize(-1,-1)), 0); + #if wxVERSION_NUMBER >= 3000 + m_textCtrlPFSlackBusAngle->SetHint(wxT("")); + #endif + + boxSizerLvl5_17->Add(m_textCtrlPFSlackBusAngle, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + m_textCtrlPFSlackBusAngle->SetMinSize(wxSize(20,-1)); + + m_staticTextDeg_1 = new wxStaticText(m_panelPF, wxID_ANY, _("degrees"), wxDefaultPosition, wxDLG_UNIT(m_panelPF, wxSize(-1,-1)), 0); + + boxSizerLvl5_17->Add(m_staticTextDeg_1, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + m_panelStability = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelStability, _("Stability"), false); @@ -749,7 +773,7 @@ AboutFormBase::AboutFormBase(wxWindow* parent, wxWindowID id, const wxString& ti flexGridSizer247->Add(m_staticTextVersionLabel, 0, wxALL, WXC_FROM_DIP(5)); - m_staticTextVersion = new wxStaticText(this, wxID_ANY, _("Alpha 2017w45a"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + m_staticTextVersion = new wxStaticText(this, wxID_ANY, _("Alpha 2018w15a"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); flexGridSizer247->Add(m_staticTextVersion, 0, wxALL, WXC_FROM_DIP(5)); @@ -804,3 +828,129 @@ AboutFormBase::~AboutFormBase() m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AboutFormBase::OnOKButtonClick), NULL, this); } + +ImportFormBase::ImportFormBase(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); + wxCDAD0InitBitmapResources(); + bBitmapLoaded = true; + } + + wxBoxSizer* boxSizerMain = new wxBoxSizer(wxVERTICAL); + this->SetSizer(boxSizerMain); + + m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT); + m_notebook->SetName(wxT("m_notebook")); + + boxSizerMain->Add(m_notebook, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_panelCEPEL = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); + m_notebook->AddPage(m_panelCEPEL, _("CEPEL"), false); + + wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxVERTICAL); + m_panelCEPEL->SetSizer(boxSizerLvl2_1); + + wxStaticBoxSizer* staticBoxSizerLvl3_1 = new wxStaticBoxSizer( new wxStaticBox(m_panelCEPEL, wxID_ANY, _("ANAREDE")), wxVERTICAL); + + boxSizerLvl2_1->Add(staticBoxSizerLvl3_1, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + wxBoxSizer* boxSizerLvl4_1 = new wxBoxSizer(wxVERTICAL); + + staticBoxSizerLvl3_1->Add(boxSizerLvl4_1, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_staticTextBasePWFFile = new wxStaticText(m_panelCEPEL, wxID_ANY, _(".PWF file"), wxDefaultPosition, wxDLG_UNIT(m_panelCEPEL, wxSize(-1,-1)), 0); + + boxSizerLvl4_1->Add(m_staticTextBasePWFFile, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_filePickerANAREDEPWF = new wxFilePickerCtrl(m_panelCEPEL, wxID_ANY, wxEmptyString, _("Select a ANAREDE PWF file"), wxT("PWF files (*.pwf)|*.pwf"), wxDefaultPosition, wxDLG_UNIT(m_panelCEPEL, wxSize(-1,-1)), wxFLP_DEFAULT_STYLE|wxFLP_SMALL); + + boxSizerLvl4_1->Add(m_filePickerANAREDEPWF, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5)); + m_filePickerANAREDEPWF->SetMinSize(wxSize(300,-1)); + + wxBoxSizer* boxSizerLvl4_2 = new wxBoxSizer(wxVERTICAL); + + staticBoxSizerLvl3_1->Add(boxSizerLvl4_2, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_staticTextBaseLSTFile = new wxStaticText(m_panelCEPEL, wxID_ANY, _(".LST file"), wxDefaultPosition, wxDLG_UNIT(m_panelCEPEL, wxSize(-1,-1)), 0); + + boxSizerLvl4_2->Add(m_staticTextBaseLSTFile, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_filePickerANAREDELST = new wxFilePickerCtrl(m_panelCEPEL, wxID_ANY, wxEmptyString, _("Select a ANAREDE LST file"), wxT("LST files (*.lst)|*.lst"), wxDefaultPosition, wxDLG_UNIT(m_panelCEPEL, wxSize(-1,-1)), wxFLP_DEFAULT_STYLE|wxFLP_SMALL); + + boxSizerLvl4_2->Add(m_filePickerANAREDELST, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5)); + m_filePickerANAREDELST->SetMinSize(wxSize(300,-1)); + + wxStaticBoxSizer* staticBoxSizerLvl3_2 = new wxStaticBoxSizer( new wxStaticBox(m_panelCEPEL, wxID_ANY, _("ANATEM")), wxVERTICAL); + + boxSizerLvl2_1->Add(staticBoxSizerLvl3_2, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + wxBoxSizer* boxSizerLvl4_3 = new wxBoxSizer(wxVERTICAL); + + staticBoxSizerLvl3_2->Add(boxSizerLvl4_3, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_staticTextBaseSTBFile = new wxStaticText(m_panelCEPEL, wxID_ANY, _(".STB file"), wxDefaultPosition, wxDLG_UNIT(m_panelCEPEL, wxSize(-1,-1)), 0); + m_staticTextBaseSTBFile->Enable(false); + + boxSizerLvl4_3->Add(m_staticTextBaseSTBFile, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_filePickerANATEMSTB = new wxFilePickerCtrl(m_panelCEPEL, wxID_ANY, wxEmptyString, _("Select a ANATEM STB file"), wxT("STB files (*.stb)|*.stb"), wxDefaultPosition, wxDLG_UNIT(m_panelCEPEL, wxSize(-1,-1)), wxFLP_DEFAULT_STYLE|wxFLP_SMALL); + m_filePickerANATEMSTB->Enable(false); + + boxSizerLvl4_3->Add(m_filePickerANATEMSTB, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5)); + m_filePickerANATEMSTB->SetMinSize(wxSize(300,-1)); + + wxBoxSizer* boxSizer_bottonButtons = new wxBoxSizer(wxHORIZONTAL); + + boxSizerMain->Add(boxSizer_bottonButtons, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + boxSizer_bottonButtons->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); + + boxSizer_bottonButtons->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); + + boxSizer_bottonButtons->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("ImportFormBase")); + 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_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ImportFormBase::OnButtonOKClick), NULL, this); + m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ImportFormBase::OnButtonCancelClick), NULL, this); + +} + +ImportFormBase::~ImportFormBase() +{ + m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ImportFormBase::OnButtonOKClick), NULL, this); + m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ImportFormBase::OnButtonCancelClick), NULL, this); + +} diff --git a/Project/base/PropertiesFormBase.h b/Project/PropertiesFormBase.h index 887f14b..f498e1e 100644 --- a/Project/base/PropertiesFormBase.h +++ b/Project/PropertiesFormBase.h @@ -28,6 +28,7 @@ #include <wx/grid.h> #include <wx/richtext/richtextctrl.h> #include <wx/hyperlink.h> +#include <wx/filepicker.h> #if wxVERSION_NUMBER >= 2900 #include <wx/persist.h> #include <wx/persist/toplevel.h> @@ -94,6 +95,9 @@ protected: wxTextCtrl* m_textCtrlPFTolerance; wxStaticText* m_staticTextPFMaxIterations; wxTextCtrl* m_textCtrlPFMaxIterations; + wxStaticText* m_staticTextPFSlackBusAngle; + wxTextCtrl* m_textCtrlPFSlackBusAngle; + wxStaticText* m_staticTextDeg_1; wxPanel* m_panelStability; wxStaticText* m_staticTextTimeStep; wxTextCtrl* m_textCtrlTimeStep; @@ -165,6 +169,9 @@ public: wxTextCtrl* GetTextCtrlPFTolerance() { return m_textCtrlPFTolerance; } wxStaticText* GetStaticTextPFMaxIterations() { return m_staticTextPFMaxIterations; } wxTextCtrl* GetTextCtrlPFMaxIterations() { return m_textCtrlPFMaxIterations; } + wxStaticText* GetStaticTextPFSlackBusAngle() { return m_staticTextPFSlackBusAngle; } + wxTextCtrl* GetTextCtrlPFSlackBusAngle() { return m_textCtrlPFSlackBusAngle; } + wxStaticText* GetStaticTextDeg_1() { return m_staticTextDeg_1; } wxPanel* GetPanelPF() { return m_panelPF; } wxStaticText* GetStaticTextTimeStep() { return m_staticTextTimeStep; } wxTextCtrl* GetTextCtrlTimeStep() { return m_textCtrlTimeStep; } @@ -257,4 +264,38 @@ public: virtual ~AboutFormBase(); }; + +class ImportFormBase : public wxDialog +{ +protected: + wxNotebook* m_notebook; + wxPanel* m_panelCEPEL; + wxStaticText* m_staticTextBasePWFFile; + wxFilePickerCtrl* m_filePickerANAREDEPWF; + wxStaticText* m_staticTextBaseLSTFile; + wxFilePickerCtrl* m_filePickerANAREDELST; + wxStaticText* m_staticTextBaseSTBFile; + wxFilePickerCtrl* m_filePickerANATEMSTB; + wxButton* m_buttonOK; + wxButton* m_buttonCancel; + +protected: + virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } + virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } + +public: + wxStaticText* GetStaticTextBasePWFFile() { return m_staticTextBasePWFFile; } + wxFilePickerCtrl* GetFilePickerANAREDEPWF() { return m_filePickerANAREDEPWF; } + wxStaticText* GetStaticTextBaseLSTFile() { return m_staticTextBaseLSTFile; } + wxFilePickerCtrl* GetFilePickerANAREDELST() { return m_filePickerANAREDELST; } + wxStaticText* GetStaticTextBaseSTBFile() { return m_staticTextBaseSTBFile; } + wxFilePickerCtrl* GetFilePickerANATEMSTB() { return m_filePickerANATEMSTB; } + wxPanel* GetPanelCEPEL() { return m_panelCEPEL; } + wxNotebook* GetNotebook() { return m_notebook; } + wxButton* GetButtonOK() { return m_buttonOK; } + wxButton* GetButtonCancel() { return m_buttonCancel; } + ImportFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE); + virtual ~ImportFormBase(); +}; + #endif diff --git a/Project/base/PropertiesFormBitmaps.cpp b/Project/PropertiesFormBitmaps.cpp index 9a7a6c3..9a27a1d 100644 --- a/Project/base/PropertiesFormBitmaps.cpp +++ b/Project/PropertiesFormBitmaps.cpp @@ -2654,6 +2654,6 @@ void wxCDAD0InitBitmapResources() } XRC_ADD_FILE(wxT("XRC_resource/PropertiesFormBitmaps.cpp$data_images_About2017.png"), xml_res_file_0, xml_res_size_0, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/PropertiesFormBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_PropertiesFormBitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/PropertiesFormBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_PropertiesFormBitmaps.xrc")); + XRC_ADD_FILE(wxT("XRC_resource/PropertiesFormBitmaps.cpp$C__Users_Thales_Documents_GitHub_PSP_Project_PropertiesFormBitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/PropertiesFormBitmaps.cpp$C__Users_Thales_Documents_GitHub_PSP_Project_PropertiesFormBitmaps.xrc")); } diff --git a/Project/RateLimiterForm.h b/Project/RateLimiterForm.h index b0ce57a..aa930db 100644 --- a/Project/RateLimiterForm.h +++ b/Project/RateLimiterForm.h @@ -17,7 +17,7 @@ #ifndef RATELIMITERFORM_H #define RATELIMITERFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class RateLimiter; diff --git a/Project/ReactiveShuntElementForm.h b/Project/ReactiveShuntElementForm.h index 4972fb3..7e571be 100644 --- a/Project/ReactiveShuntElementForm.h +++ b/Project/ReactiveShuntElementForm.h @@ -17,7 +17,7 @@ #ifndef REACTIVESHUNTELEMENTFORM_H #define REACTIVESHUNTELEMENTFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" #include <wx/log.h> class Capacitor; diff --git a/Project/SimulationsSettingsForm.cpp b/Project/SimulationsSettingsForm.cpp index 174b614..1e32b1d 100644 --- a/Project/SimulationsSettingsForm.cpp +++ b/Project/SimulationsSettingsForm.cpp @@ -123,6 +123,9 @@ bool SimulationsSettingsForm::ValidateData() if(!Element::IntFromString(this, m_textCtrlPFMaxIterations->GetValue(), data.powerFlowMaxIterations, _("Value entered incorrectly in the field \"Max. iterations (Power flow)\"."))) return false; + if(!Element::DoubleFromString(this, m_textCtrlPFSlackBusAngle->GetValue(), data.initAngle, + _("Value entered incorrectly in the field \"Slack bus angle\"."))) + return false; if(!Element::DoubleFromString(this, m_textCtrlTimeStep->GetValue(), data.timeStep, _("Value entered incorrectly in the field \"Time step\"."))) return false; diff --git a/Project/SimulationsSettingsForm.h b/Project/SimulationsSettingsForm.h index c99ab3c..72a0bf8 100644 --- a/Project/SimulationsSettingsForm.h +++ b/Project/SimulationsSettingsForm.h @@ -18,7 +18,7 @@ #ifndef SIMULATIONSSETTINGSFORM_H #define SIMULATIONSSETTINGSFORM_H -#include "base/PropertiesFormBase.h" +#include "PropertiesFormBase.h" class PropertiesData; diff --git a/Project/Sum.cpp b/Project/Sum.cpp index 6d15e7f..9908497 100644 --- a/Project/Sum.cpp +++ b/Project/Sum.cpp @@ -218,10 +218,7 @@ bool Sum::Solve(double* input, double timeStep) for(auto itCN = nodeList.begin(), itCNEnd = nodeList.end(); itCN != itCNEnd; ++itCN) { Node* childNode = *itCN; if(childNode == node) { - if(!cLine->IsSolved()) - inputVector.push_back(0.0); - else - inputVector.push_back(cLine->GetValue()); + inputVector.push_back(cLine->GetValue()); break; } } diff --git a/Project/SumForm.h b/Project/SumForm.h index 34193d8..f1d1270 100644 --- a/Project/SumForm.h +++ b/Project/SumForm.h @@ -18,7 +18,7 @@ #ifndef SUMFORM_H #define SUMFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class Sum; diff --git a/Project/SwitchingForm.h b/Project/SwitchingForm.h index 34344af..df539e6 100644 --- a/Project/SwitchingForm.h +++ b/Project/SwitchingForm.h @@ -18,7 +18,7 @@ #ifndef SWITCHINGFORM_H #define SWITCHINGFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class PowerElement; diff --git a/Project/SyncMachineForm.h b/Project/SyncMachineForm.h index c56c8c1..793ca79 100644 --- a/Project/SyncMachineForm.h +++ b/Project/SyncMachineForm.h @@ -18,7 +18,7 @@ #ifndef SYNCMACHINEFORM_H #define SYNCMACHINEFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class GeneratorStabForm; class SyncGenerator; diff --git a/Project/TextForm.h b/Project/TextForm.h index 80e7fe7..eda2322 100644 --- a/Project/TextForm.h +++ b/Project/TextForm.h @@ -17,7 +17,7 @@ #ifndef TEXTFORM_H #define TEXTFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" #include "Text.h" #include "ElectricCalculation.h" diff --git a/Project/TransferFunctionForm.h b/Project/TransferFunctionForm.h index fffd362..7ae478a 100644 --- a/Project/TransferFunctionForm.h +++ b/Project/TransferFunctionForm.h @@ -18,7 +18,7 @@ #ifndef TRANSFERFUNCTIONFORM_H #define TRANSFERFUNCTIONFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class TransferFunction; diff --git a/Project/TransformerForm.h b/Project/TransformerForm.h index 6b76bf4..1cb0db2 100644 --- a/Project/TransformerForm.h +++ b/Project/TransformerForm.h @@ -18,7 +18,7 @@ #ifndef TRANSFORMERFORM_H #define TRANSFORMERFORM_H -#include "base/ElementFormBase.h" +#include "ElementFormBase.h" class SwitchingForm; class Transformer; diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index 9bd249b..45944ab 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -15,34 +15,35 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include "Workspace.h" #include "Camera.h" #include "Element.h" +#include "Workspace.h" //#include "Bus.h" +#include "Capacitor.h" +#include "ElementDataObject.h" +#include "IndMotor.h" +#include "Inductor.h" #include "Line.h" -#include "Transformer.h" +#include "Load.h" #include "SyncGenerator.h" -#include "IndMotor.h" #include "SyncMotor.h" -#include "Load.h" -#include "Inductor.h" -#include "Capacitor.h" -#include "ElementDataObject.h" +#include "Transformer.h" #include "Text.h" -#include "PowerFlow.h" -#include "Fault.h" #include "Electromechanical.h" +#include "Fault.h" +#include "PowerFlow.h" -#include "ElementPlotData.h" #include "ChartView.h" +#include "ElementPlotData.h" #include "PropertiesData.h" // Workspace Workspace::Workspace() : WorkspaceBase(NULL) {} -Workspace::Workspace(wxWindow* parent, wxString name, wxStatusBar* statusBar, wxGLContext* sharedGLContext) : WorkspaceBase(parent) +Workspace::Workspace(wxWindow* parent, wxString name, wxStatusBar* statusBar, wxGLContext* sharedGLContext) + : WorkspaceBase(parent) { m_timer->Start(); m_name = name; @@ -51,9 +52,7 @@ Workspace::Workspace(wxWindow* parent, wxString name, wxStatusBar* statusBar, wx m_camera = new Camera(); m_selectionRect = wxRect2DDouble(0, 0, 0, 0); - for(int i = 0; i < NUM_ELEMENTS; ++i) { - m_elementNumber[i] = 1; - } + for(int i = 0; i < NUM_ELEMENTS; ++i) { m_elementNumber[i] = 1; } const int widths[4] = {-3, -1, 100, 100}; m_statusBar->SetStatusWidths(4, widths); @@ -78,7 +77,7 @@ Workspace::~Workspace() void Workspace::OnPaint(wxPaintEvent& event) { if(!m_glCanvas->IsShown()) return; - + wxPaintDC dc(m_glCanvas); m_glContext->SetCurrent(*m_glCanvas); SetViewport(); @@ -182,9 +181,7 @@ void Workspace::OnLeftClickDown(wxMouseEvent& event) } // The line element can have an indefined number of points. if(!foundElement) { - if(typeid(*newElement) == typeid(Line)) { - newElement->AddPoint(m_camera->ScreenToWorld(clickPoint)); - } + if(typeid(*newElement) == typeid(Line)) { newElement->AddPoint(m_camera->ScreenToWorld(clickPoint)); } } foundElement = true; } else { @@ -217,9 +214,7 @@ void Workspace::OnLeftClickDown(wxMouseEvent& event) clickPickbox = true; } // If didn't found a pickbox, move the element - if(!clickPickbox) { - m_mode = MODE_MOVE_ELEMENT; - } + if(!clickPickbox) { m_mode = MODE_MOVE_ELEMENT; } } // Click in a switch. @@ -430,9 +425,7 @@ void Workspace::OnLeftClickUp(wxMouseEvent& event) } else { // Deselect if(!event.ControlDown()) { - if(!element->Contains(m_camera->ScreenToWorld(event.GetPosition()))) { - element->SetSelected(false); - } + if(!element->Contains(m_camera->ScreenToWorld(event.GetPosition()))) { element->SetSelected(false); } } if(element->PickboxContains(m_camera->ScreenToWorld(event.GetPosition()))) { @@ -454,9 +447,7 @@ void Workspace::OnLeftClickUp(wxMouseEvent& event) text->SetSelected(false); } } else if(!event.ControlDown()) { - if(!text->Contains(m_camera->ScreenToWorld(event.GetPosition()))) { - text->SetSelected(false); - } + if(!text->Contains(m_camera->ScreenToWorld(event.GetPosition()))) { text->SetSelected(false); } } } @@ -464,17 +455,11 @@ void Workspace::OnLeftClickUp(wxMouseEvent& event) std::rotate(itnp, itnp + 1, m_elementList.end()); updateVoltages = true; } - if(!foundPickbox) { - SetCursor(wxCURSOR_ARROW); - } + if(!foundPickbox) { SetCursor(wxCURSOR_ARROW); } - if(m_mode != MODE_INSERT) { - m_mode = MODE_EDIT; - } + if(m_mode != MODE_INSERT) { m_mode = MODE_EDIT; } - if(updateVoltages) { - ValidateElementsVoltages(); - } + if(updateVoltages) { ValidateElementsVoltages(); } if(m_continuousCalc && m_disconnectedElement) { m_disconnectedElement = false; @@ -705,9 +690,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event) } } break; case 'F': { - if(event.GetModifiers() == wxMOD_SHIFT) { - Fit(); - } + if(event.GetModifiers() == wxMOD_SHIFT) { Fit(); } } break; case 'R': // Rotate the selected elements. { @@ -818,9 +801,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event) } break; case 'V': { if(!insertingElement) { - if(event.GetModifiers() == wxMOD_CONTROL) { - Paste(); - } + if(event.GetModifiers() == wxMOD_CONTROL) { Paste(); } } } break; default: @@ -892,9 +873,7 @@ void Workspace::OnPopupClick(wxCommandEvent& event) // Parent's element rotating... for(int i = 0; i < (int)iElement->GetParentList().size(); i++) { Element* parent = iElement->GetParentList()[i]; - if(parent == element) { - iElement->RotateNode(parent); - } + if(parent == element) { iElement->RotateNode(parent); } } } Redraw(); @@ -906,9 +885,7 @@ void Workspace::OnPopupClick(wxCommandEvent& event) // Parent's element rotating... for(int i = 0; i < (int)iElement->GetParentList().size(); i++) { Element* parent = iElement->GetParentList()[i]; - if(parent == element) { - iElement->RotateNode(parent, false); - } + if(parent == element) { iElement->RotateNode(parent, false); } } } Redraw(); @@ -930,9 +907,7 @@ void Workspace::OnPopupClick(wxCommandEvent& event) std::vector<Element*> parentList = element->GetParentList(); for(auto itp = parentList.begin(), itEnd = parentList.end(); itp != itEnd; ++itp) { Element* parent = *itp; - if(parent) { - parent->RemoveChild(element); - } + if(parent) { parent->RemoveChild(element); } } for(auto itt = m_textList.begin(); itt != m_textList.end(); ++itt) { @@ -1005,9 +980,7 @@ void Workspace::DeleteSelectedElements() std::vector<Element*> parentList = element->GetParentList(); for(auto itp = parentList.begin(), itEnd = parentList.end(); itp != itEnd; ++itp) { Element* parent = *itp; - if(parent) { - parent->RemoveChild(element); - } + if(parent) { parent->RemoveChild(element); } } for(auto itt = m_textList.begin(); itt != m_textList.end(); ++itt) { @@ -1060,9 +1033,7 @@ void Workspace::Fit() wxPoint2DDouble leftUpCorner(0, 0); wxPoint2DDouble rightDownCorner(0, 0); std::vector<Element*> elementList = GetElementList(); - for(auto it = m_textList.begin(), itEnd = m_textList.end(); it != itEnd; ++it) { - elementList.push_back(*it); - } + for(auto it = m_textList.begin(), itEnd = m_textList.end(); it != itEnd; ++it) { elementList.push_back(*it); } if(!GetElementsCorners(leftUpCorner, rightDownCorner, elementList)) return; wxPoint2DDouble middleCoords = (leftUpCorner + rightDownCorner) / 2.0; @@ -1137,8 +1108,15 @@ void Workspace::ValidateElementsVoltages() bool Workspace::RunPowerFlow() { + auto simProp = m_properties->GetSimulationPropertiesData(); + double basePower = simProp.basePower; + if(simProp.basePowerUnit == UNIT_MVA) + basePower *= 1e6; + else if(simProp.basePowerUnit == UNIT_kVA) + basePower *= 1e3; PowerFlow pf(GetElementList()); - bool result = pf.RunGaussSeidel(); + bool result = pf.RunGaussSeidel(basePower, simProp.powerFlowMaxIterations, simProp.powerFlowTolerance, + simProp.initAngle, simProp.accFator); if(!result) { wxMessageDialog msgDialog(this, pf.GetErrorMessage(), _("Error"), wxOK | wxCENTRE | wxICON_ERROR); msgDialog.ShowModal(); @@ -1181,15 +1159,11 @@ void Workspace::CopySelection() bus->SetElectricalData(data); busNumber++; } - if(element->IsSelected()) { - selectedElements.push_back(element); - } + if(element->IsSelected()) { selectedElements.push_back(element); } } for(auto it = m_textList.begin(), itEnd = m_textList.end(); it != itEnd; ++it) { Text* text = *it; - if(text->IsSelected()) { - selectedElements.push_back(text); - } + if(text->IsSelected()) { selectedElements.push_back(text); } } ElementDataObject* dataObject = new ElementDataObject(selectedElements); if(wxTheClipboard->Open()) { diff --git a/Project/Workspace.h b/Project/Workspace.h index 4c9bde6..83b64e6 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -26,7 +26,7 @@ #include <wx/clipbrd.h> #include <wx/tipwin.h> -#include "base/WorkspaceBase.h" +#include "WorkspaceBase.h" #include "Bus.h" #include "ControlEditor.h" diff --git a/Project/Workspace.wxcp b/Project/Workspace.wxcp index f30cd9d..bebedf1 100644 --- a/Project/Workspace.wxcp +++ b/Project/Workspace.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": "base/", + "m_generatedFilesDir": ".", "m_objCounter": 6, "m_includeFiles": [], "m_bitmapFunction": "wxC52C4InitBitmapResources", diff --git a/Project/base/WorkspaceBase.cpp b/Project/WorkspaceBase.cpp index 6fc2b79..6fc2b79 100644 --- a/Project/base/WorkspaceBase.cpp +++ b/Project/WorkspaceBase.cpp diff --git a/Project/base/WorkspaceBase.h b/Project/WorkspaceBase.h index 2ceed20..2ceed20 100644 --- a/Project/base/WorkspaceBase.h +++ b/Project/WorkspaceBase.h diff --git a/Project/base/WorkspaceBitmaps.cpp b/Project/WorkspaceBitmaps.cpp index b370872..b370872 100644 --- a/Project/base/WorkspaceBitmaps.cpp +++ b/Project/WorkspaceBitmaps.cpp diff --git a/Project/data/lang/pt_BR/pt_BR.mo b/Project/data/lang/pt_BR/pt_BR.mo Binary files differindex bb5feb8..288b51e 100644 --- a/Project/data/lang/pt_BR/pt_BR.mo +++ b/Project/data/lang/pt_BR/pt_BR.mo diff --git a/Project/data/lang/pt_BR/pt_BR.po b/Project/data/lang/pt_BR/pt_BR.po index 89bb982..c92479c 100644 --- a/Project/data/lang/pt_BR/pt_BR.po +++ b/Project/data/lang/pt_BR/pt_BR.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PSP-UFU pt_BR 0.0.1\n" -"POT-Creation-Date: 2017-12-20 11:07-0200\n" -"PO-Revision-Date: 2017-12-20 11:08-0200\n" +"POT-Creation-Date: 2018-04-11 00:56-0300\n" +"PO-Revision-Date: 2018-04-11 01:00-0300\n" "Last-Translator: \n" "Language-Team: Thales Lima Oliveira <thaleslima.ufu@gmail.com>\n" "Language: pt_BR\n" @@ -37,11 +37,11 @@ msgstr "Conselheiro-chefe" msgid "Edit bus" msgstr "Editar barra" -#: Bus.cpp:224 Transformer.cpp:424 Transformer.cpp:435 +#: Bus.cpp:224 Transformer.cpp:408 Transformer.cpp:419 msgid " V" msgstr " V" -#: Bus.cpp:224 Transformer.cpp:427 Transformer.cpp:438 +#: Bus.cpp:224 Transformer.cpp:411 Transformer.cpp:422 msgid " kV" msgstr " kV" @@ -55,10 +55,10 @@ msgstr "" #: Bus.cpp:226 Bus.cpp:232 Bus.cpp:233 Bus.cpp:234 Bus.cpp:236 Bus.cpp:237 #: Bus.cpp:238 Bus.cpp:241 Capacitor.cpp:203 IndMotor.cpp:109 IndMotor.cpp:128 -#: Inductor.cpp:197 Line.cpp:517 Line.cpp:519 Line.cpp:521 Line.cpp:523 -#: Load.cpp:218 Load.cpp:235 SyncGenerator.cpp:193 SyncGenerator.cpp:212 -#: SyncMotor.cpp:141 SyncMotor.cpp:160 Transformer.cpp:453 Transformer.cpp:455 -#: Transformer.cpp:457 Transformer.cpp:459 +#: Inductor.cpp:197 Line.cpp:502 Line.cpp:504 Line.cpp:506 Line.cpp:508 +#: Load.cpp:216 Load.cpp:233 SyncGenerator.cpp:189 SyncGenerator.cpp:208 +#: SyncMotor.cpp:139 SyncMotor.cpp:158 Transformer.cpp:437 Transformer.cpp:439 +#: Transformer.cpp:441 Transformer.cpp:443 msgid " p.u." msgstr " p.u." @@ -130,7 +130,7 @@ msgstr "" "\n" "Scc = " -#: Bus.cpp:257 Load.cpp:268 TextForm.cpp:873 +#: Bus.cpp:257 Load.cpp:266 TextForm.cpp:873 msgid "Voltage" msgstr "Tensão" @@ -229,12 +229,12 @@ msgstr "kV" msgid "Edit Capacitor" msgstr "Editar Capacitor" -#: Capacitor.cpp:148 ChartView.cpp:111 +#: Capacitor.cpp:148 ChartView.cpp:111 ImportForm.cpp:263 msgid "Capacitor" msgstr "Capacitor" -#: Capacitor.cpp:200 IndMotor.cpp:125 Inductor.cpp:194 Load.cpp:232 -#: SyncGenerator.cpp:209 SyncMotor.cpp:157 +#: Capacitor.cpp:200 IndMotor.cpp:125 Inductor.cpp:194 Load.cpp:230 +#: SyncGenerator.cpp:205 SyncMotor.cpp:155 msgid "" "\n" "Q = " @@ -242,18 +242,18 @@ msgstr "" "\n" "Q = " -#: Capacitor.cpp:206 IndMotor.cpp:131 Inductor.cpp:200 Load.cpp:238 -#: SyncGenerator.cpp:215 SyncMotor.cpp:163 +#: Capacitor.cpp:206 IndMotor.cpp:131 Inductor.cpp:200 Load.cpp:236 +#: SyncGenerator.cpp:211 SyncMotor.cpp:161 msgid " VAr" msgstr " VAr" -#: Capacitor.cpp:209 IndMotor.cpp:134 Inductor.cpp:203 Load.cpp:241 -#: SyncGenerator.cpp:218 SyncMotor.cpp:166 +#: Capacitor.cpp:209 IndMotor.cpp:134 Inductor.cpp:203 Load.cpp:239 +#: SyncGenerator.cpp:214 SyncMotor.cpp:164 msgid " kVAr" msgstr " kVAr" -#: Capacitor.cpp:212 IndMotor.cpp:137 Inductor.cpp:206 Load.cpp:244 -#: SyncGenerator.cpp:221 SyncMotor.cpp:169 +#: Capacitor.cpp:212 IndMotor.cpp:137 Inductor.cpp:206 Load.cpp:242 +#: SyncGenerator.cpp:217 SyncMotor.cpp:167 msgid " MVAr" msgstr " MVAr" @@ -285,11 +285,11 @@ msgstr "Cruz" msgid "Driagonal cross" msgstr "Cruz diagonal" -#: ChartView.cpp:100 ChartView.cpp:520 base/ElementFormBase.cpp:236 +#: ChartView.cpp:100 ChartView.cpp:521 ElementFormBase.cpp:236 msgid "Time" msgstr "Tempo" -#: ChartView.cpp:107 base/ElementFormBase.h:144 +#: ChartView.cpp:107 ElementFormBase.h:144 msgid "Bus" msgstr "Barra" @@ -297,20 +297,22 @@ msgstr "Barra" msgid "Induction motor" msgstr "Motor de indução" -#: ChartView.cpp:109 DataReport.cpp:397 DataReport.cpp:408 DataReport.cpp:549 -#: DataReport.cpp:750 DataReport.cpp:788 base/ElementFormBase.h:449 +#: ChartView.cpp:109 DataReport.cpp:395 DataReport.cpp:406 DataReport.cpp:543 +#: DataReport.cpp:740 DataReport.cpp:778 ElementFormBase.h:449 +#: ImportForm.cpp:390 msgid "Line" msgstr "Linha" -#: ChartView.cpp:110 base/ElementFormBase.h:636 +#: ChartView.cpp:110 ElementFormBase.h:636 ImportForm.cpp:228 +#: ImportForm.cpp:430 msgid "Load" msgstr "Carga" -#: ChartView.cpp:112 Inductor.cpp:142 +#: ChartView.cpp:112 ImportForm.cpp:270 Inductor.cpp:142 msgid "Inductor" msgstr "Indutor" -#: ChartView.cpp:113 +#: ChartView.cpp:113 ImportForm.cpp:183 ImportForm.cpp:477 msgid "Synchronous compensator" msgstr "Compensador síncrono" @@ -318,38 +320,39 @@ msgstr "Compensador síncrono" msgid "Synchronous generator" msgstr "Gerador síncrono" -#: ChartView.cpp:115 DataReport.cpp:443 DataReport.cpp:454 DataReport.cpp:600 -#: DataReport.cpp:854 DataReport.cpp:892 base/ElementFormBase.h:548 +#: ChartView.cpp:115 DataReport.cpp:439 DataReport.cpp:450 DataReport.cpp:592 +#: DataReport.cpp:842 DataReport.cpp:880 ElementFormBase.h:548 +#: ImportForm.cpp:352 msgid "Transformer" msgstr "Transformador" -#: ChartView.cpp:116 ControlEditor.cpp:809 +#: ChartView.cpp:116 ControlEditor.cpp:811 msgid "Test" msgstr "Teste" -#: ChartView.cpp:141 base/ChartViewBase.cpp:123 +#: ChartView.cpp:141 ChartViewBase.cpp:123 msgid "Draw" msgstr "Plotar" -#: ChartView.cpp:157 base/ChartViewBase.cpp:127 +#: ChartView.cpp:157 ChartViewBase.cpp:127 msgid "Thickness" msgstr "Espessura" -#: ChartView.cpp:159 DataReport.cpp:229 DataReport.cpp:241 DataReport.cpp:251 -#: DataReport.cpp:296 SwitchingForm.cpp:23 SwitchingForm.cpp:32 -#: base/ChartViewBase.cpp:133 base/ElementFormBase.cpp:2497 +#: ChartView.cpp:159 ChartViewBase.cpp:133 DataReport.cpp:229 +#: DataReport.cpp:241 DataReport.cpp:251 DataReport.cpp:296 +#: ElementFormBase.cpp:2497 SwitchingForm.cpp:23 SwitchingForm.cpp:32 msgid "Type" msgstr "Tipo" -#: ChartView.cpp:161 base/ChartViewBase.cpp:141 +#: ChartView.cpp:161 ChartViewBase.cpp:141 msgid "Axis" msgstr "Eixo" -#: ChartView.cpp:176 base/ChartViewBase.cpp:160 +#: ChartView.cpp:176 ChartViewBase.cpp:160 msgid "Margins" msgstr "Margens" -#: ChartView.cpp:181 base/ChartViewBase.cpp:175 +#: ChartView.cpp:181 ChartViewBase.cpp:175 msgid "Axis limit" msgstr "Limites dos eixos" @@ -369,26 +372,135 @@ msgstr "Informação" msgid "It was not possible to send to clipboard" msgstr "Não foi possível enviar para a área de transferência" -#: ChartView.cpp:264 ChartView.cpp:483 ControlEditor.cpp:794 -#: ControlEditor.cpp:888 ControlElementSolver.cpp:95 ControlSystemTest.cpp:53 +#: ChartView.cpp:264 ChartView.cpp:484 ControlEditor.cpp:796 +#: ControlEditor.cpp:891 ControlElementSolver.cpp:98 ControlSystemTest.cpp:53 #: ControlSystemTest.cpp:60 ControlSystemTest.cpp:67 ControlSystemTest.cpp:74 -#: Element.cpp:297 Element.cpp:311 GeneralPropertiesForm.cpp:74 Line.cpp:168 -#: Line.cpp:397 LoadForm.cpp:189 LoadForm.cpp:196 MainFrame.cpp:311 -#: SimulationsSettingsForm.cpp:188 SimulationsSettingsForm.cpp:195 -#: SumForm.cpp:58 SumForm.cpp:74 TextForm.cpp:1225 Workspace.cpp:1143 -#: Workspace.cpp:1208 Workspace.cpp:1316 Workspace.cpp:1420 Workspace.cpp:1442 -#: Workspace.cpp:1460 +#: Element.cpp:294 Element.cpp:308 GeneralPropertiesForm.cpp:74 +#: ImportForm.cpp:53 Line.cpp:157 Line.cpp:386 LoadForm.cpp:189 +#: LoadForm.cpp:196 MainFrame.cpp:304 MathExpressionForm.cpp:85 +#: SimulationsSettingsForm.cpp:191 SimulationsSettingsForm.cpp:198 +#: SumForm.cpp:58 SumForm.cpp:74 TextForm.cpp:1225 Workspace.cpp:1121 +#: Workspace.cpp:1182 Workspace.cpp:1290 Workspace.cpp:1394 Workspace.cpp:1416 +#: Workspace.cpp:1434 msgid "Error" msgstr "Erro" -#: ChartView.cpp:476 +#: ChartView.cpp:477 msgid "Save CSV file" msgstr "Salvar arquivo CSV" -#: ChartView.cpp:483 +#: ChartView.cpp:484 msgid "It was not possible to open or create the selected file." msgstr "Não foi possível criar ou abrir o arquivo selecionado." +#: ChartViewBase.cpp:64 MainFrameBase.cpp:72 MainFrameBase.cpp:73 +msgid "File" +msgstr "Arquivo" + +#: ChartViewBase.cpp:66 +msgid "Save chart as image" +msgstr "Salvar gráfico como imagem" + +#: ChartViewBase.cpp:69 +msgid "Send to clipboard" +msgstr "Enviar para a área de transferência" + +#: ChartViewBase.cpp:72 +msgid "Export CSV..." +msgstr "Exportar CSV..." + +#: ChartViewBase.cpp:77 MainFrameBase.cpp:90 +msgid "Exit" +msgstr "Sair" + +#: ChartViewBase.cpp:81 +msgid "View" +msgstr "Vizualização" + +#: ChartViewBase.cpp:83 MainFrameBase.cpp:148 +msgid "Fit" +msgstr "Encaixar" + +#: ChartViewBase.cpp:88 +msgid "Show grid" +msgstr "Exibir linhas de grade" + +#: ChartViewBase.cpp:91 +msgid "Show label" +msgstr "Exibir legendas" + +#: ChartViewBase.cpp:94 +msgid "Show coordinates" +msgstr "Exibir coordenadas" + +#: ChartViewBase.cpp:97 +msgid "Dark theme" +msgstr "Tema escuro" + +#: ChartViewBase.cpp:120 +msgid "Line properties" +msgstr "Propriedades do traço" + +#: ChartViewBase.cpp:139 +msgid "Y" +msgstr "Y" + +#: ChartViewBase.cpp:140 +msgid "X" +msgstr "X" + +#: ChartViewBase.cpp:145 +msgid "Chart properties" +msgstr "Propriedades do gráfico" + +#: ChartViewBase.cpp:148 +msgid "Chart title" +msgstr "Título do gráfico" + +#: ChartViewBase.cpp:152 +msgid "X axis label" +msgstr "Rótulo do eixo X" + +#: ChartViewBase.cpp:156 +msgid "Y axis label" +msgstr "Rótulo do eixo Y" + +#: ChartViewBase.cpp:163 ElementFormBase.cpp:2516 +msgid "Up" +msgstr "Cima" + +#: ChartViewBase.cpp:166 +msgid "Botton" +msgstr "Baixo" + +#: ChartViewBase.cpp:169 +msgid "Left" +msgstr "Esquerda" + +#: ChartViewBase.cpp:172 +msgid "Right" +msgstr "Direita" + +#: ChartViewBase.cpp:178 +msgid "X min" +msgstr "X min" + +#: ChartViewBase.cpp:181 +msgid "X max" +msgstr "X máx" + +#: ChartViewBase.cpp:184 +msgid "Y min" +msgstr "Y min" + +#: ChartViewBase.cpp:187 +msgid "Y max" +msgstr "Y máx" + +#: ChartViewBase.h:96 +msgid "Chart viewer" +msgstr "Visualizador de gráficos" + #: ConstantForm.cpp:41 msgid "Value entered incorrectly in the field \"Constant value\"." msgstr "Valor inserido incorretamente no campo \"Valor da constante\"." @@ -401,23 +513,23 @@ msgstr "Entrada/Saída" msgid "Transfer fcn" msgstr "Func Transferência" -#: ControlEditor.cpp:172 base/ElementFormBase.h:870 +#: ControlEditor.cpp:172 ElementFormBase.h:870 msgid "Sum" msgstr "Somador" -#: ControlEditor.cpp:178 base/ElementFormBase.h:988 +#: ControlEditor.cpp:178 ElementFormBase.h:988 msgid "Constant" msgstr "Constante" -#: ControlEditor.cpp:185 base/ElementFormBase.h:1014 +#: ControlEditor.cpp:185 ElementFormBase.h:1014 msgid "Gain" msgstr "Ganho" -#: ControlEditor.cpp:191 base/ElementFormBase.h:900 +#: ControlEditor.cpp:191 ElementFormBase.h:900 msgid "Limiter" msgstr "Limitador" -#: ControlEditor.cpp:198 base/ElementFormBase.h:930 +#: ControlEditor.cpp:198 ElementFormBase.h:930 msgid "Rate limiter" msgstr "Limitador de taxa" @@ -433,63 +545,184 @@ msgstr "Divisor" msgid "Math Expression" msgstr "Expressão matemática" -#: ControlEditor.cpp:225 base/ElementFormBase.h:962 +#: ControlEditor.cpp:225 ElementFormBase.h:962 msgid "Exponential" msgstr "Exponencial" -#: ControlEditor.cpp:775 +#: ControlEditor.cpp:777 msgid "Save CTL file" msgstr "Salvar arquivo CTL" -#: ControlEditor.cpp:786 +#: ControlEditor.cpp:788 msgid "Open CTL file" msgstr "Abrir arquivo CTL" -#: ControlEditor.cpp:794 MainFrame.cpp:311 +#: ControlEditor.cpp:796 MainFrame.cpp:304 msgid "It was not possible to open the selected file." msgstr "Não foi possível abrir o arquivo selecionado." -#: ControlEditor.cpp:809 Electromechanical.cpp:70 +#: ControlEditor.cpp:811 Electromechanical.cpp:70 msgid "Initializing..." msgstr "Inicializando..." -#: ControlEditor.cpp:872 +#: ControlEditor.cpp:875 msgid "I/O" msgstr "I/O" -#: ControlEditor.cpp:873 base/ElementFormBase.cpp:3656 +#: ControlEditor.cpp:876 ElementFormBase.cpp:3656 msgid "Input" msgstr "Entrada" -#: ControlEditor.cpp:874 base/ElementFormBase.cpp:3666 +#: ControlEditor.cpp:877 ElementFormBase.cpp:3666 msgid "Output" msgstr "Saída" -#: ControlEditor.cpp:888 +#: ControlEditor.cpp:891 msgid "It was not possible to solve the control system" msgstr "Não foi possível resolver o sistema de controle" -#: ControlElementSolver.cpp:56 +#: ControlEditorBase.cpp:63 MainFrameBase.cpp:82 +msgid "New" +msgstr "Novo" + +#: ControlEditorBase.cpp:65 MainFrameBase.cpp:86 +msgid "Import" +msgstr "Importar" + +#: ControlEditorBase.cpp:67 +msgid "Export" +msgstr "Exportar" + +#: ControlEditorBase.cpp:71 MainFrameBase.cpp:125 +msgid "Copy" +msgstr "Copiar" + +#: ControlEditorBase.cpp:73 MainFrameBase.cpp:127 +msgid "Paste" +msgstr "Colar" + +#: ControlEditorBase.cpp:75 MainFrameBase.cpp:129 +msgid "Undo" +msgstr "Desfazer" + +#: ControlEditorBase.cpp:77 MainFrameBase.cpp:131 +msgid "Redo" +msgstr "Refazer" + +#: ControlEditorBase.cpp:81 MainFrameBase.cpp:142 +msgid "Drag" +msgstr "Arrastar" + +#: ControlEditorBase.cpp:83 MainFrameBase.cpp:144 +msgid "Move" +msgstr "Mover" + +#: ControlEditorBase.cpp:85 Element.cpp:256 Line.cpp:291 MainFrameBase.cpp:146 +msgid "Delete" +msgstr "Excluir" + +#: ControlEditorBase.cpp:96 +msgid "Control elements" +msgstr "Elementos de controle" + +#: ControlEditorBase.cpp:124 +msgid "Test system..." +msgstr "Testar sistema..." + +#: ControlEditorBase.cpp:130 ElementFormBase.cpp:328 ElementFormBase.cpp:731 +#: ElementFormBase.cpp:1235 ElementFormBase.cpp:1547 ElementFormBase.cpp:1947 +#: ElementFormBase.cpp:2282 ElementFormBase.cpp:2412 ElementFormBase.cpp:2540 +#: ElementFormBase.cpp:2698 ElementFormBase.cpp:2896 ElementFormBase.cpp:3011 +#: ElementFormBase.cpp:3100 ElementFormBase.cpp:3201 ElementFormBase.cpp:3302 +#: ElementFormBase.cpp:3407 ElementFormBase.cpp:3496 ElementFormBase.cpp:3585 +#: ElementFormBase.cpp:3682 ElementFormBase.cpp:3835 PropertiesFormBase.cpp:78 +#: PropertiesFormBase.cpp:659 PropertiesFormBase.cpp:791 +#: PropertiesFormBase.cpp:911 +msgid "OK" +msgstr "OK" + +#: ControlEditorBase.cpp:214 ElementFormBase.cpp:35 ElementFormBase.cpp:404 +#: ElementFormBase.cpp:1302 ElementFormBase.cpp:1615 ElementFormBase.cpp:2015 +#: ElementFormBase.cpp:2352 ElementFormBase.cpp:2609 ElementFormBase.cpp:2766 +#: ElementFormBase.cpp:2976 ElementFormBase.cpp:3077 ElementFormBase.cpp:3166 +#: ElementFormBase.cpp:3267 ElementFormBase.cpp:3368 ElementFormBase.cpp:3473 +#: ElementFormBase.cpp:3562 ElementFormBase.cpp:3651 ElementFormBase.cpp:3752 +#: PropertiesFormBase.cpp:35 PropertiesFormBase.cpp:144 +msgid "General" +msgstr "Geral" + +#: ControlEditorBase.cpp:219 +msgid "Input type:" +msgstr "Tipo de entrada:" + +#: ControlEditorBase.cpp:240 +msgid "Start time" +msgstr "Tempo de início" + +#: ControlEditorBase.cpp:255 ControlEditorBase.cpp:308 ElementFormBase.cpp:251 +#: ElementFormBase.cpp:274 ElementFormBase.cpp:829 ElementFormBase.cpp:1086 +#: ElementFormBase.cpp:1109 ElementFormBase.cpp:1186 ElementFormBase.cpp:1209 +#: PropertiesFormBase.cpp:315 PropertiesFormBase.cpp:338 +#: PropertiesFormBase.cpp:429 +msgid "s" +msgstr "s" + +#: ControlEditorBase.cpp:263 +msgid "Slope" +msgstr "Inclinação" + +#: ControlEditorBase.cpp:278 PropertiesFormBase.cpp:300 +msgid "Time step" +msgstr "Passo de integração" + +#: ControlEditorBase.cpp:293 PropertiesFormBase.cpp:323 +msgid "Simulation time" +msgstr "Tempo de simulação" + +#: ControlEditorBase.cpp:316 +msgid "Run" +msgstr "Executar" + +#: ControlEditorBase.cpp:320 ElementFormBase.cpp:332 ElementFormBase.cpp:735 +#: ElementFormBase.cpp:1239 ElementFormBase.cpp:1551 ElementFormBase.cpp:1951 +#: ElementFormBase.cpp:2286 ElementFormBase.cpp:2416 ElementFormBase.cpp:2544 +#: ElementFormBase.cpp:2702 ElementFormBase.cpp:2900 ElementFormBase.cpp:3015 +#: ElementFormBase.cpp:3104 ElementFormBase.cpp:3205 ElementFormBase.cpp:3306 +#: ElementFormBase.cpp:3411 ElementFormBase.cpp:3500 ElementFormBase.cpp:3589 +#: ElementFormBase.cpp:3686 ElementFormBase.cpp:3839 PropertiesFormBase.cpp:82 +#: PropertiesFormBase.cpp:663 PropertiesFormBase.cpp:915 +msgid "Cancel" +msgstr "Cancelar" + +#: ControlEditorBase.h:90 +msgid "Control editor" +msgstr "Editor de controle" + +#: ControlEditorBase.h:136 +msgid "Control system test" +msgstr "Teste do sistema de controle" + +#: ControlElementSolver.cpp:59 msgid "The control system must have at least one input and one output." msgstr "O sistema de controle deve ter pelo menos uma entrada e uma saída." -#: ControlElementSolver.cpp:72 +#: ControlElementSolver.cpp:75 msgid "There is no input in the control system." msgstr "Não há entrada no sistema de controle." -#: ControlElementSolver.cpp:76 +#: ControlElementSolver.cpp:79 msgid "There is no output in the control system." msgstr "Não há saída no sistema de controle." -#: ControlElementSolver.cpp:81 +#: ControlElementSolver.cpp:84 msgid "Input not connected." msgstr "Entrada não conectada." -#: ControlElementSolver.cpp:90 ControlElementSolver.cpp:153 +#: ControlElementSolver.cpp:93 ControlElementSolver.cpp:147 msgid "It was not possible to initialize the control system." msgstr "Não foi possível inicializar o sistema de controle." -#: ControlElementSolver.h:84 +#: ControlElementSolver.h:86 msgid "Unknown error." msgstr "Erro desconhecido." @@ -501,11 +734,11 @@ msgstr "Valor inserido incorretamente no campo \"Tempo de início\"." msgid "Value entered incorrectly in the field \"Slope\"." msgstr "Valor inserido incorretamente no campo \"Inclinação\"." -#: ControlSystemTest.cpp:67 SimulationsSettingsForm.cpp:127 +#: ControlSystemTest.cpp:67 SimulationsSettingsForm.cpp:130 msgid "Value entered incorrectly in the field \"Time step\"." msgstr "Valor inserido incorretamente no campo \"Passo de integração\"." -#: ControlSystemTest.cpp:74 SimulationsSettingsForm.cpp:130 +#: ControlSystemTest.cpp:74 SimulationsSettingsForm.cpp:133 msgid "Value entered incorrectly in the field \"Simulation time\"." msgstr "Valor inserido incorretamente no campo \"Tempo de simulação\"." @@ -590,13 +823,12 @@ msgid "Current (kA)" msgstr "Corrente (kA)" #: DataReport.cpp:230 DataReport.cpp:240 DataReport.cpp:252 DataReport.cpp:281 -#: DataReport.cpp:297 DataReport.cpp:315 TextForm.cpp:872 TextForm.cpp:883 -#: TextForm.cpp:892 TextForm.cpp:903 TextForm.cpp:914 TextForm.cpp:922 -#: TextForm.cpp:929 TextForm.cpp:936 TextForm.cpp:944 -#: base/ElementFormBase.cpp:40 base/ElementFormBase.cpp:409 -#: base/ElementFormBase.cpp:1307 base/ElementFormBase.cpp:1620 -#: base/ElementFormBase.cpp:2020 base/ElementFormBase.cpp:2357 -#: base/ElementFormBase.cpp:2614 +#: DataReport.cpp:297 DataReport.cpp:315 ElementFormBase.cpp:40 +#: ElementFormBase.cpp:409 ElementFormBase.cpp:1307 ElementFormBase.cpp:1620 +#: ElementFormBase.cpp:2020 ElementFormBase.cpp:2357 ElementFormBase.cpp:2614 +#: TextForm.cpp:872 TextForm.cpp:883 TextForm.cpp:892 TextForm.cpp:903 +#: TextForm.cpp:914 TextForm.cpp:922 TextForm.cpp:929 TextForm.cpp:936 +#: TextForm.cpp:944 msgid "Name" msgstr "Nome" @@ -636,28 +868,61 @@ msgstr "Fase B" msgid "Phase C" msgstr "Fase C" -#: DataReport.cpp:382 DataReport.cpp:431 DataReport.cpp:539 DataReport.cpp:590 -#: DataReport.cpp:738 DataReport.cpp:842 +#: DataReport.cpp:382 DataReport.cpp:429 DataReport.cpp:535 DataReport.cpp:584 +#: DataReport.cpp:730 DataReport.cpp:832 msgid "Yes" msgstr "Sim" -#: DataReport.cpp:385 DataReport.cpp:434 DataReport.cpp:542 DataReport.cpp:593 -#: DataReport.cpp:741 DataReport.cpp:845 +#: DataReport.cpp:385 DataReport.cpp:432 DataReport.cpp:538 DataReport.cpp:587 +#: DataReport.cpp:733 DataReport.cpp:835 msgid "No" msgstr "Não" -#: DataReport.cpp:503 +#: DataReport.cpp:499 msgid "Slack" msgstr "Referência" -#: DataReport.cpp:506 +#: DataReport.cpp:502 msgid "PV" msgstr "PV" -#: DataReport.cpp:509 +#: DataReport.cpp:505 msgid "PQ" msgstr "PQ" +#: DataReportBase.cpp:73 +msgid "Power flow data" +msgstr "Dados de fluxo de carga" + +#: DataReportBase.cpp:84 PropertiesFormBase.cpp:192 +msgid "Power flow" +msgstr "Fluxo de carga" + +#: DataReportBase.cpp:101 DataReportBase.cpp:163 +msgid "Buses" +msgstr "Barras" + +#: DataReportBase.cpp:118 DataReportBase.cpp:180 +msgid "Branches" +msgstr "Ramos" + +#: DataReportBase.cpp:135 +msgid "Fault data" +msgstr "Dados da falta" + +#: DataReportBase.cpp:146 ElementFormBase.cpp:117 ElementFormBase.cpp:579 +#: ElementFormBase.cpp:1479 ElementFormBase.cpp:1826 MainFrameBase.cpp:194 +msgid "Fault" +msgstr "Falta" + +#: DataReportBase.cpp:197 +msgid "Generators" +msgstr "Geradores" + +#: DataReportBase.h:97 +msgid "Data report" +msgstr "Relatório de dados" + #: Electromechanical.cpp:70 msgid "Running simulation" msgstr "Simulação em andamento" @@ -679,15 +944,15 @@ msgstr "Erro ao inicializar os valores de saturação de \"" msgid "\"." msgstr "\"." -#: Electromechanical.cpp:673 +#: Electromechanical.cpp:675 msgid "Error on initializate the AVR of \"" msgstr "Erro ao inicializar o AVR de \"" -#: Electromechanical.cpp:690 +#: Electromechanical.cpp:694 msgid "Error on initializate the speed governor of \"" msgstr "Erro ao inicializar o regulador de velocidade de \"" -#: Electromechanical.cpp:990 +#: Electromechanical.cpp:994 msgid "" "Impossible to solve the synchronous generators.\n" "Check the system parameters and/or decrease the time step." @@ -695,7 +960,7 @@ msgstr "" "Impossível de solucionar os geradores síncronos.\n" "Verifique os parâmetros do sistema e/ou diminua o passo de integração." -#: Electromechanical.cpp:1350 +#: Electromechanical.cpp:1358 msgid "" "It was not possible to solve the saturation of the synchronous machine \"" msgstr "Não foi possível solucionar a saturação da máquina síncrona \"" @@ -704,18 +969,510 @@ msgstr "Não foi possível solucionar a saturação da máquina síncrona \"" msgid "Unknown error" msgstr "Erro desconhecido" -#: Element.cpp:250 base/MainFrameBase.cpp:148 +#: Element.cpp:246 MainFrameBase.cpp:150 msgid "Rotate clockwise" msgstr "Girar no sentido horário" -#: Element.cpp:254 +#: Element.cpp:251 msgid "Rotate counter-clockwise" msgstr "Girar no sentido anti-horário" -#: Element.cpp:258 Line.cpp:304 base/ControlEditorBase.cpp:85 -#: base/MainFrameBase.cpp:144 -msgid "Delete" -msgstr "Excluir" +#: ElementFormBase.cpp:60 ElementFormBase.cpp:1327 ElementFormBase.cpp:1640 +msgid "Rated voltage" +msgstr "Tensão nominal" + +#: ElementFormBase.cpp:87 +msgid "Controlled voltage" +msgstr "Tensão controlada" + +#: ElementFormBase.cpp:111 +msgid "Slack Bus" +msgstr "Barra de referência" + +#: ElementFormBase.cpp:122 ElementFormBase.cpp:223 +msgid "Insert fault in the bus" +msgstr "Inserir falta na barra" + +#: ElementFormBase.cpp:135 +msgid "Fault type" +msgstr "Tipo de falta" + +#: ElementFormBase.cpp:153 +msgid "Fault place" +msgstr "Local da falta" + +#: ElementFormBase.cpp:170 ElementFormBase.cpp:282 +msgid "Fault resistance (R)" +msgstr "Resistência da falta (R)" + +#: ElementFormBase.cpp:185 ElementFormBase.cpp:208 ElementFormBase.cpp:297 +#: ElementFormBase.cpp:320 ElementFormBase.cpp:852 ElementFormBase.cpp:909 +#: ElementFormBase.cpp:932 ElementFormBase.cpp:955 ElementFormBase.cpp:986 +#: ElementFormBase.cpp:1009 ElementFormBase.cpp:1040 ElementFormBase.cpp:1063 +#: ElementFormBase.cpp:1140 ElementFormBase.cpp:1163 TextForm.cpp:975 +#: TextForm.cpp:985 TextForm.cpp:990 TextForm.cpp:998 TextForm.cpp:1006 +msgid "p.u." +msgstr "p.u." + +#: ElementFormBase.cpp:193 ElementFormBase.cpp:305 +msgid "Fault reactance (Xl)" +msgstr "Reatância da falta (Xl)" + +#: ElementFormBase.cpp:213 ElementFormBase.cpp:725 ElementFormBase.cpp:1541 +#: ElementFormBase.cpp:1941 ElementFormBase.cpp:2107 ElementFormBase.cpp:2406 +#: ElementFormBase.cpp:2692 PropertiesFormBase.cpp:287 +msgid "Stability" +msgstr "Estabilidade" + +#: ElementFormBase.cpp:218 +msgid "Plot bus data" +msgstr "Imprimir dados da barra" + +#: ElementFormBase.cpp:259 +msgid "Fault length" +msgstr "Duração da falta" + +#: ElementFormBase.cpp:429 ElementFormBase.cpp:1342 ElementFormBase.cpp:1671 +msgid "Rated power" +msgstr "Potência nominal" + +#: ElementFormBase.cpp:459 ElementFormBase.cpp:2040 ElementFormBase.cpp:2126 +#: ElementFormBase.cpp:2634 IOControlForm.cpp:42 Load.cpp:267 +#: PropertiesFormBase.cpp:453 SyncGenerator.cpp:239 TextForm.cpp:884 +#: TextForm.cpp:915 TextForm.cpp:937 TextForm.cpp:945 +msgid "Active power" +msgstr "Potência ativa" + +#: ElementFormBase.cpp:488 ElementFormBase.cpp:2069 ElementFormBase.cpp:2199 +#: ElementFormBase.cpp:2377 ElementFormBase.cpp:2663 IOControlForm.cpp:47 +#: Load.cpp:268 PropertiesFormBase.cpp:526 SyncGenerator.cpp:240 +#: TextForm.cpp:885 TextForm.cpp:916 TextForm.cpp:923 TextForm.cpp:930 +#: TextForm.cpp:938 TextForm.cpp:946 +msgid "Reactive power" +msgstr "Potência reativa" + +#: ElementFormBase.cpp:517 +msgid "Max reactive power" +msgstr "Potência reativa máx" + +#: ElementFormBase.cpp:547 +msgid "Min reactive power" +msgstr "Potência reativa min" + +#: ElementFormBase.cpp:573 +msgid "Use machine rated power as base" +msgstr "Utilizar potência nominal da máquina como base" + +#: ElementFormBase.cpp:584 +msgid "Sequence impedances (p.u.)" +msgstr "Impedâncias de sequência (p.u.)" + +#: ElementFormBase.cpp:596 +msgid "Positive resistance (R1)" +msgstr "Resistência positiva (R1)" + +#: ElementFormBase.cpp:611 +msgid "Positive reactance (X1)" +msgstr "Reatância positiva (X1)" + +#: ElementFormBase.cpp:626 +msgid "Negative resistance (R2)" +msgstr "Resistência negativa (R2)" + +#: ElementFormBase.cpp:641 +msgid "Negative reactance (X2)" +msgstr "Reatância negativa (X2)" + +#: ElementFormBase.cpp:656 +msgid "Zero resistance (R0)" +msgstr "Resistência zero (R0)" + +#: ElementFormBase.cpp:671 +msgid "Zero reactance (X0)" +msgstr "Reatância zero (X0)" + +#: ElementFormBase.cpp:690 +msgid "Ground resistance (p.u.)" +msgstr "Resistência de aterramento (p.u.)" + +#: ElementFormBase.cpp:705 +msgid "Ground reactance (p.u.)" +msgstr "Reatância de aterramento (p.u.)" + +#: ElementFormBase.cpp:716 +msgid "Grounded neutral" +msgstr "Neutro aterrado" + +#: ElementFormBase.cpp:801 +msgid "Plot synchronous machine data" +msgstr "Imprimir dados da máquina síncrona" + +#: ElementFormBase.cpp:814 +msgid "Inertia (H)" +msgstr "Inércia (H)" + +#: ElementFormBase.cpp:837 +msgid "Damping factor" +msgstr "Fator de amortecimento" + +#: ElementFormBase.cpp:860 +msgid "Use AVR" +msgstr "Utilizar AVR" + +#: ElementFormBase.cpp:865 +msgid "Edit AVR" +msgstr "Editar AVR" + +#: ElementFormBase.cpp:873 +msgid "Use speed governor" +msgstr "Utilizar regulador de velocidade" + +#: ElementFormBase.cpp:878 +msgid "Edit speed governor" +msgstr "Editar regulador de velocidade" + +#: ElementFormBase.cpp:894 +msgid "Armature resistance (Ra)" +msgstr "Resistência de armadura (Ra)" + +#: ElementFormBase.cpp:917 +msgid "Potier reactance (Xp)" +msgstr "Reatância de Potier (Xp)" + +#: ElementFormBase.cpp:940 +msgid "Saturation factor" +msgstr "Fator de saturação" + +#: ElementFormBase.cpp:959 +msgid "Syncronous" +msgstr "Síncrono" + +#: ElementFormBase.cpp:971 +msgid "Direct-axis reactance (Xd)" +msgstr "Reatância de eixo direto (Xd)" + +#: ElementFormBase.cpp:994 +msgid "Quadrature-axis reactance (Xq)" +msgstr "Reatância de eixo em quadratura (Xq)" + +#: ElementFormBase.cpp:1013 +msgid "Transient" +msgstr "Tansitório" + +#: ElementFormBase.cpp:1025 +msgid "Direct-axis reactance (X'd)" +msgstr "Reatância de eixo direto (X'd)" + +#: ElementFormBase.cpp:1048 +msgid "Quadrature-axis reactance (X'q)" +msgstr "Reatância de eixo em quadratura (X'q)" + +#: ElementFormBase.cpp:1071 +msgid "Direct-axis time constant (T'd0)" +msgstr "Constante de tempo de eixo direto (T'd0)" + +#: ElementFormBase.cpp:1094 +msgid "Quadrature-axis time constant (T'q0)" +msgstr "Constante de tempo de eixo em quadratura (T'd0)" + +#: ElementFormBase.cpp:1113 +msgid "Sub-transient" +msgstr "Subtransitório" + +#: ElementFormBase.cpp:1125 +msgid "Direct-axis reactance (X''d)" +msgstr "Reatância de eixo direto (X''d)" + +#: ElementFormBase.cpp:1148 +msgid "Quadrature-axis reactance (X''q)" +msgstr "Reatância de eixo em quadratura (X''q)" + +#: ElementFormBase.cpp:1171 +msgid "Direct-axis time constant (T''d0)" +msgstr "Constante de tempo de eixo direto (T''d0)" + +#: ElementFormBase.cpp:1194 +msgid "Quadrature-axis time constant (T''q0)" +msgstr "Constante de tempo de eixo em quadratura (T''d0)" + +#: ElementFormBase.cpp:1229 ElementFormBase.cpp:2276 ElementFormBase.h:712 +msgid "Switching" +msgstr "Chaveamento" + +#: ElementFormBase.cpp:1331 +msgid "138 kV" +msgstr "138 kV" + +#: ElementFormBase.cpp:1370 ElementFormBase.cpp:1701 +msgid "Resistance (R)" +msgstr "Resistência (R)" + +#: ElementFormBase.cpp:1398 ElementFormBase.cpp:1728 +msgid "Indutive reactance (XL)" +msgstr "Reatância indutiva (Xl)" + +#: ElementFormBase.cpp:1426 +msgid "Capacitive susceptance (B)" +msgstr "Susceptância capacitiva (B)" + +#: ElementFormBase.cpp:1454 +msgid "Line size" +msgstr "Comprimento da linha" + +#: ElementFormBase.cpp:1469 +msgid "km" +msgstr "km" + +#: ElementFormBase.cpp:1473 +msgid "Use line rated power as base" +msgstr "Utilizar a potência nominal como base" + +#: ElementFormBase.cpp:1484 ElementFormBase.cpp:1831 +msgid "Zero-sequence impedances (p.u.)" +msgstr "Impedâncias de sequência zero (p.u.)" + +#: ElementFormBase.cpp:1496 ElementFormBase.cpp:1843 +msgid "Resistance (R0)" +msgstr "Resistência (R0)" + +#: ElementFormBase.cpp:1511 ElementFormBase.cpp:1858 +msgid "Indutive reactance (X0)" +msgstr "Reatância indutiva (X0)" + +#: ElementFormBase.cpp:1526 +msgid "Capacitive susceptance (B0)" +msgstr "Susceptância capacitiva (B0)" + +#: ElementFormBase.cpp:1644 +msgid "138 kV / 138 kV" +msgstr "138 kV / 138 kV" + +#: ElementFormBase.cpp:1655 +msgid "Base voltage" +msgstr "Tensão base" + +#: ElementFormBase.cpp:1759 +msgid "Connection" +msgstr "Conexão" + +#: ElementFormBase.cpp:1786 +msgid "Turns ratio" +msgstr "TAP" + +#: ElementFormBase.cpp:1801 +msgid "Phase shift" +msgstr "Defasagem" + +#: ElementFormBase.cpp:1816 PropertiesFormBase.cpp:282 +msgid "degrees" +msgstr "graus" + +#: ElementFormBase.cpp:1820 +msgid "Use transformer rated power as base" +msgstr "Utilizar a potência do transformador como base" + +#: ElementFormBase.cpp:1869 +msgid "Ground impedances (p.u.)" +msgstr "Impedância de aterramento (p.u.)" + +#: ElementFormBase.cpp:1881 +msgid "Primary resistance" +msgstr "Resistência do primário" + +#: ElementFormBase.cpp:1896 +msgid "Primary reactance" +msgstr "Reatância do primário" + +#: ElementFormBase.cpp:1911 +msgid "Secondary resistance" +msgstr "Resistência do secundário" + +#: ElementFormBase.cpp:1926 +msgid "Secondary reactance" +msgstr "Reatância do secundário" + +#: ElementFormBase.cpp:2094 +msgid "Load type (power flow)" +msgstr "Tipo de carga (fluxo de carga)" + +#: ElementFormBase.cpp:2112 +msgid "Plot load data" +msgstr "Imprimir dados da carga" + +#: ElementFormBase.cpp:2117 +msgid "Use ZIP load composition" +msgstr "Utilizar composição de carga ZIP" + +#: ElementFormBase.cpp:2134 ElementFormBase.cpp:2207 PropertiesFormBase.cpp:461 +#: PropertiesFormBase.cpp:534 +msgid "Constant impedance" +msgstr "Impedância constante" + +#: ElementFormBase.cpp:2149 ElementFormBase.cpp:2172 ElementFormBase.cpp:2195 +#: ElementFormBase.cpp:2222 ElementFormBase.cpp:2245 ElementFormBase.cpp:2268 +#: PropertiesFormBase.cpp:476 PropertiesFormBase.cpp:499 +#: PropertiesFormBase.cpp:522 PropertiesFormBase.cpp:549 +#: PropertiesFormBase.cpp:572 PropertiesFormBase.cpp:595 +#: PropertiesFormBase.cpp:626 PropertiesFormBase.cpp:649 +msgid "%" +msgstr "%" + +#: ElementFormBase.cpp:2157 ElementFormBase.cpp:2230 PropertiesFormBase.cpp:484 +#: PropertiesFormBase.cpp:557 PropertiesFormBase.cpp:611 +msgid "Constant current" +msgstr "Corrente constante" + +#: ElementFormBase.cpp:2180 ElementFormBase.cpp:2253 PropertiesFormBase.cpp:507 +#: PropertiesFormBase.cpp:580 PropertiesFormBase.cpp:634 +msgid "Constant power" +msgstr "Potência constante" + +#: ElementFormBase.cpp:2490 +msgid "Switching properties" +msgstr "Propriedades de chaveamento" + +#: ElementFormBase.cpp:2495 SwitchingForm.cpp:40 SwitchingForm.cpp:53 +#: SwitchingForm.cpp:69 +msgid "Insert" +msgstr "Inserir" + +#: ElementFormBase.cpp:2496 ElementFormBase.cpp:2512 SwitchingForm.cpp:40 +#: SwitchingForm.cpp:53 +msgid "Remove" +msgstr "Remover" + +#: ElementFormBase.cpp:2500 SwitchingForm.cpp:24 SwitchingForm.cpp:33 +msgid "Time (s)" +msgstr "Tempo (s)" + +#: ElementFormBase.cpp:2508 +msgid "Add" +msgstr "Adicionar" + +#: ElementFormBase.cpp:2520 +msgid "Down" +msgstr "Baixo" + +#: ElementFormBase.cpp:2528 +msgid "Switching list" +msgstr "Lista de chaveamento" + +#: ElementFormBase.cpp:2779 +msgid "Element" +msgstr "Elemento" + +#: ElementFormBase.cpp:2801 +msgid "Element name" +msgstr "Nome do elemento" + +#: ElementFormBase.cpp:2814 +msgid "Text type" +msgstr "Tipo de texto" + +#: ElementFormBase.cpp:2827 +msgid "From bus" +msgstr "Da barra" + +#: ElementFormBase.cpp:2840 +msgid "To bus" +msgstr "Para barra" + +#: ElementFormBase.cpp:2853 +msgid "Unit" +msgstr "Unidade" + +#: ElementFormBase.cpp:2866 +msgid "Decimal places:" +msgstr "Casas decimais:" + +#: ElementFormBase.cpp:2879 +msgid "Preview:" +msgstr "Pré-visualização:" + +#: ElementFormBase.cpp:2981 +msgid "Numerator parameters" +msgstr "Parâmetros do numerador" + +#: ElementFormBase.cpp:2993 +msgid "Denominator parameters" +msgstr "Parâmetros do denominador" + +#: ElementFormBase.cpp:3082 +msgid "Signs" +msgstr "Sinais" + +#: ElementFormBase.cpp:3171 ElementFormBase.cpp:3272 +msgid "Upper limit" +msgstr "Limite superior" + +#: ElementFormBase.cpp:3183 ElementFormBase.cpp:3284 +msgid "Lower limit" +msgstr "Limite inferior" + +#: ElementFormBase.cpp:3373 +msgid "y = A.eB.x" +msgstr "y = A.eB.x" + +#: ElementFormBase.cpp:3377 +msgid "A value" +msgstr "Valor A" + +#: ElementFormBase.cpp:3389 +msgid "B value" +msgstr "Valor B" + +#: ElementFormBase.cpp:3478 +msgid "Constant value" +msgstr "Valor da constante" + +#: ElementFormBase.cpp:3567 +msgid "Gain value" +msgstr "Valor do ganho" + +#: ElementFormBase.cpp:3757 +msgid "Input variables (space separated)" +msgstr "Variáveis de entrada (separadas por espaço)" + +#: ElementFormBase.cpp:3821 +msgid "No checks performed" +msgstr "Nenhuma verificação realizada" + +#: ElementFormBase.cpp:3829 +msgid "Check expression" +msgstr "Verificar expressão" + +#: ElementFormBase.h:243 ImportForm.cpp:153 ImportForm.cpp:456 +#: SyncGenerator.cpp:64 +msgid "Generator" +msgstr "Gerador" + +#: ElementFormBase.h:370 +msgid "Generator: Stability" +msgstr "Gerador: Estabilidade" + +#: ElementFormBase.h:671 +msgid "Reactive shunt element" +msgstr "Elemento shunt reativo" + +#: ElementFormBase.h:753 ImportForm.cpp:316 +msgid "Motor" +msgstr "Motor" + +#: ElementFormBase.h:814 OpenGLText.h:57 Text.h:113 +msgid "Text" +msgstr "Texto" + +#: ElementFormBase.h:844 +msgid "Transfer function" +msgstr "Função transferência" + +#: ElementFormBase.h:1046 +msgid "Input / Output" +msgstr "Entrada / Saída" + +#: ElementFormBase.h:1082 +msgid "Math expression" +msgstr "Expressão matemática" #: ExponentialForm.cpp:56 msgid "Value entered incorrectly in the field \"A value\"." @@ -898,7 +1655,7 @@ msgstr "Vf" msgid "Pm" msgstr "Pm" -#: IOControlForm.cpp:32 SyncGenerator.cpp:242 +#: IOControlForm.cpp:32 SyncGenerator.cpp:238 msgid "Terminal voltage" msgstr "Tensão terminal" @@ -906,27 +1663,11 @@ msgstr "Tensão terminal" msgid "Velocity" msgstr "Velocidade" -#: IOControlForm.cpp:42 Load.cpp:269 SyncGenerator.cpp:243 TextForm.cpp:884 -#: TextForm.cpp:915 TextForm.cpp:937 TextForm.cpp:945 -#: base/ElementFormBase.cpp:459 base/ElementFormBase.cpp:2040 -#: base/ElementFormBase.cpp:2126 base/ElementFormBase.cpp:2634 -#: base/PropertiesFormBase.cpp:429 -msgid "Active power" -msgstr "Potência ativa" - -#: IOControlForm.cpp:47 Load.cpp:270 SyncGenerator.cpp:244 TextForm.cpp:885 -#: TextForm.cpp:916 TextForm.cpp:923 TextForm.cpp:930 TextForm.cpp:938 -#: TextForm.cpp:946 base/ElementFormBase.cpp:488 base/ElementFormBase.cpp:2069 -#: base/ElementFormBase.cpp:2199 base/ElementFormBase.cpp:2377 -#: base/ElementFormBase.cpp:2663 base/PropertiesFormBase.cpp:502 -msgid "Reactive power" -msgstr "Potência reativa" - -#: IOControlForm.cpp:52 SyncGenerator.cpp:247 +#: IOControlForm.cpp:52 SyncGenerator.cpp:243 msgid "Field voltage" msgstr "Tensão de campo" -#: IOControlForm.cpp:57 SyncGenerator.cpp:245 +#: IOControlForm.cpp:57 SyncGenerator.cpp:241 msgid "Mechanical power" msgstr "Potência mecânica" @@ -950,11 +1691,19 @@ msgstr "Variação de velocidade" msgid "Active power variation" msgstr "Variação de potência ativa" +#: ImportForm.cpp:53 +msgid "It was not possible to import the selected files." +msgstr "Não foi possível importar os arquivo selecionados." + +#: ImportForm.h:206 MainFrame.cpp:470 +msgid "Imported project" +msgstr "Projeto importado" + #: IndMotor.cpp:37 msgid "Edit induction motor" msgstr "Editar motor de indução" -#: IndMotor.cpp:106 Load.cpp:215 SyncGenerator.cpp:190 SyncMotor.cpp:138 +#: IndMotor.cpp:106 Load.cpp:213 SyncGenerator.cpp:186 SyncMotor.cpp:136 msgid "" "\n" "P = " @@ -962,15 +1711,15 @@ msgstr "" "\n" "P = " -#: IndMotor.cpp:112 Load.cpp:221 SyncGenerator.cpp:196 SyncMotor.cpp:144 +#: IndMotor.cpp:112 Load.cpp:219 SyncGenerator.cpp:192 SyncMotor.cpp:142 msgid " W" msgstr " W" -#: IndMotor.cpp:115 Load.cpp:224 SyncGenerator.cpp:199 SyncMotor.cpp:147 +#: IndMotor.cpp:115 Load.cpp:222 SyncGenerator.cpp:195 SyncMotor.cpp:145 msgid " kW" msgstr " kW" -#: IndMotor.cpp:118 Load.cpp:227 SyncGenerator.cpp:202 SyncMotor.cpp:150 +#: IndMotor.cpp:118 Load.cpp:225 SyncGenerator.cpp:198 SyncMotor.cpp:148 msgid " MW" msgstr " MW" @@ -997,7 +1746,7 @@ msgstr "Valor inserido incorretamente no campo \"Limite superior\"." msgid "Value entered incorrectly in the field \"Lower limit\"." msgstr "Valor inserido incorretamente no campo \"Limite inferior\"." -#: Line.cpp:166 Line.cpp:395 +#: Line.cpp:155 Line.cpp:384 msgid "" "Unable to connect two buses with different nominal voltages.\n" "Use a transformer or edit the bus properties." @@ -1005,19 +1754,19 @@ msgstr "" "Não é possível conectar duas barras com tensões nominais diferentes.\n" "Utilize um transformador ou edite as propriedades do barramento." -#: Line.cpp:294 +#: Line.cpp:279 msgid "Edit line" msgstr "Editar linha" -#: Line.cpp:296 +#: Line.cpp:281 msgid "Insert node" msgstr "Inserir nó" -#: Line.cpp:300 +#: Line.cpp:286 msgid "Remove node" msgstr "Remover nó" -#: Line.cpp:516 Line.cpp:520 Transformer.cpp:452 Transformer.cpp:456 +#: Line.cpp:501 Line.cpp:505 Transformer.cpp:436 Transformer.cpp:440 msgid "" "\n" "P" @@ -1025,7 +1774,7 @@ msgstr "" "\n" "P" -#: Line.cpp:518 Line.cpp:522 Transformer.cpp:454 Transformer.cpp:458 +#: Line.cpp:503 Line.cpp:507 Transformer.cpp:438 Transformer.cpp:442 msgid "" "\n" "Q" @@ -1078,11 +1827,11 @@ msgstr "" "Valor inserido incorretamente no campo \"Susceptância capacitiva de " "sequência zero\"." -#: Load.cpp:136 +#: Load.cpp:134 msgid "Edit Load" msgstr "Editar Carga" -#: Load.cpp:271 TextForm.cpp:896 TextForm.cpp:907 +#: Load.cpp:269 TextForm.cpp:896 TextForm.cpp:907 msgid "Current" msgstr "Corrente" @@ -1138,83 +1887,83 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de potência constante da " "potência ativa\"." -#: LoadForm.cpp:189 SimulationsSettingsForm.cpp:188 +#: LoadForm.cpp:189 SimulationsSettingsForm.cpp:191 msgid "The sum of active power load composition must be 100%." msgstr "A soma da composição de carga da potência ativa deve ser 100%." -#: LoadForm.cpp:196 SimulationsSettingsForm.cpp:195 +#: LoadForm.cpp:196 SimulationsSettingsForm.cpp:198 msgid "The sum of reactive power load composition must be 100%." msgstr "A soma da composição de carga da potência reativa deve ser 100%." -#: MainFrame.cpp:49 MainFrame.cpp:293 +#: MainFrame.cpp:50 MainFrame.cpp:286 msgid "Open project" msgstr "Abrir projeto" -#: MainFrame.cpp:132 +#: MainFrame.cpp:133 msgid "&Bus\tB" msgstr "&Barramento\tB" -#: MainFrame.cpp:132 +#: MainFrame.cpp:133 msgid "Adds a bus at the circuit" msgstr "Adiciona um barramento no circuito" -#: MainFrame.cpp:135 +#: MainFrame.cpp:136 msgid "&Line\tL" msgstr "&Linha\tL" -#: MainFrame.cpp:135 +#: MainFrame.cpp:136 msgid "Adds a power line at the circuit" msgstr "Adiciona uma linha no circuito" -#: MainFrame.cpp:136 +#: MainFrame.cpp:137 msgid "&Transformer\tT" msgstr "&Transformador\tT" -#: MainFrame.cpp:137 +#: MainFrame.cpp:138 msgid "Adds a transformer at the circuit" msgstr "Adiciona um transformador no circuito" -#: MainFrame.cpp:138 +#: MainFrame.cpp:139 msgid "&Generator\tG" msgstr "&Gerador\tG" -#: MainFrame.cpp:139 +#: MainFrame.cpp:140 msgid "Adds a generator at the circuit" msgstr "Adiciona um gerador no circuito" -#: MainFrame.cpp:140 +#: MainFrame.cpp:141 msgid "&Induction motor\tI" msgstr "&Motor de indução\tI" -#: MainFrame.cpp:141 MainFrame.cpp:144 +#: MainFrame.cpp:142 MainFrame.cpp:145 msgid "Adds an induction motor at the circuit" msgstr "Adiciona um motor de indução no circuito" -#: MainFrame.cpp:143 +#: MainFrame.cpp:144 msgid "&Synchronous compensator \tK" msgstr "&Compensador síncrono \tK" -#: MainFrame.cpp:146 +#: MainFrame.cpp:147 msgid "&Load\tShift-L" msgstr "&Carga\tShift-L" -#: MainFrame.cpp:146 +#: MainFrame.cpp:147 msgid "Adds a load at the circuit" msgstr "Adiciona uma carga no circuito" -#: MainFrame.cpp:147 +#: MainFrame.cpp:148 msgid "&Capacitor\tShift-C" msgstr "&Capacitor\tShift-C" -#: MainFrame.cpp:148 +#: MainFrame.cpp:149 msgid "Adds a shunt capacitor at the circuit" msgstr "Adiciona um capacitor shunt no circuito" -#: MainFrame.cpp:149 +#: MainFrame.cpp:150 msgid "&Inductor\tShift-I" msgstr "&Inductor\tShift-I" -#: MainFrame.cpp:150 +#: MainFrame.cpp:151 msgid "Adds a shunt inductor at the circuit" msgstr "Adiciona um indutor shunt no circuito" @@ -1223,175 +1972,598 @@ msgstr "Adiciona um indutor shunt no circuito" msgid "New project %d" msgstr "Novo projeto %d" -#: MainFrame.cpp:286 +#: MainFrame.cpp:279 msgid "Open PSP file" msgstr "Abrir arquivo do PSP" -#: MainFrame.cpp:352 MainFrame.cpp:373 +#: MainFrame.cpp:339 MainFrame.cpp:360 msgid "Save PSP file" msgstr "Salvar arquivo do PSP" -#: MainFrame.cpp:401 Workspace.cpp:720 +#: MainFrame.cpp:388 Workspace.cpp:703 #, c-format msgid "Bus %d" msgstr "Barra %d" -#: MainFrame.cpp:404 Workspace.cpp:724 +#: MainFrame.cpp:391 Workspace.cpp:707 msgid "Insert Bus: Click to insert, ESC to cancel." msgstr "Inserir Barramento: Clique para inserir, ESC para cancelar." -#: MainFrame.cpp:408 Workspace.cpp:737 +#: MainFrame.cpp:395 Workspace.cpp:720 #, c-format msgid "Line %d" msgstr "Linha %d" -#: MainFrame.cpp:411 Workspace.cpp:741 +#: MainFrame.cpp:398 Workspace.cpp:724 msgid "Insert Line: Click on two buses, ESC to cancel." msgstr "Inserir Linha: Clique em duas barras, ESC para cancelar." -#: MainFrame.cpp:416 Workspace.cpp:751 +#: MainFrame.cpp:403 Workspace.cpp:734 #, c-format msgid "Transformer %d" msgstr "Transformador %d" -#: MainFrame.cpp:419 Workspace.cpp:755 +#: MainFrame.cpp:406 Workspace.cpp:738 msgid "Insert Transformer: Click on two buses, ESC to cancel." msgstr "Inserir Transformador: Clique em duas barras, ESC para cancelar." -#: MainFrame.cpp:424 Workspace.cpp:763 +#: MainFrame.cpp:411 Workspace.cpp:746 #, c-format msgid "Generator %d" msgstr "Gerador %d" -#: MainFrame.cpp:427 Workspace.cpp:767 +#: MainFrame.cpp:414 Workspace.cpp:750 msgid "Insert Generator: Click on a buses, ESC to cancel." msgstr "Inserir Gerador: Clique em uma barra, ESC para cancelar." -#: MainFrame.cpp:431 Workspace.cpp:731 +#: MainFrame.cpp:418 Workspace.cpp:714 #, c-format msgid "Load %d" msgstr "Carga %d" -#: MainFrame.cpp:434 Workspace.cpp:735 +#: MainFrame.cpp:421 Workspace.cpp:718 msgid "Insert Load: Click on a buses, ESC to cancel." msgstr "Inserir Carga: Clique em uma barra, ESC para cancelar." -#: MainFrame.cpp:439 Workspace.cpp:808 +#: MainFrame.cpp:426 Workspace.cpp:791 #, c-format msgid "Capacitor %d" msgstr "Capacitor %d" -#: MainFrame.cpp:442 Workspace.cpp:812 +#: MainFrame.cpp:429 Workspace.cpp:795 msgid "Insert Capacitor: Click on a buses, ESC to cancel." msgstr "Inserir Capacitor: Clique em uma barra, ESC para cancelar." -#: MainFrame.cpp:447 Workspace.cpp:775 +#: MainFrame.cpp:434 Workspace.cpp:758 #, c-format msgid "Inductor %d" msgstr "Indutor %d" -#: MainFrame.cpp:450 Workspace.cpp:779 +#: MainFrame.cpp:437 Workspace.cpp:762 msgid "Insert Inductor: Click on a buses, ESC to cancel." msgstr "Inserir Indutor: Clique em uma barra, ESC para cancelar." -#: MainFrame.cpp:455 Workspace.cpp:783 +#: MainFrame.cpp:442 Workspace.cpp:766 #, c-format msgid "Induction motor %d" msgstr "Motor de indução %d" -#: MainFrame.cpp:458 Workspace.cpp:787 +#: MainFrame.cpp:445 Workspace.cpp:770 msgid "Insert Induction Motor: Click on a buses, ESC to cancel." msgstr "Inserir Motor de indução: Clique em uma barra, ESC para cancelar." -#: MainFrame.cpp:463 Workspace.cpp:796 +#: MainFrame.cpp:450 Workspace.cpp:779 #, c-format msgid "Synchronous condenser %d" msgstr "Compensador síncrono %d" -#: MainFrame.cpp:466 Workspace.cpp:800 +#: MainFrame.cpp:453 Workspace.cpp:783 msgid "Insert Synchronous Condenser: Click on a buses, ESC to cancel." msgstr "Inserir Compensador síncrono: Clique em uma barra, ESC para cancelar." +#: MainFrameBase.cpp:76 MainFrameBase.cpp:77 MainFrameBase.cpp:80 +msgid "Projects" +msgstr "Projetos" + +#: MainFrameBase.cpp:82 +msgid "Create new project" +msgstr "Criar novo projeto" + +#: MainFrameBase.cpp:84 +msgid "Open" +msgstr "Abrir" + +#: MainFrameBase.cpp:84 MainFrameBase.cpp:86 +msgid "Open saved project" +msgstr "Abrir projetos salvos" + +#: MainFrameBase.cpp:88 +msgid "General Settings" +msgstr "Configurações gerais" + +#: MainFrameBase.cpp:88 +msgid "Opens a dialog to set the main settings of the program" +msgstr "" +"Abre um formulário para definir as principais configurações do programa" + +#: MainFrameBase.cpp:90 +msgid "Closes the application" +msgstr "Fecha a aplicação" + +#: MainFrameBase.cpp:93 MainFrameBase.cpp:94 +msgid "Current project" +msgstr "Projeto atual" + +#: MainFrameBase.cpp:98 +msgid "Save" +msgstr "Salvar" + +#: MainFrameBase.cpp:98 +msgid "Save the current project" +msgstr "Salvar o projeto atual" + +#: MainFrameBase.cpp:100 +msgid "Save As..." +msgstr "Salvar como..." + +#: MainFrameBase.cpp:100 +msgid "Save as the current project" +msgstr "Salvar como o projeto atual" + +#: MainFrameBase.cpp:102 +msgid "Close" +msgstr "Fechar" + +#: MainFrameBase.cpp:102 +msgid "Close the current project" +msgstr "Fechar o projeto atual" + +#: MainFrameBase.cpp:105 MainFrameBase.cpp:106 MainFrameBase.cpp:109 +msgid "Help" +msgstr "Ajuda" + +#: MainFrameBase.cpp:111 +msgid "PSP-UFU Guide" +msgstr "Manual do PSP-UFU" + +#: MainFrameBase.cpp:111 +msgid "Open PSP-UFU Guide" +msgstr "Abrir o manual do PSP-UFU" + +#: MainFrameBase.cpp:113 +msgid "About..." +msgstr "Sobre..." + +#: MainFrameBase.cpp:113 PropertiesFormBase.h:263 +msgid "About PSP-UFU" +msgstr "Sobre o PSP-UFU" + +#: MainFrameBase.cpp:116 MainFrameBase.cpp:117 +msgid "Tools" +msgstr "Ferramentas" + +#: MainFrameBase.cpp:119 MainFrameBase.cpp:120 MainFrameBase.cpp:123 +msgid "Clipboard" +msgstr "Área de transferência" + +#: MainFrameBase.cpp:125 +msgid "Copies the selected elements" +msgstr "Copia os elementos selecionados" + +#: MainFrameBase.cpp:127 +msgid "Pastes the elements from clipboard" +msgstr "Cola os elementos da área de transferência" + +#: MainFrameBase.cpp:129 +msgid "Undoes the last action" +msgstr "Desfaz a última ação" + +#: MainFrameBase.cpp:131 +msgid "Redoes the last undo action" +msgstr "Refaz a última ação desfeita" + +#: MainFrameBase.cpp:134 MainFrameBase.cpp:135 MainFrameBase.cpp:138 +msgid "Circuit" +msgstr "Circuito" + +#: MainFrameBase.cpp:140 +msgid "Add Element" +msgstr "Inserir elemento" + +#: MainFrameBase.cpp:140 +msgid "Add a new element in the project" +msgstr "Adicionar um elemento novo no projeto" + +#: MainFrameBase.cpp:142 +msgid "Drag all the elements" +msgstr "Arrasta todos os elementos" + +#: MainFrameBase.cpp:144 +msgid "Move the selected elements" +msgstr "Move os elementos selecionados" + +#: MainFrameBase.cpp:146 +msgid "Removes all selected elements" +msgstr "Remove todos os elementos selecionados" + +#: MainFrameBase.cpp:148 +msgid "Applies the drag and zoom tools to show all elements in workspace" +msgstr "" +"Aplica as ferramentas de arrasto e ampliação para exibir todos os elementos " +"na área de trabalho" + +#: MainFrameBase.cpp:150 +msgid "Rotate Clockwise" +msgstr "Girar Horário" + +#: MainFrameBase.cpp:152 +msgid "Rotate Counter-clockwise" +msgstr "Girar anti-horário" + +#: MainFrameBase.cpp:152 +msgid "Rotate the selected elements counter-clockwise" +msgstr "Gira os elementos selecionados no sentido anti-horário" + +#: MainFrameBase.cpp:154 +msgid "Project Settings" +msgstr "Configurações do projeto" + +#: MainFrameBase.cpp:154 +msgid "Opens a dialog to set the main settings of the current project" +msgstr "" +"Abre uma janela para definir as principais configurações do projeto atual" + +#: MainFrameBase.cpp:157 MainFrameBase.cpp:158 +msgid "Reports" +msgstr "Relatórios" + +#: MainFrameBase.cpp:162 +msgid "Data Report" +msgstr "Relatório de dados" + +#: MainFrameBase.cpp:162 +msgid "Opens a data report" +msgstr "Abre um relatório de dados" + +#: MainFrameBase.cpp:164 +msgid "Charts" +msgstr "Gráficos" + +#: MainFrameBase.cpp:164 +msgid "Open the charts" +msgstr "Abre os gráficos" + +#: MainFrameBase.cpp:166 +msgid "Snapshot" +msgstr "Instantâneo" + +#: MainFrameBase.cpp:166 +msgid "Capture a snapshot of the circuit" +msgstr "Captura uma imagem instantânea do circuito" + +#: MainFrameBase.cpp:169 MainFrameBase.cpp:170 +msgid "Simulation" +msgstr "Simulação" + +#: MainFrameBase.cpp:172 MainFrameBase.cpp:173 +msgid "Continuous" +msgstr "Contínuo" + +#: MainFrameBase.cpp:177 +msgid "Enable Solution" +msgstr "Habilitar solução" + +#: MainFrameBase.cpp:177 +msgid "" +"Enables the power flow and fault (if exists) calculations after any circuit " +"change" +msgstr "" +"Habilita os cálculos de fluxo de carga e falta (se existir) após qualquer " +"mudança no circuito" + +#: MainFrameBase.cpp:179 +msgid "Disable Solution" +msgstr "Desabilitar solução" + +#: MainFrameBase.cpp:179 +msgid "" +"Disables the power flow and fault calculations after any circuit changes" +msgstr "" +"Desabilita os cálculos de fluxo de carga e falta após qualquer mudança no " +"circuito" + +#: MainFrameBase.cpp:181 +msgid "Reset Voltages" +msgstr "Reiniciar tensões" + +#: MainFrameBase.cpp:181 +msgid "Reset all voltages to initial state" +msgstr "Reinicia todas as tensões para os valores iniciais" + +#: MainFrameBase.cpp:184 MainFrameBase.cpp:185 MainFrameBase.cpp:188 +msgid "Simulations" +msgstr "Simulações" + +#: MainFrameBase.cpp:190 +msgid "Power Flow" +msgstr "Fluxo de carga" + +#: MainFrameBase.cpp:190 +msgid "Calculate the circuit power flow" +msgstr "Calcula o fluxo de carga do circuito" + +#: MainFrameBase.cpp:192 +msgid "Run Stability" +msgstr "Executar estabilidade" + +#: MainFrameBase.cpp:192 +msgid "Run the stability calculations" +msgstr "Executa os cálculos de estabilidade" + +#: MainFrameBase.cpp:194 +msgid "Calculate the circuit fault (if exists)" +msgstr "Calcula a falta do circuito (se existir)" + +#: MainFrameBase.cpp:196 +msgid "Short-Circuit Power" +msgstr "Nível de curto-circuito" + +#: MainFrameBase.cpp:196 +msgid "Calculate the short-circuit power in all buses" +msgstr "Calcula o nível de curto-circuito em todas as barras" + +#: MainFrameBase.cpp:198 +msgid "Simulation Settings" +msgstr "Configurações de simulação" + +#: MainFrameBase.cpp:198 +msgid "Opens a dialog to set the settings of the simulations" +msgstr "Abre um formulário para definir as configurações de simulação" + +#: MainFrameBase.h:143 +msgid "PSP-UFU" +msgstr "PSP-UFU" + #: MathExpressionForm.cpp:44 msgid "No checks performed." msgstr "Nenhuma verificação realizada." -#: MathExpressionForm.cpp:57 +#: MathExpressionForm.cpp:58 msgid "Syntax error" msgstr "Erro de sintaxe" -#: MathExpressionForm.cpp:58 +#: MathExpressionForm.cpp:59 msgid "Mismatched parenthesis" msgstr "Parênteses sem correspondência" -#: MathExpressionForm.cpp:59 +#: MathExpressionForm.cpp:60 msgid "Missing ')'" msgstr "Faltando ')'" -#: MathExpressionForm.cpp:60 +#: MathExpressionForm.cpp:61 msgid "Empty parentheses" msgstr "Parênteses vazios" -#: MathExpressionForm.cpp:61 +#: MathExpressionForm.cpp:62 msgid "Syntax error: Operator expected" msgstr "Erro de sintaxe: Operador esperado" -#: MathExpressionForm.cpp:62 +#: MathExpressionForm.cpp:63 msgid "Not enough memory" msgstr "Não possui memória" -#: MathExpressionForm.cpp:63 +#: MathExpressionForm.cpp:64 msgid "An unexpected error occurred" msgstr "Um erro inesperado ocorreu" -#: MathExpressionForm.cpp:64 +#: MathExpressionForm.cpp:65 msgid "Syntax error in input variables" msgstr "Erro de sintaxe nas variáveis de entrada" -#: MathExpressionForm.cpp:65 +#: MathExpressionForm.cpp:66 msgid "Illegal number of parameters to function" msgstr "Número ilegal de parâmetros para a função" -#: MathExpressionForm.cpp:66 +#: MathExpressionForm.cpp:67 msgid "Syntax error: Premature end of string" msgstr "Erro de sintaxe: Fim prematuro da string" -#: MathExpressionForm.cpp:67 +#: MathExpressionForm.cpp:68 msgid "Syntax error: Expecting ( after function" msgstr "Erro de sintaxe: '(' esperado após a função" -#: MathExpressionForm.cpp:68 +#: MathExpressionForm.cpp:69 msgid "Syntax error: Unknown identifier" msgstr "Erro de sintaxe: Identificador desconhecido" -#: MathExpressionForm.cpp:69 +#: MathExpressionForm.cpp:70 msgid "No function has been parsed yet" msgstr "Nenhuma função foi analisada ainda" -#: MathExpressionForm.cpp:86 -msgid "OK!" -msgstr "OK!" +#: MathExpressionForm.cpp:85 +msgid "There is an error on math expression." +msgstr "Há um erro na expressão matemática." -#: OpenGLText.h:57 Text.h:109 base/ElementFormBase.h:814 -msgid "Text" -msgstr "Texto" +#: MathExpressionForm.cpp:172 +msgid "The math expression is correct." +msgstr "A expressão matemática está correta." -#: PowerFlow.cpp:31 +#: PowerFlow.cpp:32 msgid "No buses found on the system." msgstr "Não foram encontradas barras no sistema." -#: PowerFlow.cpp:180 +#: PowerFlow.cpp:182 msgid "There is no slack bus on the system." msgstr "Não há barra de referência no sistema." -#: PowerFlow.cpp:184 +#: PowerFlow.cpp:186 msgid "The slack bus don't have generation." msgstr "A barra de referência não tem geração." -#: PowerFlow.cpp:199 +#: PowerFlow.cpp:201 msgid "The maximum number of iterations was reached." msgstr "O número máximo de iterações foi alcançado." +#: PropertiesFormBase.cpp:44 +msgid "Language" +msgstr "Idioma" + +#: PropertiesFormBase.cpp:60 +msgid "Theme" +msgstr "Tema" + +#: PropertiesFormBase.cpp:153 +msgid "Base power" +msgstr "Potência base" + +#: PropertiesFormBase.cpp:177 +msgid "Continuous calculation" +msgstr "Cálculo contínuo" + +#: PropertiesFormBase.cpp:181 +msgid "Calculate fault after power flow" +msgstr "Calcular falta após o fluxo de carga" + +#: PropertiesFormBase.cpp:186 +msgid "Calculate short-circuit power after power flow" +msgstr "Calcular o nível de curto-circuito após o fluxo de carga" + +#: PropertiesFormBase.cpp:201 +msgid "Solution method" +msgstr "Método de solução" + +#: PropertiesFormBase.cpp:221 +msgid "Acceleration factor" +msgstr "Fator de aceleração" + +#: PropertiesFormBase.cpp:236 PropertiesFormBase.cpp:369 +msgid "Tolerance" +msgstr "Tolerância" + +#: PropertiesFormBase.cpp:251 +msgid "Max. iterations" +msgstr "Iterações máx" + +#: PropertiesFormBase.cpp:266 +msgid "Slack bus angle" +msgstr "Ângulo da barra de referência" + +#: PropertiesFormBase.cpp:346 +msgid "System frequency" +msgstr "Frequência do sistema" + +#: PropertiesFormBase.cpp:361 +msgid "Hz" +msgstr "Hz" + +#: PropertiesFormBase.cpp:384 +msgid "Max. Iterations" +msgstr "Iterações máx" + +#: PropertiesFormBase.cpp:399 +msgid "Controls step ratio" +msgstr "Razão do passo dos controles" + +#: PropertiesFormBase.cpp:414 +msgid "Plot time" +msgstr "Tempo de impressão" + +#: PropertiesFormBase.cpp:433 +msgid "Use center of inertia as reference" +msgstr "Utilizar centro de inércia como referência" + +#: PropertiesFormBase.cpp:439 +msgid "ZIP Load" +msgstr "Carga ZIP" + +#: PropertiesFormBase.cpp:444 +msgid "Use general composition to all system loads" +msgstr "Utilizar composição geral para todas as cargas do sistema" + +#: PropertiesFormBase.cpp:599 +msgid "" +"Undervoltage limit which the loads will be modelled by\n" +"constant impedance:" +msgstr "" +"Subtensão a qual as cargas serão modeladas como\n" +"impedância constante:" + +#: PropertiesFormBase.cpp:729 +msgid "About" +msgstr "Sobre" + +#: PropertiesFormBase.cpp:739 +msgid "Credits" +msgstr "Créditos" + +#: PropertiesFormBase.cpp:756 +msgid "License" +msgstr "Licença" + +#: PropertiesFormBase.cpp:772 +msgid "Version:" +msgstr "Versão:" + +#: PropertiesFormBase.cpp:776 +msgid "Alpha 2018w15a" +msgstr "Alpha 2018w15a" + +#: PropertiesFormBase.cpp:780 +msgid "Home page:" +msgstr "Página Inicial:" + +#: PropertiesFormBase.cpp:784 +msgid "https://thales1330.github.io/PSP/" +msgstr "https://thales1330.github.io/PSP/" + +#: PropertiesFormBase.cpp:851 +msgid "CEPEL" +msgstr "CEPEL" + +#: PropertiesFormBase.cpp:856 +msgid "ANAREDE" +msgstr "ANAREDE" + +#: PropertiesFormBase.cpp:864 +msgid ".PWF file" +msgstr "Arquivo .PWF" + +#: PropertiesFormBase.cpp:868 +msgid "Select a ANAREDE PWF file" +msgstr "Selecione um arquivo PWF do ANAREDE" + +#: PropertiesFormBase.cpp:877 +msgid ".LST file" +msgstr "Arquivo .LST" + +#: PropertiesFormBase.cpp:881 +msgid "Select a ANAREDE LST file" +msgstr "Selecione um arquivo LST do ANAREDE" + +#: PropertiesFormBase.cpp:886 +msgid "ANATEM" +msgstr "ANATEM" + +#: PropertiesFormBase.cpp:894 +msgid ".STB file" +msgstr "Arquivo .STB" + +#: PropertiesFormBase.cpp:899 +msgid "Select a ANATEM STB file" +msgstr "Selecione um arquivo STB do ANATEM" + +#: PropertiesFormBase.h:74 +msgid "General settings" +msgstr "Opções gerais" + +#: PropertiesFormBase.h:226 +msgid "Simulation settings" +msgstr "Opções de simulação" + +#: PropertiesFormBase.h:297 +msgid "Import files" +msgstr "Importar arquivos" + #: ReactiveShuntElementForm.cpp:93 msgid "Capacitor: Switching" msgstr "Capacitor: Chaveamento" @@ -1419,29 +2591,34 @@ msgid "" msgstr "" "Valor inserido incorretamente no campo \"Iterações máx (Fluxo de carga)\"." -#: SimulationsSettingsForm.cpp:133 +#: SimulationsSettingsForm.cpp:127 +msgid "Value entered incorrectly in the field \"Slack bus angle\"." +msgstr "" +"Valor inserido incorretamente no campo \"Ângulo da barra de referência\"." + +#: SimulationsSettingsForm.cpp:136 msgid "Value entered incorrectly in the field \"System frequency\"." msgstr "Valor inserido incorretamente no campo \"Frequência do sistema\"." -#: SimulationsSettingsForm.cpp:136 +#: SimulationsSettingsForm.cpp:139 msgid "Value entered incorrectly in the field \"Tolerance (Stability)\"." msgstr "Valor inserido incorretamente no campo \"Tolerância (estabilidade)\"." -#: SimulationsSettingsForm.cpp:139 +#: SimulationsSettingsForm.cpp:142 msgid "Value entered incorrectly in the field \"Max. iterations (Stability)\"." msgstr "" "Valor inserido incorretamente no campo \"Iterações máx (Estabilidade)\"." -#: SimulationsSettingsForm.cpp:142 +#: SimulationsSettingsForm.cpp:145 msgid "Value entered incorrectly in the field \"Controls step ratio\"." msgstr "" "Valor inserido incorretamente no campo \"Razão do passo dos controles\"." -#: SimulationsSettingsForm.cpp:145 +#: SimulationsSettingsForm.cpp:148 msgid "Value entered incorrectly in the field \"Plot time\"." msgstr "Valor inserido incorretamente no campo \"Tempo de impressão\"." -#: SimulationsSettingsForm.cpp:153 +#: SimulationsSettingsForm.cpp:156 msgid "" "Value entered incorrectly in the field \"Constant impedance portion of " "active power (ZIP load)\"." @@ -1449,7 +2626,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de impedância constante da " "potência ativa (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:157 +#: SimulationsSettingsForm.cpp:160 msgid "" "Value entered incorrectly in the field \"Constant current portion of active " "power (ZIP load)\"." @@ -1457,7 +2634,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de corrente constante da " "potência ativa (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:161 +#: SimulationsSettingsForm.cpp:164 msgid "" "Value entered incorrectly in the field \"Constant power portion of active " "power (ZIP load)\"." @@ -1465,7 +2642,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de potência constante da " "potência ativa (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:165 +#: SimulationsSettingsForm.cpp:168 msgid "" "Value entered incorrectly in the field \"Constant impedance portion of " "reactive power (ZIP load)\"." @@ -1473,7 +2650,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de impedância constante da " "potência reativa (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:169 +#: SimulationsSettingsForm.cpp:172 msgid "" "Value entered incorrectly in the field \"Constant current portion of " "reactive power (ZIP load)\"." @@ -1481,7 +2658,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de corrente constante da " "potência reativa (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:173 +#: SimulationsSettingsForm.cpp:176 msgid "" "Value entered incorrectly in the field \"Constant power portion of reactive " "power (ZIP load)\"." @@ -1489,7 +2666,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Parcela de potência constante da " "potência reativa (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:178 +#: SimulationsSettingsForm.cpp:181 msgid "" "Value entered incorrectly in the field \"Constant current undervoltage limit " "(ZIP load)\"." @@ -1497,7 +2674,7 @@ msgstr "" "Valor inserido incorretamente no campo \"Limite de subtensão da corrente " "constante (Carga ZIP)\"." -#: SimulationsSettingsForm.cpp:183 +#: SimulationsSettingsForm.cpp:186 msgid "" "Value entered incorrectly in the field \"Constant power undervoltage limit " "(ZIP load)\"." @@ -1513,33 +2690,15 @@ msgstr "Você deve atribuir pelo menos dois sinais." msgid "Value entered incorrectly in the field \"Signs\"." msgstr "Valor inserido incorretamente no campo \"Sinais\"." -#: SwitchingForm.cpp:24 SwitchingForm.cpp:33 base/ElementFormBase.cpp:2500 -msgid "Time (s)" -msgstr "Tempo (s)" - -#: SwitchingForm.cpp:40 SwitchingForm.cpp:53 SwitchingForm.cpp:69 -#: base/ElementFormBase.cpp:2495 -msgid "Insert" -msgstr "Inserir" - -#: SwitchingForm.cpp:40 SwitchingForm.cpp:53 base/ElementFormBase.cpp:2496 -#: base/ElementFormBase.cpp:2512 -msgid "Remove" -msgstr "Remover" - -#: SyncGenerator.cpp:58 +#: SyncGenerator.cpp:56 msgid "Edit Generator" msgstr "Editar Gerador" -#: SyncGenerator.cpp:66 base/ElementFormBase.h:243 -msgid "Generator" -msgstr "Gerador" - -#: SyncGenerator.cpp:246 +#: SyncGenerator.cpp:242 msgid "Frequency" msgstr "Frequência" -#: SyncGenerator.cpp:248 +#: SyncGenerator.cpp:244 msgid "Delta" msgstr "Delta" @@ -1615,17 +2774,6 @@ msgstr "Fluxo de potência reativa" msgid "Losses" msgstr "Perdas" -#: TextForm.cpp:975 TextForm.cpp:985 TextForm.cpp:990 TextForm.cpp:998 -#: TextForm.cpp:1006 base/ElementFormBase.cpp:185 base/ElementFormBase.cpp:208 -#: base/ElementFormBase.cpp:297 base/ElementFormBase.cpp:320 -#: base/ElementFormBase.cpp:852 base/ElementFormBase.cpp:909 -#: base/ElementFormBase.cpp:932 base/ElementFormBase.cpp:955 -#: base/ElementFormBase.cpp:986 base/ElementFormBase.cpp:1009 -#: base/ElementFormBase.cpp:1040 base/ElementFormBase.cpp:1063 -#: base/ElementFormBase.cpp:1140 base/ElementFormBase.cpp:1163 -msgid "p.u." -msgstr "p.u." - #: TextForm.cpp:980 msgid "Degrees" msgstr "Graus" @@ -1690,7 +2838,7 @@ msgstr "Valor inserido incorretamente no campo \"Parâmetros do numerador\"." msgid "Value entered incorrectly in the field \"Denominator parameters\"." msgstr "Valor inserido incorretamente no campo \"Parâmetros do denominador\"." -#: Transformer.cpp:275 +#: Transformer.cpp:263 msgid "Edit tranformer" msgstr "Editar Transformador" @@ -1782,1165 +2930,57 @@ msgstr "" "Valor inserido incorretamente no campo \"Reatância de aterramento do " "secundário\"." -#: Workspace.cpp:302 +#: Workspace.cpp:297 msgid "Do you want to change the rated voltage of the path?" msgstr "Você quer mudar a tensão nominal do trecho?" -#: Workspace.cpp:303 +#: Workspace.cpp:298 msgid "Warning" msgstr "Atenção" -#: Workspace.cpp:703 +#: Workspace.cpp:688 msgid "Insert Text: Click to insert, ESC to cancel." msgstr "Inserir Texto: Clique para inserir, ESC para cancelar." -#: Workspace.cpp:839 +#: Workspace.cpp:820 msgid "MODE: DRAG" msgstr "MODO: ARRASTAR" -#: Workspace.cpp:844 +#: Workspace.cpp:825 msgid "MODE: PASTE" msgstr "MODO: COLAR" -#: Workspace.cpp:851 +#: Workspace.cpp:832 msgid "MODE: INSERT" msgstr "MODO: INSERÇÃO" -#: Workspace.cpp:860 +#: Workspace.cpp:841 msgid "MODE: EDIT" msgstr "MODO: EDIÇÃO" -#: Workspace.cpp:864 +#: Workspace.cpp:845 #, c-format msgid "ZOOM: %d%%" msgstr "ZOOM: %d%%" -#: Workspace.cpp:1208 Workspace.cpp:1316 +#: Workspace.cpp:1182 Workspace.cpp:1290 msgid "It was not possible to paste from clipboard." msgstr "Não foi possível colar da área de transferência." -#: Workspace.cpp:1324 +#: Workspace.cpp:1298 msgid "Click to paste." msgstr "Clique para colar." -#: Workspace.cpp:1469 +#: Workspace.cpp:1443 msgid "Do you wish to open the stability graphics?" msgstr "Você deseja abrir os gráficos do estudo de estabilidade?" -#: Workspace.cpp:1469 +#: Workspace.cpp:1443 msgid "Question" msgstr "Pergunta" -#: base/ChartViewBase.cpp:64 base/MainFrameBase.cpp:72 -#: base/MainFrameBase.cpp:73 -msgid "File" -msgstr "Arquivo" - -#: base/ChartViewBase.cpp:66 -msgid "Save chart as image" -msgstr "Salvar gráfico como imagem" - -#: base/ChartViewBase.cpp:69 -msgid "Send to clipboard" -msgstr "Enviar para a área de transferência" - -#: base/ChartViewBase.cpp:72 -msgid "Export CSV..." -msgstr "Exportar CSV..." - -#: base/ChartViewBase.cpp:77 base/MainFrameBase.cpp:88 -msgid "Exit" -msgstr "Sair" - -#: base/ChartViewBase.cpp:81 -msgid "View" -msgstr "Vizualização" - -#: base/ChartViewBase.cpp:83 base/MainFrameBase.cpp:146 -msgid "Fit" -msgstr "Encaixar" - -#: base/ChartViewBase.cpp:88 -msgid "Show grid" -msgstr "Exibir linhas de grade" - -#: base/ChartViewBase.cpp:91 -msgid "Show label" -msgstr "Exibir legendas" - -#: base/ChartViewBase.cpp:94 -msgid "Show coordinates" -msgstr "Exibir coordenadas" - -#: base/ChartViewBase.cpp:97 -msgid "Dark theme" -msgstr "Tema escuro" - -#: base/ChartViewBase.cpp:120 -msgid "Line properties" -msgstr "Propriedades do traço" - -#: base/ChartViewBase.cpp:139 -msgid "Y" -msgstr "Y" - -#: base/ChartViewBase.cpp:140 -msgid "X" -msgstr "X" - -#: base/ChartViewBase.cpp:145 -msgid "Chart properties" -msgstr "Propriedades do gráfico" - -#: base/ChartViewBase.cpp:148 -msgid "Chart title" -msgstr "Título do gráfico" - -#: base/ChartViewBase.cpp:152 -msgid "X axis label" -msgstr "Rótulo do eixo X" - -#: base/ChartViewBase.cpp:156 -msgid "Y axis label" -msgstr "Rótulo do eixo Y" - -#: base/ChartViewBase.cpp:163 base/ElementFormBase.cpp:2516 -msgid "Up" -msgstr "Cima" - -#: base/ChartViewBase.cpp:166 -msgid "Botton" -msgstr "Baixo" - -#: base/ChartViewBase.cpp:169 -msgid "Left" -msgstr "Esquerda" - -#: base/ChartViewBase.cpp:172 -msgid "Right" -msgstr "Direita" - -#: base/ChartViewBase.cpp:178 -msgid "X min" -msgstr "X min" - -#: base/ChartViewBase.cpp:181 -msgid "X max" -msgstr "X máx" - -#: base/ChartViewBase.cpp:184 -msgid "Y min" -msgstr "Y min" - -#: base/ChartViewBase.cpp:187 -msgid "Y max" -msgstr "Y máx" - -#: base/ChartViewBase.h:96 -msgid "Chart viewer" -msgstr "Visualizador de gráficos" - -#: base/ControlEditorBase.cpp:63 base/MainFrameBase.cpp:82 -msgid "New" -msgstr "Novo" - -#: base/ControlEditorBase.cpp:65 -msgid "Import" -msgstr "Importar" - -#: base/ControlEditorBase.cpp:67 -msgid "Export" -msgstr "Exportar" - -#: base/ControlEditorBase.cpp:71 base/MainFrameBase.cpp:123 -msgid "Copy" -msgstr "Copiar" - -#: base/ControlEditorBase.cpp:73 base/MainFrameBase.cpp:125 -msgid "Paste" -msgstr "Colar" - -#: base/ControlEditorBase.cpp:75 base/MainFrameBase.cpp:127 -msgid "Undo" -msgstr "Desfazer" - -#: base/ControlEditorBase.cpp:77 base/MainFrameBase.cpp:129 -msgid "Redo" -msgstr "Refazer" - -#: base/ControlEditorBase.cpp:81 base/MainFrameBase.cpp:140 -msgid "Drag" -msgstr "Arrastar" - -#: base/ControlEditorBase.cpp:83 base/MainFrameBase.cpp:142 -msgid "Move" -msgstr "Mover" - -#: base/ControlEditorBase.cpp:96 -msgid "Control elements" -msgstr "Elementos de controle" - -#: base/ControlEditorBase.cpp:124 -msgid "Test system..." -msgstr "Testar sistema..." - -#: base/ControlEditorBase.cpp:130 base/ElementFormBase.cpp:328 -#: base/ElementFormBase.cpp:731 base/ElementFormBase.cpp:1235 -#: base/ElementFormBase.cpp:1547 base/ElementFormBase.cpp:1947 -#: base/ElementFormBase.cpp:2282 base/ElementFormBase.cpp:2412 -#: base/ElementFormBase.cpp:2540 base/ElementFormBase.cpp:2698 -#: base/ElementFormBase.cpp:2896 base/ElementFormBase.cpp:3011 -#: base/ElementFormBase.cpp:3100 base/ElementFormBase.cpp:3201 -#: base/ElementFormBase.cpp:3302 base/ElementFormBase.cpp:3407 -#: base/ElementFormBase.cpp:3496 base/ElementFormBase.cpp:3585 -#: base/ElementFormBase.cpp:3682 base/ElementFormBase.cpp:3835 -#: base/PropertiesFormBase.cpp:78 base/PropertiesFormBase.cpp:635 -#: base/PropertiesFormBase.cpp:767 -msgid "OK" -msgstr "OK" - -#: base/ControlEditorBase.cpp:214 base/ElementFormBase.cpp:35 -#: base/ElementFormBase.cpp:404 base/ElementFormBase.cpp:1302 -#: base/ElementFormBase.cpp:1615 base/ElementFormBase.cpp:2015 -#: base/ElementFormBase.cpp:2352 base/ElementFormBase.cpp:2609 -#: base/ElementFormBase.cpp:2766 base/ElementFormBase.cpp:2976 -#: base/ElementFormBase.cpp:3077 base/ElementFormBase.cpp:3166 -#: base/ElementFormBase.cpp:3267 base/ElementFormBase.cpp:3368 -#: base/ElementFormBase.cpp:3473 base/ElementFormBase.cpp:3562 -#: base/ElementFormBase.cpp:3651 base/ElementFormBase.cpp:3752 -#: base/PropertiesFormBase.cpp:35 base/PropertiesFormBase.cpp:144 -msgid "General" -msgstr "Geral" - -#: base/ControlEditorBase.cpp:219 -msgid "Input type:" -msgstr "Tipo de entrada:" - -#: base/ControlEditorBase.cpp:240 -msgid "Start time" -msgstr "Tempo de início" - -#: base/ControlEditorBase.cpp:255 base/ControlEditorBase.cpp:308 -#: base/ElementFormBase.cpp:251 base/ElementFormBase.cpp:274 -#: base/ElementFormBase.cpp:829 base/ElementFormBase.cpp:1086 -#: base/ElementFormBase.cpp:1109 base/ElementFormBase.cpp:1186 -#: base/ElementFormBase.cpp:1209 base/PropertiesFormBase.cpp:291 -#: base/PropertiesFormBase.cpp:314 base/PropertiesFormBase.cpp:405 -msgid "s" -msgstr "s" - -#: base/ControlEditorBase.cpp:263 -msgid "Slope" -msgstr "Inclinação" - -#: base/ControlEditorBase.cpp:278 base/PropertiesFormBase.cpp:276 -msgid "Time step" -msgstr "Passo de integração" - -#: base/ControlEditorBase.cpp:293 base/PropertiesFormBase.cpp:299 -msgid "Simulation time" -msgstr "Tempo de simulação" - -#: base/ControlEditorBase.cpp:316 -msgid "Run" -msgstr "Executar" - -#: base/ControlEditorBase.cpp:320 base/ElementFormBase.cpp:332 -#: base/ElementFormBase.cpp:735 base/ElementFormBase.cpp:1239 -#: base/ElementFormBase.cpp:1551 base/ElementFormBase.cpp:1951 -#: base/ElementFormBase.cpp:2286 base/ElementFormBase.cpp:2416 -#: base/ElementFormBase.cpp:2544 base/ElementFormBase.cpp:2702 -#: base/ElementFormBase.cpp:2900 base/ElementFormBase.cpp:3015 -#: base/ElementFormBase.cpp:3104 base/ElementFormBase.cpp:3205 -#: base/ElementFormBase.cpp:3306 base/ElementFormBase.cpp:3411 -#: base/ElementFormBase.cpp:3500 base/ElementFormBase.cpp:3589 -#: base/ElementFormBase.cpp:3686 base/ElementFormBase.cpp:3839 -#: base/PropertiesFormBase.cpp:82 base/PropertiesFormBase.cpp:639 -msgid "Cancel" -msgstr "Cancelar" - -#: base/ControlEditorBase.h:90 -msgid "Control editor" -msgstr "Editor de controle" - -#: base/ControlEditorBase.h:136 -msgid "Control system test" -msgstr "Teste do sistema de controle" - -#: base/DataReportBase.cpp:73 -msgid "Power flow data" -msgstr "Dados de fluxo de carga" - -#: base/DataReportBase.cpp:84 base/PropertiesFormBase.cpp:192 -msgid "Power flow" -msgstr "Fluxo de carga" - -#: base/DataReportBase.cpp:101 base/DataReportBase.cpp:163 -msgid "Buses" -msgstr "Barras" - -#: base/DataReportBase.cpp:118 base/DataReportBase.cpp:180 -msgid "Branches" -msgstr "Ramos" - -#: base/DataReportBase.cpp:135 -msgid "Fault data" -msgstr "Dados da falta" - -#: base/DataReportBase.cpp:146 base/ElementFormBase.cpp:117 -#: base/ElementFormBase.cpp:579 base/ElementFormBase.cpp:1479 -#: base/ElementFormBase.cpp:1826 base/MainFrameBase.cpp:192 -msgid "Fault" -msgstr "Falta" - -#: base/DataReportBase.cpp:197 -msgid "Generators" -msgstr "Geradores" - -#: base/DataReportBase.h:90 -msgid "Data report" -msgstr "Relatório de dados" - -#: base/ElementFormBase.cpp:60 base/ElementFormBase.cpp:1327 -#: base/ElementFormBase.cpp:1640 -msgid "Rated voltage" -msgstr "Tensão nominal" - -#: base/ElementFormBase.cpp:87 -msgid "Controlled voltage" -msgstr "Tensão controlada" - -#: base/ElementFormBase.cpp:111 -msgid "Slack Bus" -msgstr "Barra de referência" - -#: base/ElementFormBase.cpp:122 base/ElementFormBase.cpp:223 -msgid "Insert fault in the bus" -msgstr "Inserir falta na barra" - -#: base/ElementFormBase.cpp:135 -msgid "Fault type" -msgstr "Tipo de falta" - -#: base/ElementFormBase.cpp:153 -msgid "Fault place" -msgstr "Local da falta" - -#: base/ElementFormBase.cpp:170 base/ElementFormBase.cpp:282 -msgid "Fault resistance (R)" -msgstr "Resistência da falta (R)" - -#: base/ElementFormBase.cpp:193 base/ElementFormBase.cpp:305 -msgid "Fault reactance (Xl)" -msgstr "Reatância da falta (Xl)" - -#: base/ElementFormBase.cpp:213 base/ElementFormBase.cpp:725 -#: base/ElementFormBase.cpp:1541 base/ElementFormBase.cpp:1941 -#: base/ElementFormBase.cpp:2107 base/ElementFormBase.cpp:2406 -#: base/ElementFormBase.cpp:2692 base/PropertiesFormBase.cpp:263 -msgid "Stability" -msgstr "Estabilidade" - -#: base/ElementFormBase.cpp:218 -msgid "Plot bus data" -msgstr "Imprimir dados da barra" - -#: base/ElementFormBase.cpp:259 -msgid "Fault length" -msgstr "Duração da falta" - -#: base/ElementFormBase.cpp:429 base/ElementFormBase.cpp:1342 -#: base/ElementFormBase.cpp:1671 -msgid "Rated power" -msgstr "Potência nominal" - -#: base/ElementFormBase.cpp:517 -msgid "Max reactive power" -msgstr "Potência reativa máx" - -#: base/ElementFormBase.cpp:547 -msgid "Min reactive power" -msgstr "Potência reativa min" - -#: base/ElementFormBase.cpp:573 -msgid "Use machine rated power as base" -msgstr "Utilizar potência nominal da máquina como base" - -#: base/ElementFormBase.cpp:584 -msgid "Sequence impedances (p.u.)" -msgstr "Impedâncias de sequência (p.u.)" - -#: base/ElementFormBase.cpp:596 -msgid "Positive resistance (R1)" -msgstr "Resistência positiva (R1)" - -#: base/ElementFormBase.cpp:611 -msgid "Positive reactance (X1)" -msgstr "Reatância positiva (X1)" - -#: base/ElementFormBase.cpp:626 -msgid "Negative resistance (R2)" -msgstr "Resistência negativa (R2)" - -#: base/ElementFormBase.cpp:641 -msgid "Negative reactance (X2)" -msgstr "Reatância negativa (X2)" - -#: base/ElementFormBase.cpp:656 -msgid "Zero resistance (R0)" -msgstr "Resistência zero (R0)" - -#: base/ElementFormBase.cpp:671 -msgid "Zero reactance (X0)" -msgstr "Reatância zero (X0)" - -#: base/ElementFormBase.cpp:690 -msgid "Ground resistance (p.u.)" -msgstr "Resistência de aterramento (p.u.)" - -#: base/ElementFormBase.cpp:705 -msgid "Ground reactance (p.u.)" -msgstr "Reatância de aterramento (p.u.)" - -#: base/ElementFormBase.cpp:716 -msgid "Grounded neutral" -msgstr "Neutro aterrado" - -#: base/ElementFormBase.cpp:801 -msgid "Plot synchronous machine data" -msgstr "Imprimir dados da máquina síncrona" - -#: base/ElementFormBase.cpp:814 -msgid "Inertia (H)" -msgstr "Inércia (H)" - -#: base/ElementFormBase.cpp:837 -msgid "Damping factor" -msgstr "Fator de amortecimento" - -#: base/ElementFormBase.cpp:860 -msgid "Use AVR" -msgstr "Utilizar AVR" - -#: base/ElementFormBase.cpp:865 -msgid "Edit AVR" -msgstr "Editar AVR" - -#: base/ElementFormBase.cpp:873 -msgid "Use speed governor" -msgstr "Utilizar regulador de velocidade" - -#: base/ElementFormBase.cpp:878 -msgid "Edit speed governor" -msgstr "Editar regulador de velocidade" - -#: base/ElementFormBase.cpp:894 -msgid "Armature resistance (Ra)" -msgstr "Resistência de armadura (Ra)" - -#: base/ElementFormBase.cpp:917 -msgid "Potier reactance (Xp)" -msgstr "Reatância de Potier (Xp)" - -#: base/ElementFormBase.cpp:940 -msgid "Saturation factor" -msgstr "Fator de saturação" - -#: base/ElementFormBase.cpp:959 -msgid "Syncronous" -msgstr "Síncrono" - -#: base/ElementFormBase.cpp:971 -msgid "Direct-axis reactance (Xd)" -msgstr "Reatância de eixo direto (Xd)" - -#: base/ElementFormBase.cpp:994 -msgid "Quadrature-axis reactance (Xq)" -msgstr "Reatância de eixo em quadratura (Xq)" - -#: base/ElementFormBase.cpp:1013 -msgid "Transient" -msgstr "Tansitório" - -#: base/ElementFormBase.cpp:1025 -msgid "Direct-axis reactance (X'd)" -msgstr "Reatância de eixo direto (X'd)" - -#: base/ElementFormBase.cpp:1048 -msgid "Quadrature-axis reactance (X'q)" -msgstr "Reatância de eixo em quadratura (X'q)" - -#: base/ElementFormBase.cpp:1071 -msgid "Direct-axis time constant (T'd0)" -msgstr "Constante de tempo de eixo direto (T'd0)" - -#: base/ElementFormBase.cpp:1094 -msgid "Quadrature-axis time constant (T'q0)" -msgstr "Constante de tempo de eixo em quadratura (T'd0)" - -#: base/ElementFormBase.cpp:1113 -msgid "Sub-transient" -msgstr "Subtransitório" - -#: base/ElementFormBase.cpp:1125 -msgid "Direct-axis reactance (X''d)" -msgstr "Reatância de eixo direto (X''d)" - -#: base/ElementFormBase.cpp:1148 -msgid "Quadrature-axis reactance (X''q)" -msgstr "Reatância de eixo em quadratura (X''q)" - -#: base/ElementFormBase.cpp:1171 -msgid "Direct-axis time constant (T''d0)" -msgstr "Constante de tempo de eixo direto (T''d0)" - -#: base/ElementFormBase.cpp:1194 -msgid "Quadrature-axis time constant (T''q0)" -msgstr "Constante de tempo de eixo em quadratura (T''d0)" - -#: base/ElementFormBase.cpp:1229 base/ElementFormBase.cpp:2276 -#: base/ElementFormBase.h:712 -msgid "Switching" -msgstr "Chaveamento" - -#: base/ElementFormBase.cpp:1331 -msgid "138 kV" -msgstr "138 kV" - -#: base/ElementFormBase.cpp:1370 base/ElementFormBase.cpp:1701 -msgid "Resistance (R)" -msgstr "Resistência (R)" - -#: base/ElementFormBase.cpp:1398 base/ElementFormBase.cpp:1728 -msgid "Indutive reactance (XL)" -msgstr "Reatância indutiva (Xl)" - -#: base/ElementFormBase.cpp:1426 -msgid "Capacitive susceptance (B)" -msgstr "Susceptância capacitiva (B)" - -#: base/ElementFormBase.cpp:1454 -msgid "Line size" -msgstr "Comprimento da linha" - -#: base/ElementFormBase.cpp:1469 -msgid "km" -msgstr "km" - -#: base/ElementFormBase.cpp:1473 -msgid "Use line rated power as base" -msgstr "Utilizar a potência nominal como base" - -#: base/ElementFormBase.cpp:1484 base/ElementFormBase.cpp:1831 -msgid "Zero-sequence impedances (p.u.)" -msgstr "Impedâncias de sequência zero (p.u.)" - -#: base/ElementFormBase.cpp:1496 base/ElementFormBase.cpp:1843 -msgid "Resistance (R0)" -msgstr "Resistência (R0)" - -#: base/ElementFormBase.cpp:1511 base/ElementFormBase.cpp:1858 -msgid "Indutive reactance (X0)" -msgstr "Reatância indutiva (X0)" - -#: base/ElementFormBase.cpp:1526 -msgid "Capacitive susceptance (B0)" -msgstr "Susceptância capacitiva (B0)" - -#: base/ElementFormBase.cpp:1644 -msgid "138 kV / 138 kV" -msgstr "138 kV / 138 kV" - -#: base/ElementFormBase.cpp:1655 -msgid "Base voltage" -msgstr "Tensão base" - -#: base/ElementFormBase.cpp:1759 -msgid "Connection" -msgstr "Conexão" - -#: base/ElementFormBase.cpp:1786 -msgid "Turns ratio" -msgstr "TAP" - -#: base/ElementFormBase.cpp:1801 -msgid "Phase shift" -msgstr "Defasagem" - -#: base/ElementFormBase.cpp:1816 -msgid "degrees" -msgstr "graus" - -#: base/ElementFormBase.cpp:1820 -msgid "Use transformer rated power as base" -msgstr "Utilizar a potência do transformador como base" - -#: base/ElementFormBase.cpp:1869 -msgid "Ground impedances (p.u.)" -msgstr "Impedância de aterramento (p.u.)" - -#: base/ElementFormBase.cpp:1881 -msgid "Primary resistance" -msgstr "Resistência do primário" - -#: base/ElementFormBase.cpp:1896 -msgid "Primary reactance" -msgstr "Reatância do primário" - -#: base/ElementFormBase.cpp:1911 -msgid "Secondary resistance" -msgstr "Resistência do secundário" - -#: base/ElementFormBase.cpp:1926 -msgid "Secondary reactance" -msgstr "Reatância do secundário" - -#: base/ElementFormBase.cpp:2094 -msgid "Load type (power flow)" -msgstr "Tipo de carga (fluxo de carga)" - -#: base/ElementFormBase.cpp:2112 -msgid "Plot load data" -msgstr "Imprimir dados da carga" - -#: base/ElementFormBase.cpp:2117 -msgid "Use ZIP load composition" -msgstr "Utilizar composição de carga ZIP" - -#: base/ElementFormBase.cpp:2134 base/ElementFormBase.cpp:2207 -#: base/PropertiesFormBase.cpp:437 base/PropertiesFormBase.cpp:510 -msgid "Constant impedance" -msgstr "Impedância constante" - -#: base/ElementFormBase.cpp:2149 base/ElementFormBase.cpp:2172 -#: base/ElementFormBase.cpp:2195 base/ElementFormBase.cpp:2222 -#: base/ElementFormBase.cpp:2245 base/ElementFormBase.cpp:2268 -#: base/PropertiesFormBase.cpp:452 base/PropertiesFormBase.cpp:475 -#: base/PropertiesFormBase.cpp:498 base/PropertiesFormBase.cpp:525 -#: base/PropertiesFormBase.cpp:548 base/PropertiesFormBase.cpp:571 -#: base/PropertiesFormBase.cpp:602 base/PropertiesFormBase.cpp:625 -msgid "%" -msgstr "%" - -#: base/ElementFormBase.cpp:2157 base/ElementFormBase.cpp:2230 -#: base/PropertiesFormBase.cpp:460 base/PropertiesFormBase.cpp:533 -#: base/PropertiesFormBase.cpp:587 -msgid "Constant current" -msgstr "Corrente constante" - -#: base/ElementFormBase.cpp:2180 base/ElementFormBase.cpp:2253 -#: base/PropertiesFormBase.cpp:483 base/PropertiesFormBase.cpp:556 -#: base/PropertiesFormBase.cpp:610 -msgid "Constant power" -msgstr "Potência constante" - -#: base/ElementFormBase.cpp:2490 -msgid "Switching properties" -msgstr "Propriedades de chaveamento" - -#: base/ElementFormBase.cpp:2508 -msgid "Add" -msgstr "Adicionar" - -#: base/ElementFormBase.cpp:2520 -msgid "Down" -msgstr "Baixo" - -#: base/ElementFormBase.cpp:2528 -msgid "Switching list" -msgstr "Lista de chaveamento" - -#: base/ElementFormBase.cpp:2779 -msgid "Element" -msgstr "Elemento" - -#: base/ElementFormBase.cpp:2801 -msgid "Element name" -msgstr "Nome do elemento" - -#: base/ElementFormBase.cpp:2814 -msgid "Text type" -msgstr "Tipo de texto" - -#: base/ElementFormBase.cpp:2827 -msgid "From bus" -msgstr "Da barra" - -#: base/ElementFormBase.cpp:2840 -msgid "To bus" -msgstr "Para barra" - -#: base/ElementFormBase.cpp:2853 -msgid "Unit" -msgstr "Unidade" - -#: base/ElementFormBase.cpp:2866 -msgid "Decimal places:" -msgstr "Casas decimais:" - -#: base/ElementFormBase.cpp:2879 -msgid "Preview:" -msgstr "Pré-visualização:" - -#: base/ElementFormBase.cpp:2981 -msgid "Numerator parameters" -msgstr "Parâmetros do numerador" - -#: base/ElementFormBase.cpp:2993 -msgid "Denominator parameters" -msgstr "Parâmetros do denominador" - -#: base/ElementFormBase.cpp:3082 -msgid "Signs" -msgstr "Sinais" - -#: base/ElementFormBase.cpp:3171 base/ElementFormBase.cpp:3272 -msgid "Upper limit" -msgstr "Limite superior" - -#: base/ElementFormBase.cpp:3183 base/ElementFormBase.cpp:3284 -msgid "Lower limit" -msgstr "Limite inferior" - -#: base/ElementFormBase.cpp:3373 -msgid "y = A.eB.x" -msgstr "y = A.eB.x" - -#: base/ElementFormBase.cpp:3377 -msgid "A value" -msgstr "Valor A" - -#: base/ElementFormBase.cpp:3389 -msgid "B value" -msgstr "Valor B" - -#: base/ElementFormBase.cpp:3478 -msgid "Constant value" -msgstr "Valor da constante" - -#: base/ElementFormBase.cpp:3567 -msgid "Gain value" -msgstr "Valor do ganho" - -#: base/ElementFormBase.cpp:3757 -msgid "Input variables (space separated)" -msgstr "Variáveis de entrada (separadas por espaço)" - -#: base/ElementFormBase.cpp:3821 -msgid "No checks performed" -msgstr "Nenhuma verificação realizada" - -#: base/ElementFormBase.cpp:3829 -msgid "Check expression" -msgstr "Verificar expressão" - -#: base/ElementFormBase.h:370 -msgid "Generator: Stability" -msgstr "Gerador: Estabilidade" - -#: base/ElementFormBase.h:671 -msgid "Reactive shunt element" -msgstr "Elemento shunt reativo" - -#: base/ElementFormBase.h:753 -msgid "Motor" -msgstr "Motor" - -#: base/ElementFormBase.h:844 -msgid "Transfer function" -msgstr "Função transferência" - -#: base/ElementFormBase.h:1046 -msgid "Input / Output" -msgstr "Entrada / Saída" - -#: base/ElementFormBase.h:1082 -msgid "Math expression" -msgstr "Expressão matemática" - -#: base/MainFrameBase.cpp:76 base/MainFrameBase.cpp:77 -#: base/MainFrameBase.cpp:80 -msgid "Projects" -msgstr "Projetos" - -#: base/MainFrameBase.cpp:82 -msgid "Create new project" -msgstr "Criar novo projeto" - -#: base/MainFrameBase.cpp:84 -msgid "Open" -msgstr "Abrir" - -#: base/MainFrameBase.cpp:84 -msgid "Open saved project" -msgstr "Abrir projetos salvos" - -#: base/MainFrameBase.cpp:86 -msgid "General Settings" -msgstr "Configurações gerais" - -#: base/MainFrameBase.cpp:86 -msgid "Opens a dialog to set the main settings of the program" -msgstr "" -"Abre um formulário para definir as principais configurações do programa" - -#: base/MainFrameBase.cpp:88 -msgid "Closes the application" -msgstr "Fecha a aplicação" - -#: base/MainFrameBase.cpp:91 base/MainFrameBase.cpp:92 -msgid "Current project" -msgstr "Projeto atual" - -#: base/MainFrameBase.cpp:96 -msgid "Save" -msgstr "Salvar" - -#: base/MainFrameBase.cpp:96 -msgid "Save the current project" -msgstr "Salvar o projeto atual" - -#: base/MainFrameBase.cpp:98 -msgid "Save As..." -msgstr "Salvar como..." - -#: base/MainFrameBase.cpp:98 -msgid "Save as the current project" -msgstr "Salvar como o projeto atual" - -#: base/MainFrameBase.cpp:100 -msgid "Close" -msgstr "Fechar" - -#: base/MainFrameBase.cpp:100 -msgid "Close the current project" -msgstr "Fechar o projeto atual" - -#: base/MainFrameBase.cpp:103 base/MainFrameBase.cpp:104 -#: base/MainFrameBase.cpp:107 -msgid "Help" -msgstr "Ajuda" - -#: base/MainFrameBase.cpp:109 -msgid "PSP-UFU Guide" -msgstr "Manual do PSP-UFU" - -#: base/MainFrameBase.cpp:109 -msgid "Open PSP-UFU Guide" -msgstr "Abrir o manual do PSP-UFU" - -#: base/MainFrameBase.cpp:111 -msgid "About..." -msgstr "Sobre..." - -#: base/MainFrameBase.cpp:111 base/PropertiesFormBase.h:256 -msgid "About PSP-UFU" -msgstr "Sobre o PSP-UFU" - -#: base/MainFrameBase.cpp:114 base/MainFrameBase.cpp:115 -msgid "Tools" -msgstr "Ferramentas" - -#: base/MainFrameBase.cpp:117 base/MainFrameBase.cpp:118 -#: base/MainFrameBase.cpp:121 -msgid "Clipboard" -msgstr "Área de transferência" - -#: base/MainFrameBase.cpp:123 -msgid "Copies the selected elements" -msgstr "Copia os elementos selecionados" - -#: base/MainFrameBase.cpp:125 -msgid "Pastes the elements from clipboard" -msgstr "Cola os elementos da área de transferência" - -#: base/MainFrameBase.cpp:127 -msgid "Undoes the last action" -msgstr "Desfaz a última ação" - -#: base/MainFrameBase.cpp:129 -msgid "Redoes the last undo action" -msgstr "Refaz a última ação desfeita" - -#: base/MainFrameBase.cpp:132 base/MainFrameBase.cpp:133 -#: base/MainFrameBase.cpp:136 -msgid "Circuit" -msgstr "Circuito" - -#: base/MainFrameBase.cpp:138 -msgid "Add Element" -msgstr "Inserir elemento" - -#: base/MainFrameBase.cpp:138 -msgid "Add a new element in the project" -msgstr "Adicionar um elemento novo no projeto" - -#: base/MainFrameBase.cpp:140 -msgid "Drag all the elements" -msgstr "Arrasta todos os elementos" - -#: base/MainFrameBase.cpp:142 -msgid "Move the selected elements" -msgstr "Move os elementos selecionados" - -#: base/MainFrameBase.cpp:144 -msgid "Removes all selected elements" -msgstr "Remove todos os elementos selecionados" - -#: base/MainFrameBase.cpp:146 -msgid "Applies the drag and zoom tools to show all elements in workspace" -msgstr "" -"Aplica as ferramentas de arrasto e ampliação para exibir todos os elementos " -"na área de trabalho" - -#: base/MainFrameBase.cpp:148 -msgid "Rotate Clockwise" -msgstr "Girar Horário" - -#: base/MainFrameBase.cpp:150 -msgid "Rotate Counter-clockwise" -msgstr "Girar anti-horário" - -#: base/MainFrameBase.cpp:150 -msgid "Rotate the selected elements counter-clockwise" -msgstr "Gira os elementos selecionados no sentido anti-horário" - -#: base/MainFrameBase.cpp:152 -msgid "Project Settings" -msgstr "Configurações do projeto" - -#: base/MainFrameBase.cpp:152 -msgid "Opens a dialog to set the main settings of the current project" -msgstr "" -"Abre uma janela para definir as principais configurações do projeto atual" - -#: base/MainFrameBase.cpp:155 base/MainFrameBase.cpp:156 -msgid "Reports" -msgstr "Relatórios" - -#: base/MainFrameBase.cpp:160 -msgid "Data Report" -msgstr "Relatório de dados" - -#: base/MainFrameBase.cpp:160 -msgid "Opens a data report" -msgstr "Abre um relatório de dados" - -#: base/MainFrameBase.cpp:162 -msgid "Charts" -msgstr "Gráficos" - -#: base/MainFrameBase.cpp:162 -msgid "Open the charts" -msgstr "Abre os gráficos" - -#: base/MainFrameBase.cpp:164 -msgid "Snapshot" -msgstr "Instantâneo" - -#: base/MainFrameBase.cpp:164 -msgid "Capture a snapshot of the circuit" -msgstr "Captura uma imagem instantânea do circuito" - -#: base/MainFrameBase.cpp:167 base/MainFrameBase.cpp:168 -msgid "Simulation" -msgstr "Simulação" - -#: base/MainFrameBase.cpp:170 base/MainFrameBase.cpp:171 -msgid "Continuous" -msgstr "Contínuo" - -#: base/MainFrameBase.cpp:175 -msgid "Enable Solution" -msgstr "Habilitar solução" - -#: base/MainFrameBase.cpp:175 -msgid "" -"Enables the power flow and fault (if exists) calculations after any circuit " -"change" -msgstr "" -"Habilita os cálculos de fluxo de carga e falta (se existir) após qualquer " -"mudança no circuito" - -#: base/MainFrameBase.cpp:177 -msgid "Disable Solution" -msgstr "Desabilitar solução" - -#: base/MainFrameBase.cpp:177 -msgid "" -"Disables the power flow and fault calculations after any circuit changes" -msgstr "" -"Desabilita os cálculos de fluxo de carga e falta após qualquer mudança no " -"circuito" - -#: base/MainFrameBase.cpp:179 -msgid "Reset Voltages" -msgstr "Reiniciar tensões" - -#: base/MainFrameBase.cpp:179 -msgid "Reset all voltages to initial state" -msgstr "Reinicia todas as tensões para os valores iniciais" - -#: base/MainFrameBase.cpp:182 base/MainFrameBase.cpp:183 -#: base/MainFrameBase.cpp:186 -msgid "Simulations" -msgstr "Simulações" - -#: base/MainFrameBase.cpp:188 -msgid "Power Flow" -msgstr "Fluxo de carga" - -#: base/MainFrameBase.cpp:188 -msgid "Calculate the circuit power flow" -msgstr "Calcula o fluxo de carga do circuito" - -#: base/MainFrameBase.cpp:190 -msgid "Run Stability" -msgstr "Executar estabilidade" - -#: base/MainFrameBase.cpp:190 -msgid "Run the stability calculations" -msgstr "Executa os cálculos de estabilidade" - -#: base/MainFrameBase.cpp:192 -msgid "Calculate the circuit fault (if exists)" -msgstr "Calcula a falta do circuito (se existir)" - -#: base/MainFrameBase.cpp:194 -msgid "Short-Circuit Power" -msgstr "Nível de curto-circuito" - -#: base/MainFrameBase.cpp:194 -msgid "Calculate the short-circuit power in all buses" -msgstr "Calcula o nível de curto-circuito em todas as barras" - -#: base/MainFrameBase.cpp:196 -msgid "Simulation Settings" -msgstr "Configurações de simulação" - -#: base/MainFrameBase.cpp:196 -msgid "Opens a dialog to set the settings of the simulations" -msgstr "Abre um formulário para definir as configurações de simulação" - -#: base/MainFrameBase.h:141 -msgid "PSP-UFU" -msgstr "PSP-UFU" - -#: base/PropertiesFormBase.cpp:44 -msgid "Language" -msgstr "Idioma" - -#: base/PropertiesFormBase.cpp:60 -msgid "Theme" -msgstr "Tema" - -#: base/PropertiesFormBase.cpp:153 -msgid "Base power" -msgstr "Potência base" - -#: base/PropertiesFormBase.cpp:177 -msgid "Continuous calculation" -msgstr "Cálculo contínuo" - -#: base/PropertiesFormBase.cpp:181 -msgid "Calculate fault after power flow" -msgstr "Calcular falta após o fluxo de carga" - -#: base/PropertiesFormBase.cpp:186 -msgid "Calculate short-circuit power after power flow" -msgstr "Calcular o nível de curto-circuito após o fluxo de carga" - -#: base/PropertiesFormBase.cpp:201 -msgid "Solution method" -msgstr "Método de solução" - -#: base/PropertiesFormBase.cpp:221 -msgid "Acceleration factor" -msgstr "Fator de aceleração" - -#: base/PropertiesFormBase.cpp:236 base/PropertiesFormBase.cpp:345 -msgid "Tolerance" -msgstr "Tolerância" - -#: base/PropertiesFormBase.cpp:251 -msgid "Max. iterations" -msgstr "Iterações máx" - -#: base/PropertiesFormBase.cpp:322 -msgid "System frequency" -msgstr "Frequência do sistema" - -#: base/PropertiesFormBase.cpp:337 -msgid "Hz" -msgstr "Hz" - -#: base/PropertiesFormBase.cpp:360 -msgid "Max. Iterations" -msgstr "Iterações máx" - -#: base/PropertiesFormBase.cpp:375 -msgid "Controls step ratio" -msgstr "Razão do passo dos controles" - -#: base/PropertiesFormBase.cpp:390 -msgid "Plot time" -msgstr "Tempo de impressão" - -#: base/PropertiesFormBase.cpp:409 -msgid "Use center of inertia as reference" -msgstr "Utilizar centro de inércia como referência" - -#: base/PropertiesFormBase.cpp:415 -msgid "ZIP Load" -msgstr "Carga ZIP" - -#: base/PropertiesFormBase.cpp:420 -msgid "Use general composition to all system loads" -msgstr "Utilizar composição geral para todas as cargas do sistema" - -#: base/PropertiesFormBase.cpp:575 -msgid "" -"Undervoltage limit which the loads will be modelled by\n" -"constant impedance:" -msgstr "" -"Subtensão a qual as cargas serão modeladas como\n" -"impedância constante:" - -#: base/PropertiesFormBase.cpp:705 -msgid "About" -msgstr "Sobre" - -#: base/PropertiesFormBase.cpp:715 -msgid "Credits" -msgstr "Créditos" - -#: base/PropertiesFormBase.cpp:732 -msgid "License" -msgstr "Licença" - -#: base/PropertiesFormBase.cpp:748 -msgid "Version:" -msgstr "Versão:" - -#: base/PropertiesFormBase.cpp:752 -msgid "Alpha 2017w45a" -msgstr "Alpha 2017w45a" - -#: base/PropertiesFormBase.cpp:756 -msgid "Home page:" -msgstr "Página Inicial:" - -#: base/PropertiesFormBase.cpp:760 -msgid "https://thales1330.github.io/PSP/" -msgstr "https://thales1330.github.io/PSP/" - -#: base/PropertiesFormBase.h:73 -msgid "General settings" -msgstr "Opções gerais" - -#: base/PropertiesFormBase.h:219 -msgid "Simulation settings" -msgstr "Opções de simulação" +#~ msgid "OK!" +#~ msgstr "OK!" #~ msgid "Syntax error in parameter 'Vars' given to FunctionParser::Parse()" #~ msgstr "Erro de sintaxe no parâmetro 'Vars' dado em FunctionParser::Parse()" |