diff options
| -rw-r--r-- | Project/ChartView.cpp | 50 | ||||
| -rw-r--r-- | Project/ChartView.h | 19 | ||||
| -rw-r--r-- | Project/ChartView.wxcp | 141 | ||||
| -rw-r--r-- | Project/ChartViewBase.cpp | 15 | ||||
| -rw-r--r-- | Project/ChartViewBase.h | 5 | ||||
| -rw-r--r-- | Project/ControlEditor.cpp | 10 | ||||
| -rw-r--r-- | Project/ControlEditor.h | 2 | ||||
| -rw-r--r-- | Project/ControlEditor.wxcp | 9 | ||||
| -rw-r--r-- | Project/ControlEditorBase.cpp | 2 | ||||
| -rw-r--r-- | Project/ControlEditorBase.h | 2 | ||||
| -rw-r--r-- | Project/Project.mk | 39 | ||||
| -rw-r--r-- | Project/Project.project | 4 | ||||
| -rw-r--r-- | Project/Project.txt | 2 | ||||
| -rw-r--r-- | Project/data/lang/pt_BR/pt_BR.mo | bin | 6405 -> 6544 bytes | |||
| -rw-r--r-- | Project/data/lang/pt_BR/pt_BR.po | 580 |
15 files changed, 571 insertions, 309 deletions
diff --git a/Project/ChartView.cpp b/Project/ChartView.cpp index a5fe183..25d1b96 100644 --- a/Project/ChartView.cpp +++ b/Project/ChartView.cpp @@ -1,11 +1,55 @@ #include "ChartView.h" -ChartView::ChartView(wxWindow* parent) - : ChartViewBase(parent) +ChartView::ChartView(wxWindow* parent) : ChartViewBase(parent) { + m_pgPropColor = m_pgMgr->Insert(m_pgPropLineProp, 1, new wxColourProperty(_("Color"))); + m_pgPropColor->SetEditor(wxT("ChoiceAndButton")); + m_pgPropColor->SetValue(static_cast<wxVariant>(*wxBLACK)); + + m_pgPropMargins->SetValue(wxT("<composed>")); + m_pgMgr->Collapse(m_pgPropMargins); + m_pgPropAxisLimit->SetValue(wxT("<composed>")); + m_pgMgr->Collapse(m_pgPropAxisLimit); + + SetMPWindow(); + wxSizer* sizer = GetSizer(); + sizer->Add(m_mpWindow, 1, wxEXPAND, WXC_FROM_DIP(5)); + Layout(); + SetInitialSize(); } -ChartView::~ChartView() +ChartView::~ChartView() {} +void ChartView::SetMPWindow() { + m_mpWindow = new mpWindow(this, wxID_ANY); + + m_mpWindow->SetMargins(20, 10, 40, 60); + m_xaxis = new mpScaleX("", mpALIGN_BOTTOM, true); + m_yaxis = new mpScaleY("", mpALIGN_LEFT, true); + m_xaxis->SetDrawOutsideMargins(false); + m_yaxis->SetDrawOutsideMargins(false); + m_xaxis->SetTicks(false); + m_yaxis->SetTicks(false); + + m_leg = new mpInfoLegend(wxRect(200, 20, 40, 40), wxWHITE_BRUSH); + m_coords = new mpInfoCoords(wxRect(0, 0, 0, 0), wxWHITE_BRUSH); + + m_chartTitle = new mpText("", 50, 0); + wxFont chartTitleFont(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); + m_chartTitle->SetFont(chartTitleFont); + + m_mpWindow->AddLayer(m_xaxis); + m_mpWindow->AddLayer(m_yaxis); + m_mpWindow->AddLayer(m_leg); + m_mpWindow->AddLayer(m_coords); + m_mpWindow->AddLayer(m_chartTitle); + + m_leg->SetVisible(true); + m_coords->SetVisible(false); + + m_mpWindow->EnableDoubleBuffer(true); + m_mpWindow->LockAspect(false); + m_mpWindow->Fit(); } +void ChartView::OnPropertyGridChange(wxPropertyGridEvent& event) {} diff --git a/Project/ChartView.h b/Project/ChartView.h index 191a264..316aae9 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -1,11 +1,26 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H #include "ChartViewBase.h" +#include "wxMathPlot/mathplot.h" + +#include <wx/msgdlg.h> class ChartView : public ChartViewBase { -public: + public: ChartView(wxWindow* parent); virtual ~ChartView(); + + protected: + virtual void OnPropertyGridChange(wxPropertyGridEvent& event); + virtual void SetMPWindow(); + mpWindow* m_mpWindow = NULL; + mpScaleX* m_xaxis = NULL; + mpScaleY* m_yaxis = NULL; + mpText* m_chartTitle = NULL; + mpInfoCoords* m_coords = NULL; + mpInfoLegend* m_leg = NULL; + + wxPGProperty* m_pgPropColor = NULL; }; -#endif // CHARTVIEW_H +#endif // CHARTVIEW_H diff --git a/Project/ChartView.wxcp b/Project/ChartView.wxcp index 7a36c9f..9cee9d2 100644 --- a/Project/ChartView.wxcp +++ b/Project/ChartView.wxcp @@ -868,7 +868,14 @@ "m_label": "Set Splitter Left:", "m_value": false }], - "m_events": [], + "m_events": [{ + "m_eventName": "wxEVT_PG_CHANGED", + "m_eventClass": "wxPropertyGridEvent", + "m_eventHandler": "wxPropertyGridEventHandler", + "m_functionNameAndSignature": "OnPropertyGridChange(wxPropertyGridEvent& event)", + "m_description": "Respond to wxEVT_PG_CHANGED event, generated when property value has been changed by the user", + "m_noBody": false + }], "m_children": [{ "m_type": 4486, "proportion": 0, @@ -1009,71 +1016,6 @@ "m_properties": [{ "type": "string", "m_label": "Name:", - "m_value": "m_pgPropColor" - }, { - "type": "string", - "m_label": "Label:", - "m_value": "Color" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "<Default>" - }, { - "type": "choice", - "m_label": "Property Editor Control", - "m_selection": 6, - "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"] - }, { - "type": "choice", - "m_label": "Kind:", - "m_selection": 15, - "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"] - }, { - "type": "string", - "m_label": "String Value", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Choices:", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Array Integer Values", - "m_value": "" - }, { - "type": "bool", - "m_label": "Bool Value", - "m_value": false - }, { - "type": "string", - "m_label": "Wildcard", - "m_value": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Initial Colour", - "colour": "<Default>" - }], - "m_events": [], - "m_children": [] - }, { - "m_type": 4486, - "proportion": 0, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": [], - "m_sizerFlags": [], - "m_properties": [{ - "type": "string", - "m_label": "Name:", "m_value": "m_pgProplineThick" }, { "type": "string", @@ -2171,73 +2113,6 @@ }] }] }] - }, { - "m_type": 4408, - "proportion": 1, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": ["wxTAB_TRAVERSAL"], - "m_sizerFlags": ["wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "100,300" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_panelChart" - }, { - "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": [] }] }] }] diff --git a/Project/ChartViewBase.cpp b/Project/ChartViewBase.cpp index 2fbec21..fcb4307 100644 --- a/Project/ChartViewBase.cpp +++ b/Project/ChartViewBase.cpp @@ -87,11 +87,6 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgPropDraw->SetHelpString(wxT("")); m_pgPropDraw->SetEditor( wxT("CheckBox") ); - m_pgPropColor = m_pgMgr->AppendIn( m_pgPropLineProp, new wxSystemColourProperty( _("Color")) ); - m_pgPropColor->SetValueToUnspecified(); - m_pgPropColor->SetHelpString(wxT("")); - m_pgPropColor->SetEditor( wxT("ChoiceAndButton") ); - m_pgProplineThick = m_pgMgr->AppendIn( m_pgPropLineProp, new wxIntProperty( _("Thickness"), wxPG_LABEL, 1) ); m_pgProplineThick->SetHelpString(wxT("")); m_pgProplineThick->SetEditor( wxT("TextCtrl") ); @@ -162,11 +157,6 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgPropYMax->SetHelpString(wxT("")); m_pgMgr->SetMinSize(wxSize(250,250)); - m_panelChart = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); - - boxSizer_lvl1_1->Add(m_panelChart, 1, wxEXPAND, WXC_FROM_DIP(5)); - m_panelChart->SetMinSize(wxSize(100,300)); - SetName(wxT("ChartViewBase")); SetSize(-1,-1); if (GetSizer()) { @@ -184,8 +174,13 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti wxPersistenceManager::Get().Restore(this); } #endif + // Connect events + m_pgMgr->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); + } ChartViewBase::~ChartViewBase() { + m_pgMgr->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); + } diff --git a/Project/ChartViewBase.h b/Project/ChartViewBase.h index e83ab94..1b67f7b 100644 --- a/Project/ChartViewBase.h +++ b/Project/ChartViewBase.h @@ -19,7 +19,6 @@ #include <wx/propgrid/manager.h> #include <wx/propgrid/property.h> #include <wx/propgrid/advprops.h> -#include <wx/panel.h> #if wxVERSION_NUMBER >= 2900 #include <wx/persist.h> #include <wx/persist/toplevel.h> @@ -57,7 +56,6 @@ protected: wxPropertyGridManager* m_pgMgr; wxPGProperty* m_pgPropLineProp; wxPGProperty* m_pgPropDraw; - wxPGProperty* m_pgPropColor; wxPGProperty* m_pgProplineThick; wxPGProperty* m_pgProplineType; wxPGProperty* m_pgProplineAxis; @@ -75,15 +73,14 @@ protected: wxPGProperty* m_pgPropXMax; wxPGProperty* m_pgPropYMin; wxPGProperty* m_pgPropYMax; - wxPanel* m_panelChart; protected: + virtual void OnPropertyGridChange(wxPropertyGridEvent& event) { event.Skip(); } public: wxMenuBar* GetMenuBar() { return m_menuBar; } wxTreeCtrl* GetTreeCtrl() { return m_treeCtrl; } wxPropertyGridManager* GetPgMgr() { return m_pgMgr; } - wxPanel* GetPanelChart() { return m_panelChart; } ChartViewBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Chart view"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_FRAME_STYLE); virtual ~ChartViewBase(); }; diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp index e457d0f..927654e 100644 --- a/Project/ControlEditor.cpp +++ b/Project/ControlEditor.cpp @@ -13,6 +13,8 @@ #include "Constant.h" #include "Gain.h" +#include "ChartView.h" + ControlElementButton::ControlElementButton(wxWindow* parent, wxString label, wxImage image, wxWindowID id) : wxWindow(parent, id) { @@ -611,6 +613,14 @@ void ControlEditor::OnKeyDown(wxKeyEvent& event) { RotateSelectedElements(event.GetModifiers() != wxMOD_SHIFT); } break; + case 'L': + { + //tests + if(event.ControlDown() && event.ShiftDown()) { + ChartView* cView = new ChartView(this); + cView->Show(); + } + } } } } diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index eb1bc4f..e42b0c0 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -25,6 +25,8 @@ class Exponential; class Constant; class Gain; +class ChartView; + enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_EXP, ID_RATELIM }; class ControlElementButton : public wxWindow diff --git a/Project/ControlEditor.wxcp b/Project/ControlEditor.wxcp index 347a1a3..7952614 100644 --- a/Project/ControlEditor.wxcp +++ b/Project/ControlEditor.wxcp @@ -128,7 +128,14 @@ "m_label": "Bitmap File (256x256):", "m_path": "data/images/ctrlEditor256.png" }], - "m_events": [], + "m_events": [{ + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false + }], "m_children": [{ "m_type": 4461, "proportion": 0, diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 1156e7b..6489c0f 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -136,6 +136,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt } #endif // Connect events + this->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ControlEditorBase::OnKeyDown), NULL, this); this->Connect(ID_RIBBON_IMPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnImportClick), NULL, this); this->Connect(ID_RIBBON_EXPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); m_glCanvas->Connect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); @@ -153,6 +154,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt ControlEditorBase::~ControlEditorBase() { + this->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ControlEditorBase::OnKeyDown), NULL, this); this->Disconnect(ID_RIBBON_IMPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnImportClick), NULL, this); this->Disconnect(ID_RIBBON_EXPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); m_glCanvas->Disconnect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); diff --git a/Project/ControlEditorBase.h b/Project/ControlEditorBase.h index ac89b32..c23aa64 100644 --- a/Project/ControlEditorBase.h +++ b/Project/ControlEditorBase.h @@ -53,6 +53,7 @@ protected: wxStatusBar* m_statusBarMain; protected: + virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); } virtual void OnImportClick(wxCommandEvent& event) { event.Skip(); } virtual void OnExportClick(wxCommandEvent& event) { event.Skip(); } virtual void OnPaint(wxPaintEvent& event) { event.Skip(); } @@ -64,7 +65,6 @@ protected: virtual void OnMouseMotion(wxMouseEvent& event) { event.Skip(); } virtual void OnScroll(wxMouseEvent& event) { event.Skip(); } virtual void OnIdle(wxIdleEvent& event) { event.Skip(); } - virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); } public: wxToolBar* GetToolbarMain() { return m_toolbarMain; } diff --git a/Project/Project.mk b/Project/Project.mk index f2b403d..8b14dc2 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=NDSE-69 -Date :=24/04/2017 +Date :=25/04/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC @@ -65,12 +65,13 @@ CodeLiteDir:=C:\Program Files\CodeLite WXWIN:=C:\wxWidgets-3.1.0 WXCFG:=gcc_dll\mswu Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) + $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) @@ -183,6 +184,14 @@ $(IntermediateDirectory)/Camera.cpp$(DependSuffix): Camera.cpp $(IntermediateDirectory)/Camera.cpp$(PreprocessSuffix): Camera.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Camera.cpp$(PreprocessSuffix) Camera.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)/MainFrameBitmaps.cpp$(ObjectSuffix): MainFrameBitmaps.cpp $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix): MainFrameBitmaps.cpp @@ -223,6 +232,14 @@ $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix): ControlEditorB $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix): ControlEditorBitmaps.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix) ControlEditorBitmaps.cpp +$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix): ChartViewBitmaps.cpp $(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix): ChartViewBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix) -MM ChartViewBitmaps.cpp + +$(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix): ChartViewBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix) ChartViewBitmaps.cpp + $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix): MainFrameBase.cpp $(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix): MainFrameBase.cpp @@ -255,6 +272,14 @@ $(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix): ControlEditorBase $(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix): ControlEditorBase.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix) ControlEditorBase.cpp +$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix): ChartViewBase.cpp $(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix): ChartViewBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix) -MM ChartViewBase.cpp + +$(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix): ChartViewBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix) ChartViewBase.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 diff --git a/Project/Project.project b/Project/Project.project index d055b7a..3ff716c 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -57,7 +57,6 @@ <VirtualDirectory Name="wxMathPlot"> <File Name="wxMathPlot/mathplot.cpp"/> </VirtualDirectory> - <File Name="ChartView.cpp"/> </VirtualDirectory> <VirtualDirectory Name="controller"> <File Name="MainFrame.cpp"/> @@ -89,6 +88,7 @@ <File Name="GainForm.cpp"/> <File Name="IOControlForm.cpp"/> </VirtualDirectory> + <File Name="ChartView.cpp"/> </VirtualDirectory> <File Name="main.cpp"/> </VirtualDirectory> @@ -147,7 +147,6 @@ <VirtualDirectory Name="wxMathPlot"> <File Name="wxMathPlot/mathplot.h"/> </VirtualDirectory> - <File Name="ChartView.h"/> </VirtualDirectory> <VirtualDirectory Name="controller"> <File Name="MainFrame.h"/> @@ -179,6 +178,7 @@ <File Name="GainForm.h"/> <File Name="IOControlForm.h"/> </VirtualDirectory> + <File Name="ChartView.h"/> </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="resources"> diff --git a/Project/Project.txt b/Project/Project.txt index 806024e..d80be54 100644 --- a/Project/Project.txt +++ b/Project/Project.txt @@ -1 +1 @@ -./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/ElementDataObject.cpp.o ./Release/Element.cpp.o ./Release/ArtMetro.cpp.o ./Release/wxGLString.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/FileHanding.cpp.o ./Release/ControlEditor.cpp.o ./Release/Camera.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/ControlEditorBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/ControlEditorBase.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/PowerElement.cpp.o ./Release/ElectricCalculation.cpp.o ./Release/PowerFlow.cpp.o ./Release/Fault.cpp.o ./Release/Text.cpp.o ./Release/GraphicalElement.cpp.o ./Release/ControlElement.cpp.o ./Release/TransferFunction.cpp.o ./Release/ConnectionLine.cpp.o ./Release/Sum.cpp.o ./Release/Multiplier.cpp.o ./Release/Limiter.cpp.o ./Release/RateLimiter.cpp.o ./Release/Exponential.cpp.o ./Release/Constant.cpp.o ./Release/Gain.cpp.o ./Release/IOControl.cpp.o ./Release/ControlElementContainer.cpp.o ./Release/wxMathPlot_mathplot.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o ./Release/TextForm.cpp.o ./Release/TransferFunctionForm.cpp.o ./Release/SumForm.cpp.o ./Release/LimiterForm.cpp.o ./Release/RateLimiterForm.cpp.o ./Release/ExponentialForm.cpp.o ./Release/ConstantForm.cpp.o ./Release/GainForm.cpp.o ./Release/IOControlForm.cpp.o +./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/ElementDataObject.cpp.o ./Release/Element.cpp.o ./Release/ArtMetro.cpp.o ./Release/wxGLString.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/FileHanding.cpp.o ./Release/ControlEditor.cpp.o ./Release/Camera.cpp.o ./Release/ChartView.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/ControlEditorBitmaps.cpp.o ./Release/ChartViewBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/ControlEditorBase.cpp.o ./Release/ChartViewBase.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/PowerElement.cpp.o ./Release/ElectricCalculation.cpp.o ./Release/PowerFlow.cpp.o ./Release/Fault.cpp.o ./Release/Text.cpp.o ./Release/GraphicalElement.cpp.o ./Release/ControlElement.cpp.o ./Release/TransferFunction.cpp.o ./Release/ConnectionLine.cpp.o ./Release/Sum.cpp.o ./Release/Multiplier.cpp.o ./Release/Limiter.cpp.o ./Release/RateLimiter.cpp.o ./Release/Exponential.cpp.o ./Release/Constant.cpp.o ./Release/Gain.cpp.o ./Release/IOControl.cpp.o ./Release/ControlElementContainer.cpp.o ./Release/wxMathPlot_mathplot.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o ./Release/TextForm.cpp.o ./Release/TransferFunctionForm.cpp.o ./Release/SumForm.cpp.o ./Release/LimiterForm.cpp.o ./Release/RateLimiterForm.cpp.o ./Release/ExponentialForm.cpp.o ./Release/ConstantForm.cpp.o ./Release/GainForm.cpp.o ./Release/IOControlForm.cpp.o diff --git a/Project/data/lang/pt_BR/pt_BR.mo b/Project/data/lang/pt_BR/pt_BR.mo Binary files differindex bbe9337..63cc044 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 749b4c1..37d8d12 100644 --- a/Project/data/lang/pt_BR/pt_BR.po +++ b/Project/data/lang/pt_BR/pt_BR.po @@ -1,19 +1,21 @@ msgid "" msgstr "" "Project-Id-Version: PSP-UFU pt_BR 0.0.1\n" -"POT-Creation-Date: 2017-01-20 20:38-0200\n" -"PO-Revision-Date: 2017-01-20 23:15-0200\n" +"POT-Creation-Date: 2017-04-25 16:38-0300\n" +"PO-Revision-Date: 2017-04-25 16:41-0300\n" "Last-Translator: \n" "Language-Team: Thales Lima Oliveira <thaleslima.ufu@gmail.com>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.1\n" "X-Poedit-Basepath: ../../..\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" +"X-Poedit-SearchPathExcluded-0: wxMathPlot\n" +"X-Poedit-SearchPathExcluded-1: rapidXML\n" #: Bus.cpp:175 msgid "Edit bus" @@ -35,7 +37,7 @@ msgstr "" #: Bus.cpp:206 Bus.cpp:212 Bus.cpp:213 Bus.cpp:214 Bus.cpp:216 Bus.cpp:217 #: Bus.cpp:218 Bus.cpp:221 Capacitor.cpp:190 IndMotor.cpp:99 IndMotor.cpp:118 -#: Inductor.cpp:184 Line.cpp:530 Line.cpp:532 Line.cpp:534 Line.cpp:536 +#: Inductor.cpp:184 Line.cpp:495 Line.cpp:497 Line.cpp:499 Line.cpp:501 #: Load.cpp:205 Load.cpp:222 SyncGenerator.cpp:158 SyncGenerator.cpp:177 #: SyncMotor.cpp:124 SyncMotor.cpp:143 Transformer.cpp:434 Transformer.cpp:436 #: Transformer.cpp:438 Transformer.cpp:440 @@ -187,86 +189,274 @@ msgstr "" msgid " MVAr" msgstr "" -#: ControlEditor.cpp:15 +#: ChartView.cpp:14 +msgid "Color" +msgstr "" + +#: ChartViewBase.cpp:30 MainFrameBase.cpp:72 MainFrameBase.cpp:73 +msgid "File" +msgstr "Arquivo" + +#: ChartViewBase.cpp:32 +msgid "Save chart as image" +msgstr "" + +#: ChartViewBase.cpp:35 +#, fuzzy +#| msgid "Clipboard" +msgid "Send to clipboard" +msgstr "Área de transferência" + +#: ChartViewBase.cpp:40 MainFrameBase.cpp:88 +msgid "Exit" +msgstr "Sair" + +#: ChartViewBase.cpp:44 +msgid "View" +msgstr "" + +#: ChartViewBase.cpp:46 MainFrameBase.cpp:146 +msgid "Fit" +msgstr "Encaixar" + +#: ChartViewBase.cpp:51 +msgid "Show grid" +msgstr "" + +#: ChartViewBase.cpp:54 +msgid "Show label" +msgstr "" + +#: ChartViewBase.cpp:57 +msgid "Show coordinates" +msgstr "" + +#: ChartViewBase.cpp:60 +msgid "Dark theme" +msgstr "" + +#: ChartViewBase.cpp:83 +msgid "Line properties" +msgstr "" + +#: ChartViewBase.cpp:86 +msgid "Draw" +msgstr "" + +#: ChartViewBase.cpp:90 +msgid "Thickness" +msgstr "" + +#: ChartViewBase.cpp:96 +msgid "Solid" +msgstr "" + +#: ChartViewBase.cpp:97 +msgid "Dot" +msgstr "" + +#: ChartViewBase.cpp:98 +msgid "Dash" +msgstr "" + +#: ChartViewBase.cpp:99 +msgid "Dot and dash" +msgstr "" + +#: ChartViewBase.cpp:100 +msgid "Cross" +msgstr "" + +#: ChartViewBase.cpp:101 +msgid "Diagonal cross" +msgstr "" + +#: ChartViewBase.cpp:102 ElementForm.cpp:2329 SwitchingForm.cpp:6 +#: SwitchingForm.cpp:15 +msgid "Type" +msgstr "" + +#: ChartViewBase.cpp:108 +msgid "Y" +msgstr "" + +#: ChartViewBase.cpp:109 +msgid "X" +msgstr "" + +#: ChartViewBase.cpp:110 +msgid "Axis" +msgstr "" + +#: ChartViewBase.cpp:114 +msgid "Chart properties" +msgstr "" + +#: ChartViewBase.cpp:117 +msgid "Chart title" +msgstr "" + +#: ChartViewBase.cpp:121 +msgid "X axis label" +msgstr "" + +#: ChartViewBase.cpp:125 +msgid "Y axis label" +msgstr "" + +#: ChartViewBase.cpp:129 +msgid "Margins" +msgstr "" + +#: ChartViewBase.cpp:132 ElementForm.cpp:2348 +msgid "Up" +msgstr "" + +#: ChartViewBase.cpp:135 +msgid "Botton" +msgstr "" + +#: ChartViewBase.cpp:138 +msgid "Left" +msgstr "" + +#: ChartViewBase.cpp:141 +msgid "Right" +msgstr "" + +#: ChartViewBase.cpp:144 +msgid "Axis limit" +msgstr "" + +#: ChartViewBase.cpp:147 +msgid "X min" +msgstr "" + +#: ChartViewBase.cpp:150 +msgid "X max" +msgstr "" + +#: ChartViewBase.cpp:153 +msgid "Y min" +msgstr "" + +#: ChartViewBase.cpp:156 +msgid "Y max" +msgstr "" + +#: ChartViewBase.h:87 +#, fuzzy +#| msgid "Charts" +msgid "Chart view" +msgstr "Gráficos" + +#: ConstantForm.cpp:22 +msgid "Value entered incorrectly in the field \"Constant value\"." +msgstr "" + +#: ControlEditor.cpp:128 msgid "In/Out" msgstr "" -#: ControlEditor.cpp:21 +#: ControlEditor.cpp:134 msgid "Transfer fcn" msgstr "Func Transferência" -#: ControlEditor.cpp:25 +#: ControlEditor.cpp:138 ElementForm.h:826 msgid "Sum" msgstr "" -#: ControlEditor.cpp:31 +#: ControlEditor.cpp:144 ElementForm.h:944 msgid "Constant" msgstr "" -#: ControlEditor.cpp:36 +#: ControlEditor.cpp:149 ElementForm.h:856 msgid "Limiter" msgstr "" -#: ControlEditor.cpp:41 +#: ControlEditor.cpp:154 ElementForm.h:970 msgid "Gain" msgstr "" -#: ControlEditor.cpp:46 +#: ControlEditor.cpp:159 msgid "Multiplier" msgstr "" -#: ControlEditor.cpp:50 -msgid "Saturation" +#: ControlEditor.cpp:163 ElementForm.h:918 +msgid "Exponential" msgstr "" -#: ControlEditor.cpp:56 +#: ControlEditor.cpp:169 ElementForm.h:886 msgid "Rate limiter" msgstr "" -#: ControlEditorBase.cpp:29 MainFrameBase.cpp:82 +#: ControlEditor.cpp:724 +msgid "Save CTL file" +msgstr "" + +#: ControlEditor.cpp:735 +msgid "Open CTL file" +msgstr "" + +#: ControlEditor.cpp:743 MainFrame.cpp:231 +msgid "It was not possible to open the selected file." +msgstr "" + +#: ControlEditor.cpp:743 Element.cpp:273 Element.cpp:287 Line.cpp:149 +#: Line.cpp:375 MainFrame.cpp:231 SumForm.cpp:41 SumForm.cpp:56 +#: TextForm.cpp:1207 Workspace.cpp:1098 Workspace.cpp:1153 Workspace.cpp:1261 +#: Workspace.cpp:1365 Workspace.cpp:1387 +msgid "Error" +msgstr "" + +#: ControlEditorBase.cpp:63 MainFrameBase.cpp:82 msgid "New" msgstr "Novo" -#: ControlEditorBase.cpp:31 +#: ControlEditorBase.cpp:65 msgid "Import" msgstr "" -#: ControlEditorBase.cpp:33 +#: ControlEditorBase.cpp:67 msgid "Export" msgstr "" -#: ControlEditorBase.cpp:37 MainFrameBase.cpp:123 +#: ControlEditorBase.cpp:71 MainFrameBase.cpp:123 msgid "Copy" msgstr "Copiar" -#: ControlEditorBase.cpp:39 MainFrameBase.cpp:125 +#: ControlEditorBase.cpp:73 MainFrameBase.cpp:125 msgid "Paste" msgstr "Colar" -#: ControlEditorBase.cpp:41 MainFrameBase.cpp:127 +#: ControlEditorBase.cpp:75 MainFrameBase.cpp:127 msgid "Undo" msgstr "Desfazer" -#: ControlEditorBase.cpp:43 MainFrameBase.cpp:129 +#: ControlEditorBase.cpp:77 MainFrameBase.cpp:129 msgid "Redo" msgstr "Refazer" -#: ControlEditorBase.cpp:47 MainFrameBase.cpp:140 +#: ControlEditorBase.cpp:81 MainFrameBase.cpp:140 msgid "Drag" msgstr "Arrastar" -#: ControlEditorBase.cpp:49 MainFrameBase.cpp:142 +#: ControlEditorBase.cpp:83 MainFrameBase.cpp:142 msgid "Move" msgstr "Mover" -#: ControlEditorBase.cpp:51 Element.cpp:234 Line.cpp:317 MainFrameBase.cpp:144 +#: ControlEditorBase.cpp:85 Element.cpp:234 Line.cpp:282 MainFrameBase.cpp:144 msgid "Delete" msgstr "Excluir" -#: ControlEditorBase.cpp:62 +#: ControlEditorBase.cpp:96 msgid "Control elements" msgstr "" +#: ControlEditorBase.h:76 +msgid "Control editor" +msgstr "" + #: Element.cpp:226 MainFrameBase.cpp:148 msgid "Rotate clockwise" msgstr "" @@ -275,15 +465,12 @@ msgstr "" msgid "Rotate counter-clockwise" msgstr "" -#: Element.cpp:273 Element.cpp:287 Line.cpp:149 Line.cpp:410 MainFrame.cpp:231 -#: TextForm.cpp:1207 Workspace.cpp:1146 Workspace.cpp:1201 Workspace.cpp:1309 -#: Workspace.cpp:1413 Workspace.cpp:1435 -msgid "Error" -msgstr "" - #: ElementForm.cpp:35 ElementForm.cpp:404 ElementForm.cpp:1302 #: ElementForm.cpp:1615 ElementForm.cpp:2015 ElementForm.cpp:2184 -#: ElementForm.cpp:2441 ElementForm.cpp:2598 +#: ElementForm.cpp:2441 ElementForm.cpp:2598 ElementForm.cpp:2808 +#: ElementForm.cpp:2909 ElementForm.cpp:2998 ElementForm.cpp:3099 +#: ElementForm.cpp:3200 ElementForm.cpp:3305 ElementForm.cpp:3394 +#: ElementForm.cpp:3483 msgid "General" msgstr "" @@ -368,14 +555,18 @@ msgstr "" #: ElementForm.cpp:328 ElementForm.cpp:731 ElementForm.cpp:1235 #: ElementForm.cpp:1547 ElementForm.cpp:1947 ElementForm.cpp:2116 #: ElementForm.cpp:2244 ElementForm.cpp:2372 ElementForm.cpp:2530 -#: ElementForm.cpp:2728 +#: ElementForm.cpp:2728 ElementForm.cpp:2843 ElementForm.cpp:2932 +#: ElementForm.cpp:3033 ElementForm.cpp:3134 ElementForm.cpp:3239 +#: ElementForm.cpp:3328 ElementForm.cpp:3417 ElementForm.cpp:3514 msgid "OK" msgstr "" #: ElementForm.cpp:332 ElementForm.cpp:735 ElementForm.cpp:1239 #: ElementForm.cpp:1551 ElementForm.cpp:1951 ElementForm.cpp:2120 #: ElementForm.cpp:2248 ElementForm.cpp:2376 ElementForm.cpp:2534 -#: ElementForm.cpp:2732 +#: ElementForm.cpp:2732 ElementForm.cpp:2847 ElementForm.cpp:2936 +#: ElementForm.cpp:3037 ElementForm.cpp:3138 ElementForm.cpp:3243 +#: ElementForm.cpp:3332 ElementForm.cpp:3421 ElementForm.cpp:3518 msgid "Cancel" msgstr "" @@ -384,13 +575,14 @@ msgid "Rated power" msgstr "" #: ElementForm.cpp:459 ElementForm.cpp:2040 ElementForm.cpp:2466 -#: TextForm.cpp:866 TextForm.cpp:897 TextForm.cpp:919 TextForm.cpp:927 +#: IOControlForm.cpp:23 TextForm.cpp:866 TextForm.cpp:897 TextForm.cpp:919 +#: TextForm.cpp:927 msgid "Active power" msgstr "" #: ElementForm.cpp:488 ElementForm.cpp:2069 ElementForm.cpp:2209 -#: ElementForm.cpp:2495 TextForm.cpp:867 TextForm.cpp:898 TextForm.cpp:905 -#: TextForm.cpp:912 TextForm.cpp:920 TextForm.cpp:928 +#: ElementForm.cpp:2495 IOControlForm.cpp:28 TextForm.cpp:867 TextForm.cpp:898 +#: TextForm.cpp:905 TextForm.cpp:912 TextForm.cpp:920 TextForm.cpp:928 msgid "Reactive power" msgstr "" @@ -652,10 +844,6 @@ msgstr "" msgid "Remove" msgstr "" -#: ElementForm.cpp:2329 SwitchingForm.cpp:6 SwitchingForm.cpp:15 -msgid "Type" -msgstr "" - #: ElementForm.cpp:2332 SwitchingForm.cpp:7 SwitchingForm.cpp:16 msgid "Time (s)" msgstr "" @@ -664,10 +852,6 @@ msgstr "" msgid "Add" msgstr "" -#: ElementForm.cpp:2348 -msgid "Up" -msgstr "" - #: ElementForm.cpp:2352 msgid "Down" msgstr "" @@ -708,6 +892,106 @@ msgstr "" msgid "Preview:" msgstr "" +#: ElementForm.cpp:2813 +msgid "Numerator parameters" +msgstr "" + +#: ElementForm.cpp:2825 +msgid "Denominator parameters" +msgstr "" + +#: ElementForm.cpp:2914 +msgid "Signs" +msgstr "" + +#: ElementForm.cpp:3003 ElementForm.cpp:3104 +msgid "Upper limit" +msgstr "" + +#: ElementForm.cpp:3015 ElementForm.cpp:3116 +msgid "Lower limit" +msgstr "" + +#: ElementForm.cpp:3205 +msgid "y = A.eB.x" +msgstr "" + +#: ElementForm.cpp:3209 +msgid "A value" +msgstr "" + +#: ElementForm.cpp:3221 +msgid "B value" +msgstr "" + +#: ElementForm.cpp:3310 +msgid "Constant value" +msgstr "" + +#: ElementForm.cpp:3399 +msgid "Gain value" +msgstr "" + +#: ElementForm.cpp:3488 +msgid "Input" +msgstr "" + +#: ElementForm.cpp:3498 +msgid "Output" +msgstr "" + +#: ElementForm.h:143 +msgid "Bus" +msgstr "" + +#: ElementForm.h:242 SyncGenerator.cpp:52 +msgid "Generator" +msgstr "" + +#: ElementForm.h:369 +msgid "Generator: Stability" +msgstr "" + +#: ElementForm.h:448 +msgid "Line" +msgstr "" + +#: ElementForm.h:547 +msgid "Transformer" +msgstr "" + +#: ElementForm.h:592 +msgid "Load" +msgstr "" + +#: ElementForm.h:627 +msgid "Reactive shunt element" +msgstr "" + +#: ElementForm.h:709 +msgid "Motor" +msgstr "" + +#: ElementForm.h:770 Text.h:87 +msgid "Text" +msgstr "" + +#: ElementForm.h:800 +msgid "Transfer function" +msgstr "Função transferência" + +#: ElementForm.h:1002 +msgid "Input / Output" +msgstr "" + +#: ExponentialForm.cpp:37 +msgid "Value entered incorrectly in the field \"A value\"." +msgstr "" + +#: ExponentialForm.cpp:40 +msgid "Value entered incorrectly in the field \"B value\"." +msgstr "" + #: Fault.cpp:16 msgid "There is no buses in the system." msgstr "" @@ -728,6 +1012,10 @@ msgstr "" msgid "There is no fault in the system." msgstr "" +#: GainForm.cpp:22 +msgid "Value entered incorrectly in the field \"Gain value\"." +msgstr "" + #: GeneratorStabForm.cpp:54 msgid "Synchronous generator: Switching" msgstr "" @@ -810,6 +1098,46 @@ msgid "" "constant\"." msgstr "" +#: IOControl.cpp:142 +msgid "Vt" +msgstr "" + +#: IOControl.cpp:150 +msgid "Pe" +msgstr "" + +#: IOControl.cpp:154 +msgid "Qe" +msgstr "" + +#: IOControl.cpp:158 +msgid "Vf" +msgstr "" + +#: IOControl.cpp:162 +msgid "Pm" +msgstr "" + +#: IOControlForm.cpp:13 +#, fuzzy +#| msgid "Reset voltages" +msgid "Terminal voltage" +msgstr "Reiniciar tensões" + +#: IOControlForm.cpp:18 +msgid "Velocity" +msgstr "" + +#: IOControlForm.cpp:33 +#, fuzzy +#| msgid "Reset voltages" +msgid "Field voltage" +msgstr "Reiniciar tensões" + +#: IOControlForm.cpp:38 +msgid "Mechanical power" +msgstr "" + #: IndMotor.cpp:27 msgid "Edit induction motor" msgstr "" @@ -851,31 +1179,39 @@ msgstr "" msgid "Inductor" msgstr "" -#: Line.cpp:147 Line.cpp:408 +#: LimiterForm.cpp:25 RateLimiterForm.cpp:20 +msgid "Value entered incorrectly in the field \"Upper limit\"." +msgstr "" + +#: LimiterForm.cpp:28 RateLimiterForm.cpp:23 +msgid "Value entered incorrectly in the field \"Lower limit\"." +msgstr "" + +#: Line.cpp:147 Line.cpp:373 msgid "" "Unable to connect two buses with different nominal voltages.\n" "Use a transformer or edit the bus properties." msgstr "" -#: Line.cpp:307 +#: Line.cpp:272 msgid "Edit line" msgstr "" -#: Line.cpp:309 +#: Line.cpp:274 msgid "Insert node" msgstr "" -#: Line.cpp:313 +#: Line.cpp:278 msgid "Remove node" msgstr "" -#: Line.cpp:529 Line.cpp:533 Transformer.cpp:433 Transformer.cpp:437 +#: Line.cpp:494 Line.cpp:498 Transformer.cpp:433 Transformer.cpp:437 msgid "" "\n" "P" msgstr "" -#: Line.cpp:531 Line.cpp:535 Transformer.cpp:435 Transformer.cpp:439 +#: Line.cpp:496 Line.cpp:500 Transformer.cpp:435 Transformer.cpp:439 msgid "" "\n" "Q" @@ -1010,99 +1346,91 @@ msgstr "" msgid "Open project" msgstr "" -#: MainFrame.cpp:231 -msgid "It was not possible to open the selected file." -msgstr "" - #: MainFrame.cpp:265 MainFrame.cpp:286 msgid "Save PSP file" msgstr "" -#: MainFrame.cpp:314 Workspace.cpp:720 +#: MainFrame.cpp:314 Workspace.cpp:672 #, c-format msgid "Bus %d" msgstr "Barra %d" -#: MainFrame.cpp:317 Workspace.cpp:724 +#: MainFrame.cpp:317 Workspace.cpp:676 msgid "Insert Bus: Click to insert, ESC to cancel." msgstr "" -#: MainFrame.cpp:321 Workspace.cpp:737 +#: MainFrame.cpp:321 Workspace.cpp:689 #, c-format msgid "Line %d" msgstr "" -#: MainFrame.cpp:324 Workspace.cpp:741 +#: MainFrame.cpp:324 Workspace.cpp:693 msgid "Insert Line: Click on two buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:329 Workspace.cpp:755 +#: MainFrame.cpp:329 Workspace.cpp:707 #, c-format msgid "Transformer %d" msgstr "" -#: MainFrame.cpp:332 Workspace.cpp:759 +#: MainFrame.cpp:332 Workspace.cpp:711 msgid "Insert Transformer: Click on two buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:337 Workspace.cpp:767 +#: MainFrame.cpp:337 Workspace.cpp:719 #, c-format msgid "Generator %d" msgstr "Gerador %d" -#: MainFrame.cpp:340 Workspace.cpp:771 +#: MainFrame.cpp:340 Workspace.cpp:723 msgid "Insert Generator: Click on a buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:344 Workspace.cpp:731 +#: MainFrame.cpp:344 Workspace.cpp:683 #, c-format msgid "Load %d" msgstr "" -#: MainFrame.cpp:347 Workspace.cpp:735 +#: MainFrame.cpp:347 Workspace.cpp:687 msgid "Insert Load: Click on a buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:352 Workspace.cpp:812 +#: MainFrame.cpp:352 Workspace.cpp:764 #, c-format msgid "Capacitor %d" msgstr "" -#: MainFrame.cpp:355 Workspace.cpp:816 +#: MainFrame.cpp:355 Workspace.cpp:768 msgid "Insert Capacitor: Click on a buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:360 Workspace.cpp:779 +#: MainFrame.cpp:360 Workspace.cpp:731 #, c-format msgid "Inductor %d" msgstr "" -#: MainFrame.cpp:363 Workspace.cpp:783 +#: MainFrame.cpp:363 Workspace.cpp:735 msgid "Insert Inductor: Click on a buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:368 Workspace.cpp:787 +#: MainFrame.cpp:368 Workspace.cpp:739 #, c-format msgid "Induction motor %d" msgstr "" -#: MainFrame.cpp:371 Workspace.cpp:791 +#: MainFrame.cpp:371 Workspace.cpp:743 msgid "Insert Induction Motor: Click on a buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:376 Workspace.cpp:800 +#: MainFrame.cpp:376 Workspace.cpp:752 #, c-format msgid "Synchronous condenser %d" msgstr "" -#: MainFrame.cpp:379 Workspace.cpp:804 +#: MainFrame.cpp:379 Workspace.cpp:756 msgid "Insert Synchronous Condenser: Click on a buses, ESC to cancel." msgstr "" -#: MainFrameBase.cpp:72 MainFrameBase.cpp:73 -msgid "File" -msgstr "Arquivo" - #: MainFrameBase.cpp:76 MainFrameBase.cpp:77 MainFrameBase.cpp:80 msgid "Projects" msgstr "Projetos" @@ -1128,10 +1456,6 @@ msgid "Opens a dialog to set the main settings of the program" msgstr "" #: MainFrameBase.cpp:88 -msgid "Exit" -msgstr "Sair" - -#: MainFrameBase.cpp:88 msgid "Closes the application" msgstr "Fecha a aplicação" @@ -1232,10 +1556,6 @@ msgid "Removes all selected elements" msgstr "Remove todos os elementos selecionados" #: MainFrameBase.cpp:146 -msgid "Fit" -msgstr "Encaixar" - -#: 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 " @@ -1369,6 +1689,10 @@ msgstr "" msgid "Opens a dialog to set the settings of the simulations" msgstr "" +#: MainFrameBase.h:141 +msgid "PSP-UFU" +msgstr "PSP-UFU" + #: PowerFlow.cpp:24 msgid "No buses found on the system." msgstr "" @@ -1393,12 +1717,16 @@ msgstr "" msgid "Inductor: Switching" msgstr "" -#: SyncGenerator.cpp:44 -msgid "Edit Generator" +#: SumForm.cpp:41 +msgid "You must assign at least two signals." msgstr "" -#: SyncGenerator.cpp:52 ElementForm.h:242 -msgid "Generator" +#: SumForm.cpp:56 +msgid "Value entered incorrectly in the field \"Signs\"." +msgstr "" + +#: SyncGenerator.cpp:44 +msgid "Edit Generator" msgstr "" #: SyncMachineForm.cpp:344 SyncMachineForm.cpp:478 @@ -1541,6 +1869,14 @@ msgstr "" msgid "There are blank fields." msgstr "" +#: TransferFunctionForm.cpp:55 +msgid "Value entered incorrectly in the field \"Numerator parameters\"." +msgstr "" + +#: TransferFunctionForm.cpp:68 +msgid "Value entered incorrectly in the field \"Denominator parameters\"." +msgstr "" + #: Transformer.cpp:256 msgid "Edit tranformer" msgstr "" @@ -1586,90 +1922,47 @@ msgstr "" msgid "Value entered incorrectly in the field \"Secondary ground reactance\"." msgstr "" -#: Workspace.cpp:307 +#: Workspace.cpp:269 msgid "Do you want to change the rated voltage of the path?" msgstr "" -#: Workspace.cpp:308 +#: Workspace.cpp:270 msgid "Warning" msgstr "" -#: Workspace.cpp:703 +#: Workspace.cpp:655 msgid "Insert Text: Click to insert, ESC to cancel." msgstr "" -#: Workspace.cpp:843 +#: Workspace.cpp:795 msgid "MODE: DRAG" msgstr "" -#: Workspace.cpp:848 +#: Workspace.cpp:800 msgid "MODE: PASTE" msgstr "" -#: Workspace.cpp:855 +#: Workspace.cpp:807 msgid "MODE: INSERT" msgstr "" -#: Workspace.cpp:864 +#: Workspace.cpp:816 msgid "MODE: EDIT" msgstr "" -#: Workspace.cpp:868 +#: Workspace.cpp:820 #, c-format msgid "ZOOM: %d%%" msgstr "" -#: Workspace.cpp:1201 Workspace.cpp:1309 +#: Workspace.cpp:1153 Workspace.cpp:1261 msgid "It was not possible to paste from clipboard." msgstr "" -#: Workspace.cpp:1317 +#: Workspace.cpp:1269 msgid "Click to paste." msgstr "" -#: ControlEditorBase.h:59 -msgid "Control editor" -msgstr "" - -#: ElementForm.h:143 -msgid "Bus" -msgstr "" - -#: ElementForm.h:369 -msgid "Generator: Stability" -msgstr "" - -#: ElementForm.h:448 -msgid "Line" -msgstr "" - -#: ElementForm.h:547 -msgid "Transformer" -msgstr "" - -#: ElementForm.h:592 -msgid "Load" -msgstr "" - -#: ElementForm.h:627 -msgid "Reactive shunt element" -msgstr "" - -#: ElementForm.h:709 -msgid "Motor" -msgstr "" - -#: ElementForm.h:770 Text.h:87 -msgid "Text" -msgstr "" - -#: MainFrameBase.h:141 -msgid "PSP-UFU" -msgstr "PSP-UFU" - -#~ msgid "Transfer function" -#~ msgstr "Função transferência" - #~ msgid "Export Import" #~ msgstr "Exportar Importar" @@ -1691,9 +1984,6 @@ msgstr "PSP-UFU" #~ msgid "Disable solution" #~ msgstr "Desabilitar solução" -#~ msgid "Reset voltages" -#~ msgstr "Reiniciar tensões" - #~ msgid "Handling" #~ msgstr "Manipulação" |