diff options
83 files changed, 1478 insertions, 1500 deletions
diff --git a/.codelite/.tern-port b/.codelite/.tern-port index be1c15f..81d2a53 100644 --- a/.codelite/.tern-port +++ b/.codelite/.tern-port @@ -1 +1 @@ -63064
\ No newline at end of file +59984
\ No newline at end of file diff --git a/.codelite/PSP.session b/.codelite/PSP.session index 3f9437f..279244d 100644 --- a/.codelite/PSP.session +++ b/.codelite/PSP.session @@ -5,36 +5,78 @@ <TabInfoArray Name="TabInfoArray"> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.cpp" Name="FileName"/> - <int Value="356" Name="FirstVisibleLine"/> - <int Value="373" Name="CurrentLine"/> + <int Value="945" Name="FirstVisibleLine"/> + <int Value="969" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.h" Name="FileName"/> - <int Value="105" Name="FirstVisibleLine"/> - <int Value="123" Name="CurrentLine"/> + <int Value="0" Name="FirstVisibleLine"/> + <int Value="17" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.cpp" Name="FileName"/> - <int Value="189" Name="FirstVisibleLine"/> - <int Value="220" Name="CurrentLine"/> + <int Value="211" Name="FirstVisibleLine"/> + <int Value="231" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> - <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.h" Name="FileName"/> - <int Value="0" Name="FirstVisibleLine"/> - <int Value="5" Name="CurrentLine"/> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Element.cpp" Name="FileName"/> + <int Value="444" Name="FirstVisibleLine"/> + <int Value="466" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Element.h" Name="FileName"/> - <int Value="120" Name="FirstVisibleLine"/> - <int Value="137" Name="CurrentLine"/> + <int Value="131" Name="FirstVisibleLine"/> + <int Value="148" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Line.cpp" Name="FileName"/> + <int Value="230" Name="FirstVisibleLine"/> + <int Value="0" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.cpp" Name="FileName"/> + <int Value="42" Name="FirstVisibleLine"/> + <int Value="42" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.h" Name="FileName"/> + <int Value="0" Name="FirstVisibleLine"/> + <int Value="86" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\ElementDataObject.cpp" Name="FileName"/> + <int Value="3" Name="FirstVisibleLine"/> + <int Value="0" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Shunt.cpp" Name="FileName"/> + <int Value="40" Name="FirstVisibleLine"/> + <int Value="60" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Machines.cpp" Name="FileName"/> + <int Value="125" Name="FirstVisibleLine"/> + <int Value="144" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> diff --git a/.codelite/PSP.tags b/.codelite/PSP.tags Binary files differindex e0f5734..3596f78 100644 --- a/.codelite/PSP.tags +++ b/.codelite/PSP.tags diff --git a/.codelite/compilation.db b/.codelite/compilation.db Binary files differindex 2ae1465..60e4a9e 100644 --- a/.codelite/compilation.db +++ b/.codelite/compilation.db diff --git a/.codelite/refactoring.db b/.codelite/refactoring.db Binary files differindex 2263d68..5cc2b87 100644 --- a/.codelite/refactoring.db +++ b/.codelite/refactoring.db diff --git a/.gitignore.txt b/.gitignore.txt new file mode 100644 index 0000000..f5241e6 --- /dev/null +++ b/.gitignore.txt @@ -0,0 +1,4 @@ +.clang/ +.codelite/ +Project/Release/ +Project/Debug/
\ No newline at end of file diff --git a/Buglist.txt b/Buglist.txt index 154f739..10c7413 100644 --- a/Buglist.txt +++ b/Buglist.txt @@ -1,9 +1,14 @@ BUG/TODO LIST [pt-br] PRIORIDADE 1: --> Elemento texto impactando bastante no desempenho gráfico (otimizar o algoritmo atual ou encontrar outra solução para desenhar textos no OpenGL (freetype-gl)?); +-> Texto exibido incorretamente ao abrir um projeto. +-> Remover barras com múltiplos elementos conectados não funcionando corretamente (manuseio dos childs errado); +-> Ajuste de parent/child ao colar elementos não está sendo feito corretamente; PRIORIDADE 2: +-> Ao arrastar os elementos que estão sendo colados são colocados; +-> Os elementos de ramo não estão sendo associados corretamente com seus parents ao copiar/colar; +-> Ctrl + retângulo de seleção não está mantendo os elementos já selecionados; -> Atualizar a posição dos disjuntores quando um circuito for colado; -> Abrir formulário pelo menu de contexto; -> Abrir o formulário do elemento após inserir o mesmo; diff --git a/Project/Element.cpp b/Project/Element.cpp index 85280d6..f0812d1 100644 --- a/Project/Element.cpp +++ b/Project/Element.cpp @@ -300,15 +300,15 @@ void Element::SetOnline(bool online) void Element::GeneralMenuItens(wxMenu& menu) { wxMenuItem* clockItem = new wxMenuItem(&menu, ID_ROTATE_CLOCK, _("Rotate clockwise")); - clockItem->SetBitmap(wxImage("data\\images\\menu\\rotateClock16.png")); + clockItem->SetBitmap(wxImage("..\\data\\images\\menu\\rotateClock16.png")); menu.Append(clockItem); wxMenuItem* counterClockItem = new wxMenuItem(&menu, ID_ROTATE_COUNTERCLOCK, _("Rotate counter-clockwise")); - counterClockItem->SetBitmap(wxImage("data\\images\\menu\\rotateCounterClock16.png")); + counterClockItem->SetBitmap(wxImage("..\\data\\images\\menu\\rotateCounterClock16.png")); menu.Append(counterClockItem); wxMenuItem* deleteItem = new wxMenuItem(&menu, ID_DELETE, _("Delete")); - deleteItem->SetBitmap(wxImage("data\\images\\menu\\delete16.png")); + deleteItem->SetBitmap(wxImage("..\\data\\images\\menu\\delete16.png")); menu.Append(deleteItem); } @@ -462,7 +462,10 @@ void Element::RemoveChild(Element* child) { for(auto it = m_childList.begin(); it != m_childList.end(); ++it) { Element* element = *it; - if(element == child) m_childList.erase(it--); + if(element == child){ + m_childList.erase(it); + break; + } } } diff --git a/Project/FileHanding.cpp b/Project/FileHanding.cpp index 33d66cc..6a8b8e0 100644 --- a/Project/FileHanding.cpp +++ b/Project/FileHanding.cpp @@ -1687,7 +1687,6 @@ bool FileHanding::OpenProject(wxFileName path) m_workspace->SetElementList(elementList); m_workspace->SetTextList(textList); - m_workspace->UpdateTextElements(); return true; } diff --git a/Project/Line.cpp b/Project/Line.cpp index 32f4aa8..d9b8f22 100644 --- a/Project/Line.cpp +++ b/Project/Line.cpp @@ -306,11 +306,17 @@ bool Line::GetContextMenu(wxMenu& menu) { menu.Append(ID_EDIT_LINE, _("Edit line")); if(m_activePickboxID == ID_PB_NONE) { - menu.Append(ID_LINE_ADD_NODE, _("Insert node")); + wxMenuItem* addNodeItem = new wxMenuItem(&menu, ID_LINE_ADD_NODE, _("Insert node")); + addNodeItem->SetBitmap(wxImage("..\\data\\images\\menu\\addNode16.png")); + menu.Append(addNodeItem); } else { - menu.Append(ID_LINE_REMOVE_NODE, _("Remove node")); + wxMenuItem* addNodeItem = new wxMenuItem(&menu, ID_LINE_REMOVE_NODE, _("Remove node")); + addNodeItem->SetBitmap(wxImage("..\\data\\images\\menu\\removeNode16.png")); + menu.Append(addNodeItem); } - menu.Append(ID_DELETE, _("Delete")); + wxMenuItem* deleteItem = new wxMenuItem(&menu, ID_DELETE, _("Delete")); + deleteItem->SetBitmap(wxImage("..\\data\\images\\menu\\delete16.png")); + menu.Append(deleteItem); return true; } diff --git a/Project/Machines.cpp b/Project/Machines.cpp index 6377f08..cde5933 100644 --- a/Project/Machines.cpp +++ b/Project/Machines.cpp @@ -142,7 +142,9 @@ void Machines::RotateNode(Element* parent, bool clockwise) void Machines::RemoveParent(Element* parent) { if(parent == m_parentList[0]) { + m_parentList[0]->RemoveChild(this); m_parentList[0] = NULL; + m_online = false; UpdateSwitchesPosition(); UpdatePowerFlowArrowsPosition(); } diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 78b4fcd..918194b 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -214,7 +214,7 @@ void MainFrame::OnOpenClick(wxRibbonButtonBarEvent& event) m_ribbonButtonBarContinuous->ToggleButton(ID_RIBBON_ENABLESOL, false); m_auiNotebook->AddPage(newWorkspace, newWorkspace->GetName(), true); - newWorkspace->Layout(); + m_auiNotebook->Layout(); newWorkspace->Redraw(); m_projectNumber++; } else { diff --git a/Project/PSP-UFU.lnk b/Project/PSP-UFU.lnk Binary files differnew file mode 100644 index 0000000..2dd14da --- /dev/null +++ b/Project/PSP-UFU.lnk diff --git a/Project/Project.mk b/Project/Project.mk index 7db3855..45cc3f8 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=Thales -Date :=02/01/2017 +Date :=03/01/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC @@ -27,7 +27,7 @@ OutputSwitch :=-o LibraryPathSwitch :=-L PreprocessorSwitch :=-D SourceSwitch :=-c -OutputFile :=$(IntermediateDirectory)/PSP-UFU +OutputFile :=$(IntermediateDirectory)/pspufu Preprocessors :=$(PreprocessorSwitch)NDEBUG $(PreprocessorSwitch)UNICODE ObjectSwitch :=-o ArchiveOutputSwitch := diff --git a/Project/Project.project b/Project/Project.project index 06bb41e..2647a0f 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -185,7 +185,7 @@ </Compiler> <Linker Options="$(shell wx-config --libs gl);-mwindows" Required="yes"/> <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/> - <General OutputFile="$(IntermediateDirectory)/PSP-UFU" IntermediateDirectory="./Release" Command="./PSP-UFU" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> + <General OutputFile="$(IntermediateDirectory)/pspufu" IntermediateDirectory="./Release" Command="./pspufu" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> <BuildSystem Name="Default"/> <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> <![CDATA[]]> diff --git a/Project/Release/Element.cpp.o b/Project/Release/Element.cpp.o Binary files differindex 432ace6..7394a74 100644 --- a/Project/Release/Element.cpp.o +++ b/Project/Release/Element.cpp.o diff --git a/Project/Release/FileHanding.cpp.o b/Project/Release/FileHanding.cpp.o Binary files differindex e1c3dde..c4b880f 100644 --- a/Project/Release/FileHanding.cpp.o +++ b/Project/Release/FileHanding.cpp.o diff --git a/Project/Release/FileHanding.cpp.o.d b/Project/Release/FileHanding.cpp.o.d index ba0c881..717c0a3 100644 --- a/Project/Release/FileHanding.cpp.o.d +++ b/Project/Release/FileHanding.cpp.o.d @@ -144,7 +144,10 @@ Release/FileHanding.cpp.o: FileHanding.cpp FileHanding.h \ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h \ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h \ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h \ - C:/wxWidgets-3.1.0/include/wx/msw/clipbrd.h WorkspaceBase.h \ + C:/wxWidgets-3.1.0/include/wx/msw/clipbrd.h \ + C:/wxWidgets-3.1.0/include/wx/tipwin.h \ + C:/wxWidgets-3.1.0/include/wx/popupwin.h \ + C:/wxWidgets-3.1.0/include/wx/msw/popupwin.h WorkspaceBase.h \ C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \ C:/wxWidgets-3.1.0/include/wx/filesys.h \ C:/wxWidgets-3.1.0/include/wx/filename.h \ @@ -167,6 +170,9 @@ Release/FileHanding.cpp.o: FileHanding.cpp FileHanding.h \ C:/wxWidgets-3.1.0/include/wx/generic/logg.h \ C:/wxWidgets-3.1.0/include/wx/msw/app.h \ C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h \ + C:/wxWidgets-3.1.0/include/wx/timer.h \ + C:/wxWidgets-3.1.0/include/wx/stopwatch.h \ + C:/wxWidgets-3.1.0/include/wx/time.h \ C:/wxWidgets-3.1.0/include/wx/persist.h \ C:/wxWidgets-3.1.0/include/wx/confbase.h \ C:/wxWidgets-3.1.0/include/wx/base64.h \ @@ -213,7 +219,6 @@ Release/FileHanding.cpp.o: FileHanding.cpp FileHanding.h \ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \ C:/wxWidgets-3.1.0/include/wx/recguard.h \ - C:/wxWidgets-3.1.0/include/wx/time.h \ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \ C:/wxWidgets-3.1.0/include/wx/hashset.h \ @@ -248,8 +253,6 @@ Release/FileHanding.cpp.o: FileHanding.cpp FileHanding.h \ Branch.h Load.h LoadForm.h SyncGenerator.h SyncMotor.h Transformer.h \ Text.h wxGLString.h C:/wxWidgets-3.1.0/include/wx/wx.h \ C:/wxWidgets-3.1.0/include/wx/hash.h \ - C:/wxWidgets-3.1.0/include/wx/stopwatch.h \ - C:/wxWidgets-3.1.0/include/wx/timer.h \ C:/wxWidgets-3.1.0/include/wx/module.h \ C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h \ C:/wxWidgets-3.1.0/include/wx/frame.h \ @@ -587,6 +590,12 @@ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h: C:/wxWidgets-3.1.0/include/wx/msw/clipbrd.h: +C:/wxWidgets-3.1.0/include/wx/tipwin.h: + +C:/wxWidgets-3.1.0/include/wx/popupwin.h: + +C:/wxWidgets-3.1.0/include/wx/msw/popupwin.h: + WorkspaceBase.h: C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h: @@ -633,6 +642,12 @@ C:/wxWidgets-3.1.0/include/wx/msw/app.h: C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h: +C:/wxWidgets-3.1.0/include/wx/timer.h: + +C:/wxWidgets-3.1.0/include/wx/stopwatch.h: + +C:/wxWidgets-3.1.0/include/wx/time.h: + C:/wxWidgets-3.1.0/include/wx/persist.h: C:/wxWidgets-3.1.0/include/wx/confbase.h: @@ -731,8 +746,6 @@ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h: C:/wxWidgets-3.1.0/include/wx/recguard.h: -C:/wxWidgets-3.1.0/include/wx/time.h: - C:/wxWidgets-3.1.0/include/wx/propgrid/property.h: C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h: @@ -831,10 +844,6 @@ C:/wxWidgets-3.1.0/include/wx/wx.h: C:/wxWidgets-3.1.0/include/wx/hash.h: -C:/wxWidgets-3.1.0/include/wx/stopwatch.h: - -C:/wxWidgets-3.1.0/include/wx/timer.h: - C:/wxWidgets-3.1.0/include/wx/module.h: C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h: diff --git a/Project/Release/Line.cpp.o b/Project/Release/Line.cpp.o Binary files differindex 6011e10..06defa2 100644 --- a/Project/Release/Line.cpp.o +++ b/Project/Release/Line.cpp.o diff --git a/Project/Release/Machines.cpp.o b/Project/Release/Machines.cpp.o Binary files differindex 98cf0de..fad35fe 100644 --- a/Project/Release/Machines.cpp.o +++ b/Project/Release/Machines.cpp.o diff --git a/Project/Release/MainFrame.cpp.o b/Project/Release/MainFrame.cpp.o Binary files differindex c8e7d49..a04ef24 100644 --- a/Project/Release/MainFrame.cpp.o +++ b/Project/Release/MainFrame.cpp.o diff --git a/Project/Release/MainFrame.cpp.o.d b/Project/Release/MainFrame.cpp.o.d index 5b1e3df..06259ba 100644 --- a/Project/Release/MainFrame.cpp.o.d +++ b/Project/Release/MainFrame.cpp.o.d @@ -202,7 +202,10 @@ Release/MainFrame.cpp.o: MainFrame.cpp MainFrame.h \ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h \ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h \ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h \ - C:/wxWidgets-3.1.0/include/wx/msw/clipbrd.h WorkspaceBase.h \ + C:/wxWidgets-3.1.0/include/wx/msw/clipbrd.h \ + C:/wxWidgets-3.1.0/include/wx/tipwin.h \ + C:/wxWidgets-3.1.0/include/wx/popupwin.h \ + C:/wxWidgets-3.1.0/include/wx/msw/popupwin.h WorkspaceBase.h \ C:/wxWidgets-3.1.0/include/wx/glcanvas.h \ C:/wxWidgets-3.1.0/include/wx/app.h \ C:/wxWidgets-3.1.0/include/wx/eventfilter.h \ @@ -717,6 +720,12 @@ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h: C:/wxWidgets-3.1.0/include/wx/msw/clipbrd.h: +C:/wxWidgets-3.1.0/include/wx/tipwin.h: + +C:/wxWidgets-3.1.0/include/wx/popupwin.h: + +C:/wxWidgets-3.1.0/include/wx/msw/popupwin.h: + WorkspaceBase.h: C:/wxWidgets-3.1.0/include/wx/glcanvas.h: diff --git a/Project/Release/PSP-UFU.exe b/Project/Release/PSP-UFU.exe Binary files differdeleted file mode 100644 index 4259c0bb..0000000 --- a/Project/Release/PSP-UFU.exe +++ /dev/null diff --git a/Project/Release/Shunt.cpp.o b/Project/Release/Shunt.cpp.o Binary files differindex c15cc27..fd8e959 100644 --- a/Project/Release/Shunt.cpp.o +++ b/Project/Release/Shunt.cpp.o diff --git a/Project/Release/Shunt.cpp.o.d b/Project/Release/Shunt.cpp.o.d index 688707b..e818e3d 100644 --- a/Project/Release/Shunt.cpp.o.d +++ b/Project/Release/Shunt.cpp.o.d @@ -132,7 +132,100 @@ Release/Shunt.cpp.o: Shunt.cpp Shunt.h Element.h \ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \ C:/wxWidgets-3.1.0/include/wx/log.h \ - C:/wxWidgets-3.1.0/include/wx/generic/logg.h + C:/wxWidgets-3.1.0/include/wx/generic/logg.h Bus.h BusForm.h \ + ElementForm.h C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \ + C:/wxWidgets-3.1.0/include/wx/filesys.h \ + C:/wxWidgets-3.1.0/include/wx/filename.h \ + C:/wxWidgets-3.1.0/include/wx/file.h \ + C:/wxWidgets-3.1.0/include/wx/convauto.h \ + C:/wxWidgets-3.1.0/include/wx/artprov.h \ + C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \ + C:/wxWidgets-3.1.0/include/wx/imaglist.h \ + C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \ + C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \ + C:/wxWidgets-3.1.0/include/wx/sizer.h \ + C:/wxWidgets-3.1.0/include/wx/notebook.h \ + C:/wxWidgets-3.1.0/include/wx/bookctrl.h \ + C:/wxWidgets-3.1.0/include/wx/control.h \ + C:/wxWidgets-3.1.0/include/wx/msw/control.h \ + C:/wxWidgets-3.1.0/include/wx/withimages.h \ + C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \ + C:/wxWidgets-3.1.0/include/wx/stattext.h \ + C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \ + C:/wxWidgets-3.1.0/include/wx/textctrl.h \ + C:/wxWidgets-3.1.0/include/wx/textentry.h \ + C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \ + C:/wxWidgets-3.1.0/include/wx/ioswrap.h \ + C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \ + C:/wxWidgets-3.1.0/include/wx/choice.h \ + C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \ + C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \ + C:/wxWidgets-3.1.0/include/wx/msw/choice.h \ + C:/wxWidgets-3.1.0/include/wx/checkbox.h \ + C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \ + C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \ + C:/wxWidgets-3.1.0/include/wx/button.h \ + C:/wxWidgets-3.1.0/include/wx/anybutton.h \ + C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \ + C:/wxWidgets-3.1.0/include/wx/msw/button.h \ + C:/wxWidgets-3.1.0/include/wx/statbox.h \ + C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \ + C:/wxWidgets-3.1.0/include/wx/statline.h \ + C:/wxWidgets-3.1.0/include/wx/msw/statline.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \ + C:/wxWidgets-3.1.0/include/wx/dcclient.h \ + C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \ + C:/wxWidgets-3.1.0/include/wx/msw/brush.h \ + C:/wxWidgets-3.1.0/include/wx/pen.h \ + C:/wxWidgets-3.1.0/include/wx/msw/pen.h \ + C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \ + C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \ + C:/wxWidgets-3.1.0/include/wx/scrolwin.h \ + C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \ + C:/wxWidgets-3.1.0/include/wx/recguard.h \ + C:/wxWidgets-3.1.0/include/wx/tooltip.h \ + C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \ + C:/wxWidgets-3.1.0/include/wx/time.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \ + C:/wxWidgets-3.1.0/include/wx/hashset.h \ + C:/wxWidgets-3.1.0/include/wx/tokenzr.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \ + C:/wxWidgets-3.1.0/include/wx/listbox.h \ + C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \ + C:/wxWidgets-3.1.0/include/wx/valtext.h \ + C:/wxWidgets-3.1.0/include/wx/toolbar.h \ + C:/wxWidgets-3.1.0/include/wx/tbarbase.h \ + C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \ + C:/wxWidgets-3.1.0/include/wx/headerctrl.h \ + C:/wxWidgets-3.1.0/include/wx/headercol.h \ + C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \ + C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \ + C:/wxWidgets-3.1.0/include/wx/spinbutt.h \ + C:/wxWidgets-3.1.0/include/wx/range.h \ + C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \ + C:/wxWidgets-3.1.0/include/wx/listctrl.h \ + C:/wxWidgets-3.1.0/include/wx/listbase.h \ + C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \ + C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \ + C:/wxWidgets-3.1.0/include/wx/persist.h \ + C:/wxWidgets-3.1.0/include/wx/confbase.h \ + C:/wxWidgets-3.1.0/include/wx/base64.h \ + C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \ + C:/wxWidgets-3.1.0/include/wx/persist/window.h \ + C:/wxWidgets-3.1.0/include/wx/display.h \ + C:/wxWidgets-3.1.0/include/wx/vidmode.h \ + C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \ + C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \ + C:/wxWidgets-3.1.0/include/wx/treebook.h \ + C:/wxWidgets-3.1.0/include/wx/treectrl.h \ + C:/wxWidgets-3.1.0/include/wx/treebase.h \ + C:/wxWidgets-3.1.0/include/wx/itemid.h \ + C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Shunt.h: @@ -407,3 +500,197 @@ C:/wxWidgets-3.1.0/include/wx/msw/menu.h: C:/wxWidgets-3.1.0/include/wx/log.h: C:/wxWidgets-3.1.0/include/wx/generic/logg.h: + +Bus.h: + +BusForm.h: + +ElementForm.h: + +C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h: + +C:/wxWidgets-3.1.0/include/wx/filesys.h: + +C:/wxWidgets-3.1.0/include/wx/filename.h: + +C:/wxWidgets-3.1.0/include/wx/file.h: + +C:/wxWidgets-3.1.0/include/wx/convauto.h: + +C:/wxWidgets-3.1.0/include/wx/artprov.h: + +C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h: + +C:/wxWidgets-3.1.0/include/wx/imaglist.h: + +C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h: + +C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h: + +C:/wxWidgets-3.1.0/include/wx/sizer.h: + +C:/wxWidgets-3.1.0/include/wx/notebook.h: + +C:/wxWidgets-3.1.0/include/wx/bookctrl.h: + +C:/wxWidgets-3.1.0/include/wx/control.h: + +C:/wxWidgets-3.1.0/include/wx/msw/control.h: + +C:/wxWidgets-3.1.0/include/wx/withimages.h: + +C:/wxWidgets-3.1.0/include/wx/msw/notebook.h: + +C:/wxWidgets-3.1.0/include/wx/stattext.h: + +C:/wxWidgets-3.1.0/include/wx/msw/stattext.h: + +C:/wxWidgets-3.1.0/include/wx/textctrl.h: + +C:/wxWidgets-3.1.0/include/wx/textentry.h: + +C:/wxWidgets-3.1.0/include/wx/msw/textentry.h: + +C:/wxWidgets-3.1.0/include/wx/ioswrap.h: + +C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h: + +C:/wxWidgets-3.1.0/include/wx/choice.h: + +C:/wxWidgets-3.1.0/include/wx/ctrlsub.h: + +C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h: + +C:/wxWidgets-3.1.0/include/wx/msw/choice.h: + +C:/wxWidgets-3.1.0/include/wx/checkbox.h: + +C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h: + +C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h: + +C:/wxWidgets-3.1.0/include/wx/button.h: + +C:/wxWidgets-3.1.0/include/wx/anybutton.h: + +C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h: + +C:/wxWidgets-3.1.0/include/wx/msw/button.h: + +C:/wxWidgets-3.1.0/include/wx/statbox.h: + +C:/wxWidgets-3.1.0/include/wx/msw/statbox.h: + +C:/wxWidgets-3.1.0/include/wx/statline.h: + +C:/wxWidgets-3.1.0/include/wx/msw/statline.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h: + +C:/wxWidgets-3.1.0/include/wx/dcclient.h: + +C:/wxWidgets-3.1.0/include/wx/dc.h: + +C:/wxWidgets-3.1.0/include/wx/brush.h: + +C:/wxWidgets-3.1.0/include/wx/msw/brush.h: + +C:/wxWidgets-3.1.0/include/wx/pen.h: + +C:/wxWidgets-3.1.0/include/wx/msw/pen.h: + +C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h: + +C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h: + +C:/wxWidgets-3.1.0/include/wx/scrolwin.h: + +C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h: + +C:/wxWidgets-3.1.0/include/wx/recguard.h: + +C:/wxWidgets-3.1.0/include/wx/tooltip.h: + +C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h: + +C:/wxWidgets-3.1.0/include/wx/time.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/property.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h: + +C:/wxWidgets-3.1.0/include/wx/hashset.h: + +C:/wxWidgets-3.1.0/include/wx/tokenzr.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/props.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h: + +C:/wxWidgets-3.1.0/include/wx/listbox.h: + +C:/wxWidgets-3.1.0/include/wx/msw/listbox.h: + +C:/wxWidgets-3.1.0/include/wx/valtext.h: + +C:/wxWidgets-3.1.0/include/wx/toolbar.h: + +C:/wxWidgets-3.1.0/include/wx/tbarbase.h: + +C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h: + +C:/wxWidgets-3.1.0/include/wx/headerctrl.h: + +C:/wxWidgets-3.1.0/include/wx/headercol.h: + +C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h: + +C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h: + +C:/wxWidgets-3.1.0/include/wx/spinbutt.h: + +C:/wxWidgets-3.1.0/include/wx/range.h: + +C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h: + +C:/wxWidgets-3.1.0/include/wx/listctrl.h: + +C:/wxWidgets-3.1.0/include/wx/listbase.h: + +C:/wxWidgets-3.1.0/include/wx/systhemectrl.h: + +C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h: + +C:/wxWidgets-3.1.0/include/wx/persist.h: + +C:/wxWidgets-3.1.0/include/wx/confbase.h: + +C:/wxWidgets-3.1.0/include/wx/base64.h: + +C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h: + +C:/wxWidgets-3.1.0/include/wx/persist/window.h: + +C:/wxWidgets-3.1.0/include/wx/display.h: + +C:/wxWidgets-3.1.0/include/wx/vidmode.h: + +C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h: + +C:/wxWidgets-3.1.0/include/wx/persist/treebook.h: + +C:/wxWidgets-3.1.0/include/wx/treebook.h: + +C:/wxWidgets-3.1.0/include/wx/treectrl.h: + +C:/wxWidgets-3.1.0/include/wx/treebase.h: + +C:/wxWidgets-3.1.0/include/wx/itemid.h: + +C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h: diff --git a/Project/Release/Text.cpp.o b/Project/Release/Text.cpp.o Binary files differindex c2bfb7d..195caf5 100644 --- a/Project/Release/Text.cpp.o +++ b/Project/Release/Text.cpp.o diff --git a/Project/Release/TextForm.cpp.o b/Project/Release/TextForm.cpp.o Binary files differindex 5343efd..0886267 100644 --- a/Project/Release/TextForm.cpp.o +++ b/Project/Release/TextForm.cpp.o diff --git a/Project/Release/Workspace.cpp.o b/Project/Release/Workspace.cpp.o Binary files differindex 16e19dd..1af631c 100644 --- a/Project/Release/Workspace.cpp.o +++ b/Project/Release/Workspace.cpp.o diff --git a/Project/Release/data/images/cClock.png b/Project/Release/data/images/cClock.png Binary files differdeleted file mode 100644 index 543bdf4..0000000 --- a/Project/Release/data/images/cClock.png +++ /dev/null diff --git a/Project/Release/data/images/clock.png b/Project/Release/data/images/clock.png Binary files differdeleted file mode 100644 index c09148c..0000000 --- a/Project/Release/data/images/clock.png +++ /dev/null diff --git a/Project/Release/data/images/logo128.png b/Project/Release/data/images/logo128.png Binary files differdeleted file mode 100644 index d57d79a..0000000 --- a/Project/Release/data/images/logo128.png +++ /dev/null diff --git a/Project/Release/data/images/logo16.png b/Project/Release/data/images/logo16.png Binary files differdeleted file mode 100644 index 4813a4d..0000000 --- a/Project/Release/data/images/logo16.png +++ /dev/null diff --git a/Project/Release/data/images/logo256.png b/Project/Release/data/images/logo256.png Binary files differdeleted file mode 100644 index 06e5771..0000000 --- a/Project/Release/data/images/logo256.png +++ /dev/null diff --git a/Project/Release/data/images/logo32.png b/Project/Release/data/images/logo32.png Binary files differdeleted file mode 100644 index eb1d07b..0000000 --- a/Project/Release/data/images/logo32.png +++ /dev/null diff --git a/Project/Release/data/images/logo64.png b/Project/Release/data/images/logo64.png Binary files differdeleted file mode 100644 index 69df8be..0000000 --- a/Project/Release/data/images/logo64.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/about32.png b/Project/Release/data/images/ribbon/about32.png Binary files differdeleted file mode 100644 index d8c770a..0000000 --- a/Project/Release/data/images/ribbon/about32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/add32.png b/Project/Release/data/images/ribbon/add32.png Binary files differdeleted file mode 100644 index a4f5240..0000000 --- a/Project/Release/data/images/ribbon/add32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/chart32.png b/Project/Release/data/images/ribbon/chart32.png Binary files differdeleted file mode 100644 index 4d90a37..0000000 --- a/Project/Release/data/images/ribbon/chart32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/close32.png b/Project/Release/data/images/ribbon/close32.png Binary files differdeleted file mode 100644 index 42b4684..0000000 --- a/Project/Release/data/images/ribbon/close32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/copy32.png b/Project/Release/data/images/ribbon/copy32.png Binary files differdeleted file mode 100644 index c2bb802..0000000 --- a/Project/Release/data/images/ribbon/copy32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/dataReport32.png b/Project/Release/data/images/ribbon/dataReport32.png Binary files differdeleted file mode 100644 index a485fab..0000000 --- a/Project/Release/data/images/ribbon/dataReport32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/delete32.png b/Project/Release/data/images/ribbon/delete32.png Binary files differdeleted file mode 100644 index 79ee2c3..0000000 --- a/Project/Release/data/images/ribbon/delete32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/drag32.png b/Project/Release/data/images/ribbon/drag32.png Binary files differdeleted file mode 100644 index fb3240f..0000000 --- a/Project/Release/data/images/ribbon/drag32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/exit32.png b/Project/Release/data/images/ribbon/exit32.png Binary files differdeleted file mode 100644 index 96166f1..0000000 --- a/Project/Release/data/images/ribbon/exit32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/fault32.png b/Project/Release/data/images/ribbon/fault32.png Binary files differdeleted file mode 100644 index c1c83a6..0000000 --- a/Project/Release/data/images/ribbon/fault32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/faultPower32.png b/Project/Release/data/images/ribbon/faultPower32.png Binary files differdeleted file mode 100644 index c3e0a32..0000000 --- a/Project/Release/data/images/ribbon/faultPower32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/fit32.png b/Project/Release/data/images/ribbon/fit32.png Binary files differdeleted file mode 100644 index 226a6c1..0000000 --- a/Project/Release/data/images/ribbon/fit32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/guide32.png b/Project/Release/data/images/ribbon/guide32.png Binary files differdeleted file mode 100644 index 60fcdad..0000000 --- a/Project/Release/data/images/ribbon/guide32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/impExp32.png b/Project/Release/data/images/ribbon/impExp32.png Binary files differdeleted file mode 100644 index 2616944..0000000 --- a/Project/Release/data/images/ribbon/impExp32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/move32.png b/Project/Release/data/images/ribbon/move32.png Binary files differdeleted file mode 100644 index 9321abb..0000000 --- a/Project/Release/data/images/ribbon/move32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/new32.png b/Project/Release/data/images/ribbon/new32.png Binary files differdeleted file mode 100644 index 8c64261..0000000 --- a/Project/Release/data/images/ribbon/new32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/open32.png b/Project/Release/data/images/ribbon/open32.png Binary files differdeleted file mode 100644 index 299d753..0000000 --- a/Project/Release/data/images/ribbon/open32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/paste32.png b/Project/Release/data/images/ribbon/paste32.png Binary files differdeleted file mode 100644 index 8827be8..0000000 --- a/Project/Release/data/images/ribbon/paste32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/pauseRunning32.png b/Project/Release/data/images/ribbon/pauseRunning32.png Binary files differdeleted file mode 100644 index 1e2c47b..0000000 --- a/Project/Release/data/images/ribbon/pauseRunning32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/pauseStopped32.png b/Project/Release/data/images/ribbon/pauseStopped32.png Binary files differdeleted file mode 100644 index 698bf73..0000000 --- a/Project/Release/data/images/ribbon/pauseStopped32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/playRunning32.png b/Project/Release/data/images/ribbon/playRunning32.png Binary files differdeleted file mode 100644 index 469a111..0000000 --- a/Project/Release/data/images/ribbon/playRunning32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/playStopped32.png b/Project/Release/data/images/ribbon/playStopped32.png Binary files differdeleted file mode 100644 index 379a71f..0000000 --- a/Project/Release/data/images/ribbon/playStopped32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/powerFLow32.png b/Project/Release/data/images/ribbon/powerFLow32.png Binary files differdeleted file mode 100644 index f29605f..0000000 --- a/Project/Release/data/images/ribbon/powerFLow32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/redo32.png b/Project/Release/data/images/ribbon/redo32.png Binary files differdeleted file mode 100644 index 24c5cce..0000000 --- a/Project/Release/data/images/ribbon/redo32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/reset32.png b/Project/Release/data/images/ribbon/reset32.png Binary files differdeleted file mode 100644 index d9c5248..0000000 --- a/Project/Release/data/images/ribbon/reset32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/rotateClock32.png b/Project/Release/data/images/ribbon/rotateClock32.png Binary files differdeleted file mode 100644 index 9873e13..0000000 --- a/Project/Release/data/images/ribbon/rotateClock32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/rotateCounterClock32.png b/Project/Release/data/images/ribbon/rotateCounterClock32.png Binary files differdeleted file mode 100644 index 3658f93..0000000 --- a/Project/Release/data/images/ribbon/rotateCounterClock32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/save32.png b/Project/Release/data/images/ribbon/save32.png Binary files differdeleted file mode 100644 index 7938666..0000000 --- a/Project/Release/data/images/ribbon/save32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/saveAs32.png b/Project/Release/data/images/ribbon/saveAs32.png Binary files differdeleted file mode 100644 index e6cc7aa..0000000 --- a/Project/Release/data/images/ribbon/saveAs32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/settings32.png b/Project/Release/data/images/ribbon/settings32.png Binary files differdeleted file mode 100644 index f2068fa..0000000 --- a/Project/Release/data/images/ribbon/settings32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/snap32.png b/Project/Release/data/images/ribbon/snap32.png Binary files differdeleted file mode 100644 index f58dc2a..0000000 --- a/Project/Release/data/images/ribbon/snap32.png +++ /dev/null diff --git a/Project/Release/data/images/ribbon/undo32.png b/Project/Release/data/images/ribbon/undo32.png Binary files differdeleted file mode 100644 index 025916c..0000000 --- a/Project/Release/data/images/ribbon/undo32.png +++ /dev/null diff --git a/Project/Release/data/lang/pt_BR/pt_BR.mo b/Project/Release/data/lang/pt_BR/pt_BR.mo Binary files differdeleted file mode 100644 index 87e0859..0000000 --- a/Project/Release/data/lang/pt_BR/pt_BR.mo +++ /dev/null diff --git a/Project/Release/data/lang/pt_BR/pt_BR.po b/Project/Release/data/lang/pt_BR/pt_BR.po deleted file mode 100644 index 5b2ef4c..0000000 --- a/Project/Release/data/lang/pt_BR/pt_BR.po +++ /dev/null @@ -1,1025 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PSP-UFU pt_BR 0.0.1\n" -"POT-Creation-Date: 2016-09-23 17:03-0300\n" -"PO-Revision-Date: 2016-09-23 17:11-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.8\n" -"X-Poedit-Basepath: ../../../..\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Poedit-KeywordsList: _\n" -"X-Poedit-SearchPath-0: .\n" - -#: Bus.cpp:173 -msgid "Edit bus" -msgstr "" - -#: BusForm.cpp:92 -msgid "Value entered incorrectly in the field \"Nominal voltage\"." -msgstr "" - -#: BusForm.cpp:98 -msgid "Value entered incorrectly in the field \"Controlled voltage\"." -msgstr "" - -#: BusForm.cpp:149 -msgid "Value entered incorrectly in the field \"Fault resistance\"." -msgstr "" - -#: BusForm.cpp:153 -msgid "Value entered incorrectly in the field \"Fault reactance\"." -msgstr "" - -#: BusForm.cpp:160 -msgid "Value entered incorrectly in the field \"Time\"." -msgstr "" - -#: BusForm.cpp:164 -msgid "Value entered incorrectly in the field \"Fault lenght\"." -msgstr "" - -#: BusForm.cpp:168 -msgid "" -"Value entered incorrectly in the field \"Fault resistence (stability)\"." -msgstr "" - -#: BusForm.cpp:172 -msgid "Value entered incorrectly in the field \"Fault reactance (stability)\"." -msgstr "" - -#: BusForm.cpp:233 -msgid "Lines AB" -msgstr "" - -#: BusForm.cpp:234 -msgid "Lines BC" -msgstr "" - -#: BusForm.cpp:235 -msgid "Lines CA" -msgstr "" - -#: BusForm.cpp:241 -msgid "Line A" -msgstr "" - -#: BusForm.cpp:242 -msgid "Line B" -msgstr "" - -#: BusForm.cpp:243 -msgid "Line C" -msgstr "" - -#: BusForm.cpp:253 -msgid "V" -msgstr "" - -#: BusForm.cpp:258 -msgid "kV" -msgstr "" - -#: Capacitor.cpp:105 -msgid "Edit Capacitor" -msgstr "" - -#: Element.cpp:298 MainFrameBase.cpp:150 -msgid "Rotate clockwise" -msgstr "" - -#: Element.cpp:302 -msgid "Rotate counter-clockwise" -msgstr "" - -#: Element.cpp:306 Line.cpp:270 MainFrameBase.cpp:146 -msgid "Delete" -msgstr "Excluir" - -#: Element.cpp:345 Element.cpp:359 -msgid "Error" -msgstr "" - -#: ElementForm.cpp:35 ElementForm.cpp:404 -msgid "General" -msgstr "" - -#: ElementForm.cpp:40 ElementForm.cpp:409 -msgid "Name" -msgstr "Nome" - -#: ElementForm.cpp:60 -msgid "Nominal voltage" -msgstr "" - -#: ElementForm.cpp:87 -msgid "Controlled voltage" -msgstr "" - -#: ElementForm.cpp:111 -msgid "Slack Bus" -msgstr "" - -#: ElementForm.cpp:117 ElementForm.cpp:579 MainFrameBase.cpp:194 -msgid "Fault" -msgstr "Falta" - -#: ElementForm.cpp:122 ElementForm.cpp:223 -msgid "Insert fault in the bus" -msgstr "" - -#: ElementForm.cpp:135 -msgid "Fault type" -msgstr "" - -#: ElementForm.cpp:153 -msgid "Fault place" -msgstr "" - -#: ElementForm.cpp:170 ElementForm.cpp:282 -msgid "Fault resistance (R)" -msgstr "" - -#: ElementForm.cpp:185 ElementForm.cpp:208 ElementForm.cpp:297 -#: ElementForm.cpp:320 ElementForm.cpp:852 ElementForm.cpp:909 -#: ElementForm.cpp:932 ElementForm.cpp:955 ElementForm.cpp:986 -#: ElementForm.cpp:1009 ElementForm.cpp:1040 ElementForm.cpp:1063 -#: ElementForm.cpp:1140 ElementForm.cpp:1163 -msgid "p.u." -msgstr "" - -#: ElementForm.cpp:193 ElementForm.cpp:305 -msgid "Fault reactance (Xl)" -msgstr "" - -#: ElementForm.cpp:213 ElementForm.cpp:725 -msgid "Stability" -msgstr "Estabilidade" - -#: ElementForm.cpp:218 -msgid "Plot bus data" -msgstr "" - -#: ElementForm.cpp:236 -msgid "Time" -msgstr "" - -#: ElementForm.cpp:251 ElementForm.cpp:274 ElementForm.cpp:829 -#: ElementForm.cpp:1086 ElementForm.cpp:1109 ElementForm.cpp:1186 -#: ElementForm.cpp:1209 -msgid "s" -msgstr "" - -#: ElementForm.cpp:259 -msgid "Fault length" -msgstr "" - -#: ElementForm.cpp:328 ElementForm.cpp:731 ElementForm.cpp:1235 -msgid "OK" -msgstr "" - -#: ElementForm.cpp:332 ElementForm.cpp:735 ElementForm.cpp:1239 -msgid "Cancel" -msgstr "" - -#: ElementForm.cpp:429 -msgid "Nominal power" -msgstr "" - -#: ElementForm.cpp:459 -msgid "Active power" -msgstr "" - -#: ElementForm.cpp:488 -msgid "Reactive power" -msgstr "" - -#: ElementForm.cpp:517 -msgid "Max reactive power" -msgstr "" - -#: ElementForm.cpp:547 -msgid "Min reactive power" -msgstr "" - -#: ElementForm.cpp:573 -msgid "Use machine nominal power as base" -msgstr "" - -#: ElementForm.cpp:584 -msgid "Sequence impedances (p.u.)" -msgstr "Impedâncias de sequência (p.u.)" - -#: ElementForm.cpp:596 -msgid "Positive resistance (R1)" -msgstr "Resistência positiva (R1)" - -#: ElementForm.cpp:611 -msgid "Positive reactance (X1)" -msgstr "Reatância positiva (X1)" - -#: ElementForm.cpp:626 -msgid "Negative resistance (R2)" -msgstr "Resistência negativa (R2)" - -#: ElementForm.cpp:641 -msgid "Negative reactance (X2)" -msgstr "Reatância negativa (X2)" - -#: ElementForm.cpp:656 -msgid "Zero resistance (R0)" -msgstr "Resistência zero (R0)" - -#: ElementForm.cpp:671 -msgid "Zero reactance (X0)" -msgstr "Reatância zero (X0)" - -#: ElementForm.cpp:690 -msgid "Ground resistance (p.u.)" -msgstr "Resistência de aterramento (p.u.)" - -#: ElementForm.cpp:705 -msgid "Ground reactance (p.u.)" -msgstr "Reatância de aterramento (p.u.)" - -#: ElementForm.cpp:716 -msgid "Grounded neutral" -msgstr "Neutro aterrado" - -#: ElementForm.cpp:801 -msgid "Plot synchronous machine data" -msgstr "" - -#: ElementForm.cpp:814 -msgid "Inertia (H)" -msgstr "" - -#: ElementForm.cpp:837 -msgid "Damping factor" -msgstr "" - -#: ElementForm.cpp:860 -msgid "Use AVR" -msgstr "" - -#: ElementForm.cpp:865 -msgid "Edit AVR" -msgstr "" - -#: ElementForm.cpp:873 -msgid "Use speed governor" -msgstr "" - -#: ElementForm.cpp:878 -msgid "Edit speed governor" -msgstr "" - -#: ElementForm.cpp:894 -msgid "Armature resistance (Ra)" -msgstr "" - -#: ElementForm.cpp:917 -msgid "Potier reactance (Xp)" -msgstr "" - -#: ElementForm.cpp:940 -msgid "Saturation factor" -msgstr "" - -#: ElementForm.cpp:959 -msgid "Syncronous" -msgstr "" - -#: ElementForm.cpp:971 -msgid "Direct-axis reactance (Xd)" -msgstr "" - -#: ElementForm.cpp:994 -msgid "Quadrature-axis reactance (Xq)" -msgstr "" - -#: ElementForm.cpp:1013 -msgid "Transitory" -msgstr "" - -#: ElementForm.cpp:1025 -msgid "Direct-axis reactance (X'd)" -msgstr "" - -#: ElementForm.cpp:1048 -msgid "Quadrature-axis reactance (X'q)" -msgstr "" - -#: ElementForm.cpp:1071 -msgid "Direct-axis time constant (T'd0)" -msgstr "" - -#: ElementForm.cpp:1094 -msgid "Quadrature-axis time constant (T'q0)" -msgstr "" - -#: ElementForm.cpp:1113 -msgid "Subtransitory" -msgstr "" - -#: ElementForm.cpp:1125 -msgid "Direct-axis reactance (X''d)" -msgstr "" - -#: ElementForm.cpp:1148 -msgid "Quadrature-axis reactance (X''q)" -msgstr "" - -#: ElementForm.cpp:1171 -msgid "Direct-axis time constant (T''d0)" -msgstr "" - -#: ElementForm.cpp:1194 -msgid "Quadrature-axis time constant (T''q0)" -msgstr "" - -#: ElementForm.cpp:1229 -msgid "Switching" -msgstr "" - -#: GeneratorForm.cpp:177 -msgid "Value entered incorrectly in the field \"Nominal power\"." -msgstr "" - -#: GeneratorForm.cpp:193 -msgid "Value entered incorrectly in the field \"Active power\"." -msgstr "" - -#: GeneratorForm.cpp:212 -msgid "Value entered incorrectly in the field \"Reactive power\"." -msgstr "" - -#: GeneratorForm.cpp:233 -msgid "Value entered incorrectly in the field \"Max reactive power\"." -msgstr "" - -#: GeneratorForm.cpp:255 -msgid "Value entered incorrectly in the field \"Min reactive power\"." -msgstr "" - -#: GeneratorForm.cpp:277 -msgid "Value entered incorrectly in the field \"Positive resistance\"." -msgstr "" - -#: GeneratorForm.cpp:281 -msgid "Value entered incorrectly in the field \"Positive reactance\"." -msgstr "" - -#: GeneratorForm.cpp:285 -msgid "Value entered incorrectly in the field \"Negative resistance\"." -msgstr "" - -#: GeneratorForm.cpp:289 -msgid "Value entered incorrectly in the field \"Negative reactance\"." -msgstr "" - -#: GeneratorForm.cpp:293 -msgid "Value entered incorrectly in the field \"Zero resistance\"." -msgstr "" - -#: GeneratorForm.cpp:297 -msgid "Value entered incorrectly in the field \"Zero reactance\"." -msgstr "" - -#: GeneratorForm.cpp:301 -msgid "Value entered incorrectly in the field \"Ground resistance\"." -msgstr "" - -#: GeneratorForm.cpp:305 -msgid "Value entered incorrectly in the field \"Ground reactance\"." -msgstr "" - -#: GeneratorStabForm.cpp:57 -msgid "Value entered incorrectly in the field \"Inertia\"." -msgstr "" - -#: GeneratorStabForm.cpp:61 -msgid "Value entered incorrectly in the field \"Damping factor\"." -msgstr "" - -#: GeneratorStabForm.cpp:68 -msgid "Value entered incorrectly in the field \"Armature resistance\"." -msgstr "" - -#: GeneratorStabForm.cpp:72 -msgid "Value entered incorrectly in the field \"Potier reactance\"." -msgstr "" - -#: GeneratorStabForm.cpp:76 -msgid "Value entered incorrectly in the field \"Saturation factor\"." -msgstr "" - -#: GeneratorStabForm.cpp:81 -msgid "" -"Value entered incorrectly in the field \"Synchronous direct-axis reactance\"." -msgstr "" - -#: GeneratorStabForm.cpp:86 -msgid "" -"Value entered incorrectly in the field \"Synchronous quadrature-axis " -"reactance\"." -msgstr "" - -#: GeneratorStabForm.cpp:91 -msgid "" -"Value entered incorrectly in the field \"Transitory direct-axis reactance\"." -msgstr "" - -#: GeneratorStabForm.cpp:96 -msgid "" -"Value entered incorrectly in the field \"Transitory quadrature-axis reactance" -"\"." -msgstr "" - -#: GeneratorStabForm.cpp:101 -msgid "" -"Value entered incorrectly in the field \"Transitory direct-axis time constant" -"\"." -msgstr "" - -#: GeneratorStabForm.cpp:106 -msgid "" -"Value entered incorrectly in the field \"Transitory quadrature-axis time " -"constant\"." -msgstr "" - -#: GeneratorStabForm.cpp:111 -msgid "" -"Value entered incorrectly in the field \"Subtransitory direct-axis reactance" -"\"." -msgstr "" - -#: GeneratorStabForm.cpp:116 -msgid "" -"Value entered incorrectly in the field \"Subtransitory quadrature-axis " -"reactance\"." -msgstr "" - -#: GeneratorStabForm.cpp:121 -msgid "" -"Value entered incorrectly in the field \"Subtransitory direct-axis time " -"constant\"." -msgstr "" - -#: GeneratorStabForm.cpp:126 -msgid "" -"Value entered incorrectly in the field \"Subtransitory quadrature-axis time " -"constant\"." -msgstr "" - -#: IndMotor.cpp:24 -msgid "Edit induction motor" -msgstr "" - -#: Inductor.cpp:97 -msgid "Edit Inductor" -msgstr "" - -#: Line.cpp:262 -msgid "Edit line" -msgstr "" - -#: Line.cpp:264 -msgid "Insert node" -msgstr "" - -#: Line.cpp:268 -msgid "Remove node" -msgstr "" - -#: Load.cpp:103 -msgid "Edit Load" -msgstr "" - -#: MainFrame.cpp:80 -msgid "&Bus\tB" -msgstr "&Barramento\tB" - -#: MainFrame.cpp:80 -msgid "Adds a bus at the circuit" -msgstr "Adiciona um barramento no circuito" - -#: MainFrame.cpp:83 -msgid "&Line\tL" -msgstr "&Linha\tL" - -#: MainFrame.cpp:83 -msgid "Adds a power line at the circuit" -msgstr "Adiciona uma linha no circuito" - -#: MainFrame.cpp:84 -msgid "&Transformer\tT" -msgstr "&Transformador\tT" - -#: MainFrame.cpp:85 -msgid "Adds a transformer at the circuit" -msgstr "Adiciona um transformador no circuito" - -#: MainFrame.cpp:86 -msgid "&Generator\tG" -msgstr "&Gerador\tG" - -#: MainFrame.cpp:87 -msgid "Adds a generator at the circuit" -msgstr "Adiciona um gerador no circuito" - -#: MainFrame.cpp:88 -msgid "&Induction motor\tI" -msgstr "&Motor de indução\tI" - -#: MainFrame.cpp:89 MainFrame.cpp:92 -msgid "Adds an induction motor at the circuit" -msgstr "Adiciona um motor de indução no circuito" - -#: MainFrame.cpp:91 -msgid "&Synchronous compensator \tK" -msgstr "&Compensador síncrono \tK" - -#: MainFrame.cpp:94 -msgid "&Load\tShift-L" -msgstr "&Carga\tShift-L" - -#: MainFrame.cpp:94 -msgid "Adds a load at the circuit" -msgstr "Adiciona uma carga no circuito" - -#: MainFrame.cpp:95 -msgid "&Capacitor\tShift-C" -msgstr "&Capacitor\tShift-C" - -#: MainFrame.cpp:96 -msgid "Adds a shunt capacitor at the circuit" -msgstr "Adiciona um capacitor shunt no circuito" - -#: MainFrame.cpp:97 -msgid "&Inductor\tShift-I" -msgstr "&Inductor\tShift-I" - -#: MainFrame.cpp:98 -msgid "Adds a shunt inductor at the circuit" -msgstr "Adiciona um indutor shunt no circuito" - -#: MainFrame.cpp:119 -#, c-format -msgid "New project %d" -msgstr "" - -#: MainFrame.cpp:223 MainFrame.cpp:249 Workspace.cpp:583 -#, c-format -msgid "Bus %d" -msgstr "Barra %d" - -#: MainFrame.cpp:226 Workspace.cpp:587 -msgid "Insert Bus: Click to insert, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:234 Workspace.cpp:608 -msgid "Insert Line: Click on two buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:242 Workspace.cpp:621 -msgid "Insert Transformer: Click on two buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:252 Workspace.cpp:634 -msgid "Insert Generator: Click on a buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:260 Workspace.cpp:600 -msgid "Insert Load: Click on a buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:268 Workspace.cpp:681 -msgid "Insert Capacitor: Click on a buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:276 Workspace.cpp:647 -msgid "Insert Inductor: Click on a buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:284 Workspace.cpp:655 -msgid "Insert Induction Motor: Click on a buses, ESC to cancel." -msgstr "" - -#: MainFrame.cpp:292 Workspace.cpp:668 -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" - -#: MainFrameBase.cpp:82 -msgid "New" -msgstr "Novo" - -#: MainFrameBase.cpp:82 -msgid "Create new project" -msgstr "Criar novo projeto" - -#: MainFrameBase.cpp:84 -msgid "Open" -msgstr "Abrir" - -#: MainFrameBase.cpp:84 -msgid "Open saved project" -msgstr "Abrir projetos salvos" - -#: MainFrameBase.cpp:86 -msgid "Export Import" -msgstr "Exportar Importar" - -#: MainFrameBase.cpp:86 -msgid "Export or import projects" -msgstr "Exporta ou importa projetos" - -#: MainFrameBase.cpp:88 -msgid "General Settings" -msgstr "" - -#: MainFrameBase.cpp:88 -msgid "Opens a dialog to set the main settings of the program" -msgstr "" - -#: MainFrameBase.cpp:90 -msgid "Exit" -msgstr "Sair" - -#: 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 "" - -#: 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 -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 "Copy" -msgstr "Copiar" - -#: MainFrameBase.cpp:125 -msgid "Copies the selected elements" -msgstr "Copia os elementos selecionados" - -#: MainFrameBase.cpp:127 -msgid "Paste" -msgstr "Colar" - -#: MainFrameBase.cpp:127 -msgid "Pastes the elements from clipboard" -msgstr "Cola os elementos da área de transferência" - -#: MainFrameBase.cpp:129 -msgid "Undo" -msgstr "Desfazer" - -#: MainFrameBase.cpp:129 -msgid "Undoes the last action" -msgstr "Desfaz a última ação" - -#: MainFrameBase.cpp:131 -msgid "Redo" -msgstr "Refazer" - -#: 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 "" - -#: MainFrameBase.cpp:140 -msgid "Add a new element in the project" -msgstr "Adicionar um elemento novo no projeto" - -#: MainFrameBase.cpp:142 -msgid "Drag" -msgstr "Arrastar" - -#: MainFrameBase.cpp:142 -msgid "Drag all the elements" -msgstr "Arrasta todos os elementos" - -#: MainFrameBase.cpp:144 -msgid "Move" -msgstr "Mover" - -#: 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 "Fit" -msgstr "Encaixar" - -#: 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 "" - -#: MainFrameBase.cpp:152 -msgid "Rotate Counter-clockwise" -msgstr "" - -#: MainFrameBase.cpp:152 -msgid "Rotate the selected elements counter-clockwise" -msgstr "" - -#: MainFrameBase.cpp:154 -msgid "Project Settings" -msgstr "" - -#: 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 "" - -#: 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 "" - -#: MainFrameBase.cpp:172 MainFrameBase.cpp:173 -msgid "Continuous" -msgstr "" - -#: MainFrameBase.cpp:177 -msgid "Enable Solution" -msgstr "" - -#: 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 "" - -#: 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 "" - -#: 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 "" - -#: MainFrameBase.cpp:190 -msgid "Power Flow" -msgstr "" - -#: MainFrameBase.cpp:190 -msgid "Calculate the circuit power flow" -msgstr "Calcula o fluxo de carga do circuito" - -#: MainFrameBase.cpp:192 -msgid "Run Stability" -msgstr "" - -#: 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 "" - -#: 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 "" - -#: MainFrameBase.cpp:198 -msgid "Opens a dialog to set the settings of the simulations" -msgstr "" - -#: SyncGenerator.cpp:41 -msgid "Edit Generator" -msgstr "" - -#: SyncMotor.cpp:18 -msgid "Edit Synchronous Condenser" -msgstr "" - -#: Transformer.cpp:224 -msgid "Edit tranformer" -msgstr "" - -#: Workspace.cpp:630 -#, c-format -msgid "Generator %d" -msgstr "Gerador %d" - -#: Workspace.cpp:702 -msgid "MODE: DRAG" -msgstr "" - -#: Workspace.cpp:709 -msgid "MODE: INSERT" -msgstr "" - -#: Workspace.cpp:720 -msgid "MODE: EDIT" -msgstr "" - -#: Workspace.cpp:725 -#, c-format -msgid "ZOOM: %d%%" -msgstr "" - -#: ElementForm.h:139 -msgid "Bus" -msgstr "" - -#: ElementForm.h:238 -msgid "Generator" -msgstr "" - -#: ElementForm.h:365 -msgid "Generator: Stability" -msgstr "" - -#: MainFrameBase.h:143 -msgid "PSP-UFU" -msgstr "PSP-UFU" - -#~ msgid "Project settings" -#~ msgstr "Opções do projeto" - -#~ msgid "Save as..." -#~ msgstr "Salvar como..." - -#~ msgid "Add element" -#~ msgstr "Adicionar elemento" - -#~ msgid "Enable solution" -#~ msgstr "Habilitar solução" - -#~ msgid "Disable solution" -#~ msgstr "Desabilitar solução" - -#~ msgid "Reset voltages" -#~ msgstr "Reiniciar tensões" - -#~ msgid "Handling" -#~ msgstr "Manipulação" - -#~ msgid "Calculations" -#~ msgstr "Cálculos" - -#~ msgid "Power flow" -#~ msgstr "Fluxo de carga" - -#~ msgid "Short-circuit power" -#~ msgstr "Nível de curto-circuito" - -#~ msgid "Data report" -#~ msgstr "Relatório de dados" - -#~ msgid "Settings" -#~ msgstr "Opções" - -#~ msgid "Opens the stability settings" -#~ msgstr "Abre as opções de estabilidade" - -#~ msgid "Run" -#~ msgstr "Executar" - -#~ msgid "Data" -#~ msgstr "Dados" - -#~ msgid "Stability data" -#~ msgstr "Dados de estabilidade" - -#~ msgid "Adds a bus to the circuit" -#~ msgstr "Insere um barramento no circuito" - -#~ msgid "Adds a power line to the circuit" -#~ msgstr "Insere uma linha no " diff --git a/Project/Release/pspufu.exe b/Project/Release/pspufu.exe Binary files differnew file mode 100644 index 0000000..ea3786f --- /dev/null +++ b/Project/Release/pspufu.exe diff --git a/Project/Shunt.cpp b/Project/Shunt.cpp index 0cd5736..cbd424e 100644 --- a/Project/Shunt.cpp +++ b/Project/Shunt.cpp @@ -57,6 +57,7 @@ void Shunt::StartMove(wxPoint2DDouble position) void Shunt::RemoveParent(Element* parent) { if(parent == m_parentList[0]) { + m_parentList[0]->RemoveChild(this); m_parentList[0] = NULL; m_online = false; UpdateSwitchesPosition(); diff --git a/Project/Text.cpp b/Project/Text.cpp index 05915f7..e3a5e7e 100644 --- a/Project/Text.cpp +++ b/Project/Text.cpp @@ -20,8 +20,8 @@ Text::Text() Text::Text(wxPoint2DDouble position) : Element() { + m_position = position; SetText(m_text); - SetPosition(position); } Text::~Text() {} @@ -51,26 +51,21 @@ void Text::Draw(wxPoint2DDouble translation, double scale) } // Draw text (layer 2) + glEnable(GL_TEXTURE_2D); glColor4d(0.0, 0.0, 0.0, 1.0); if(!m_isMultlineText) { // Only one line - wxGLString glString(m_text); - glString.setFont(wxFont(m_fontSize, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - glString.consolidate(&dc); - glString.bind(); - glString.render(m_position.m_x, m_position.m_y); + m_glString->bind(); + m_glString->render(m_position.m_x, m_position.m_y); } else { // Multiples lines - wxGLStringArray glStringArray; - // Fill the string array. - for(int i = 0; i < (int)m_multlineText.size(); i++) glStringArray.addString(m_multlineText[i]); - glStringArray.setFont(wxFont(m_fontSize, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - glStringArray.consolidate(&dc); - glStringArray.bind(); + m_glStringArray->bind(); // The text will be printed centralized. - for(int i = 0; i < (int)m_multlineText.size(); i++) { - glStringArray.get(i).render(m_position.m_x, m_position.m_y - m_height / 2.0 + - glStringArray.get(i).getheight() * double(i) + glStringArray.get(i).getheight() / 2.0); + double lineHeight = m_height / (double)m_numberOfLines; + for(int i = 0; i < m_numberOfLines; i++) { + m_glStringArray->get(i).render( + m_position.m_x, m_position.m_y - m_height / 2.0 + lineHeight / 2.0 + lineHeight * double(i)); } } + glDisable(GL_TEXTURE_2D); glPopMatrix(); } @@ -83,46 +78,56 @@ bool Text::Intersects(wxRect2DDouble rect) const void Text::SetText(wxString text) { + glEnable(GL_TEXTURE_2D); m_text = text; + wxFont font(m_fontSize, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - // Creating a glString to get the text size. - int numberOfLines = m_text.Freq('\n') + 1; - if(numberOfLines == 1) { // Only one line - m_isMultlineText = false; - wxGLString glString(m_text); - glString.setFont(wxFont(m_fontSize, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - wxScreenDC dc; - glString.consolidate(&dc); - glString.bind(); + wxScreenDC dc; + if(m_glString) { + delete m_glString; + m_glString = NULL; + } + if(m_glStringArray) { + delete m_glStringArray; + m_glStringArray = NULL; + } - m_width = glString.getWidth(); - m_height = glString.getheight(); + m_numberOfLines = m_text.Freq('\n') + 1; + if(m_numberOfLines == 1) { // Only one line + m_isMultlineText = false; + m_glString = new wxGLString(m_text); + m_glString->setFont(font); + m_glString->consolidate(&dc); + m_width = m_glString->getWidth(); + m_height = m_glString->getheight(); } else { m_isMultlineText = true; - m_multlineText.clear(); - wxString text = m_text; - double w = 0.0, h = 0.0; - for(int i = 0; i < numberOfLines; ++i) { - wxString nextLine; - wxString currentLine = text.BeforeFirst('\n', &nextLine); - text = nextLine; - m_multlineText.push_back(currentLine); + m_glStringArray = new wxGLStringArray(); + dc.SetFont(font); - wxGLString glString(currentLine); - glString.setFont(wxFont(m_fontSize, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - wxScreenDC dc; - glString.consolidate(&dc); - glString.bind(); + int w = 0, h = 0; + wxString multText = m_text; + for(int i = 0; i < m_numberOfLines; ++i) { + wxString nextLine; + wxString currentLine = multText.BeforeFirst('\n', &nextLine); + multText = nextLine; + m_glStringArray->addString(currentLine); - if(w < glString.getWidth()) w = glString.getWidth(); // Get the major width. - h = glString.getheight(); + wxSize size = dc.GetTextExtent(currentLine); + if(size.GetWidth() > w) w = size.GetWidth(); + h += size.GetHeight(); } + + m_glStringArray->setFont(font); + m_glStringArray->consolidate(&dc); + m_width = w; - m_height = h * (double)numberOfLines; + m_height = h; } // Update text rectangle. SetPosition(m_position); + glDisable(GL_TEXTURE_2D); } void Text::Rotate(bool clockwise) @@ -149,6 +154,7 @@ void Text::UpdateText(double systemPowerBase) { switch(m_elementType) { case TYPE_NONE: + SetText(m_text); break; case TYPE_BUS: { Bus* bus = (Bus*)m_element; @@ -833,8 +839,7 @@ void Text::UpdateText(double systemPowerBase) SetText(wxString::FromDouble(reativePower, m_decimalPlaces) + " p.u."); } case UNIT_VAr: { - SetText( - wxString::FromDouble(reativePower * systemPowerBase, m_decimalPlaces) + " VAr"); + SetText(wxString::FromDouble(reativePower * systemPowerBase, m_decimalPlaces) + " VAr"); } case UNIT_kVAr: { SetText(wxString::FromDouble(reativePower * systemPowerBase / 1e3, m_decimalPlaces) + @@ -872,8 +877,7 @@ void Text::UpdateText(double systemPowerBase) SetText(wxString::FromDouble(reativePower, m_decimalPlaces) + " p.u."); } case UNIT_VAr: { - SetText( - wxString::FromDouble(reativePower * systemPowerBase, m_decimalPlaces) + " VAr"); + SetText(wxString::FromDouble(reativePower * systemPowerBase, m_decimalPlaces) + " VAr"); } case UNIT_kVAr: { SetText(wxString::FromDouble(reativePower * systemPowerBase / 1e3, m_decimalPlaces) + @@ -897,7 +901,7 @@ void Text::UpdateText(double systemPowerBase) Element* Text::GetCopy() { - Text* copy = new Text(); - *copy = *this; - return copy; + Text* copy = new Text(); + *copy = *this; + return copy; } diff --git a/Project/Text.h b/Project/Text.h index 36a6704..019f765 100644 --- a/Project/Text.h +++ b/Project/Text.h @@ -46,12 +46,12 @@ enum DataType { class Text : public Element { - public: +public: Text(); Text(wxPoint2DDouble position); ~Text(); - - virtual Element* GetCopy(); + + virtual Element* GetCopy(); virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return true; }; virtual bool Contains(wxPoint2DDouble position) const; virtual void Draw(wxPoint2DDouble translation, double scale); @@ -78,10 +78,13 @@ class Text : public Element int GetFontSize() const { return m_fontSize; } const ElectricalUnit GetUnit() const { return m_unit; } int GetDecimalPlaces() const { return m_decimalPlaces; } - - protected: + +protected: + wxGLString* m_glString = NULL; + wxGLStringArray* m_glStringArray = NULL; + wxString m_text = _("Text"); - std::vector<wxString> m_multlineText; + int m_numberOfLines; bool m_isMultlineText = false; int m_fontSize = 10; @@ -94,4 +97,4 @@ class Text : public Element int m_decimalPlaces = 2; }; -#endif // TEXT_H +#endif // TEXT_H diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index 21f8669..103a9b0 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -137,7 +137,7 @@ void Workspace::SetViewport() glClearColor(1.0, 1.0, 1.0, 1.0); // White background. glClear(GL_COLOR_BUFFER_BIT); glDisable(GL_DEPTH_TEST); - glEnable(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); glEnable(GL_COLOR_MATERIAL); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -708,11 +708,18 @@ void Workspace::OnKeyDown(wxKeyEvent& event) } // Tests - Ctrl + Shift + L if(event.ControlDown() && event.ShiftDown()) { - int numBus = 0; + int numChild = 0; + int numParent = 0; for(auto it = m_elementList.begin(), itEnd = m_elementList.end(); it != itEnd; ++it) { - if(typeid(**it) == typeid(Bus)) numBus++; + Element* element = *it; + if(element->Contains(m_camera->GetMousePosition())) { + for(int i=0; i<(int)element->GetParentList().size(); i++) { + if(element->GetParentList()[i]) numParent++; + } + numChild = element->GetChildList().size(); + } } - wxMessageBox(wxString::Format("%d buses\n%d elements", numBus, m_elementList.size())); + wxMessageBox(wxString::Format("%d parents\n%d childs", numParent, numChild)); } } break; case 'T': // Insert a transformer. @@ -1097,7 +1104,7 @@ bool Workspace::RunPowerFlow() void Workspace::UpdateTextElements() { - for(auto it = m_textList.begin(); it != m_textList.end(); ++it) { + for(auto it = m_textList.begin(), itEnd = m_textList.end(); it != itEnd; ++it) { Text* text = *it; text->UpdateText(100e6); } @@ -1199,6 +1206,7 @@ bool Workspace::Paste() for(int k = 0; k < (int)pastedBusList.size(); k++) { Bus* newParent = pastedBusList[k]; if(parentID == newParent->GetID()) { + parentCopied = true; copy->ReplaceParent(currentParent, newParent); break; } @@ -1223,6 +1231,7 @@ bool Workspace::Paste() for(int j = 0; j < (int)pastedElements.size(); j++) { Element* newChild = pastedElements[j]; if(childID == newChild->GetID()) { + childCopied = true; bus->ReplaceChild(currentChild, newChild); break; } @@ -1309,3 +1318,9 @@ void Workspace::OnTimer(wxTimerEvent& event) m_timer->Stop(); } + +void Workspace::SetTextList(std::vector<Text*> textList) +{ + m_textList = textList; + UpdateTextElements(); +} diff --git a/Project/Workspace.h b/Project/Workspace.h index e900604..095feac 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -78,7 +78,7 @@ public: void SetName(wxString name) { m_name = name; } void SetElementList(std::vector<Element*> elementList) { m_elementList = elementList; } - void SetTextList(std::vector<Text*> textList) { m_textList = textList; } + void SetTextList(std::vector<Text*> textList); void SetStatusBarText(wxString text) { m_statusBar->SetStatusText(text); } void SetWorkspaceMode(WorkspaceMode mode) { m_mode = mode; } void SetSavedPath(wxFileName savedPath) { m_savedPath = savedPath; } diff --git a/Project/data/images/menu/addNode16.png b/Project/data/images/menu/addNode16.png Binary files differnew file mode 100644 index 0000000..a8a1743 --- /dev/null +++ b/Project/data/images/menu/addNode16.png diff --git a/Project/Release/data/images/menu/delete16.png b/Project/data/images/menu/delete16.png Binary files differindex 8e035b4..8e035b4 100644 --- a/Project/Release/data/images/menu/delete16.png +++ b/Project/data/images/menu/delete16.png diff --git a/Project/data/images/menu/removeNode16.png b/Project/data/images/menu/removeNode16.png Binary files differnew file mode 100644 index 0000000..944237b --- /dev/null +++ b/Project/data/images/menu/removeNode16.png diff --git a/Project/Release/data/images/menu/rotateClock16.png b/Project/data/images/menu/rotateClock16.png Binary files differindex e5965f3..e5965f3 100644 --- a/Project/Release/data/images/menu/rotateClock16.png +++ b/Project/data/images/menu/rotateClock16.png diff --git a/Project/Release/data/images/menu/rotateCounterClock16.png b/Project/data/images/menu/rotateCounterClock16.png Binary files differindex 14cac6a..14cac6a 100644 --- a/Project/Release/data/images/menu/rotateCounterClock16.png +++ b/Project/data/images/menu/rotateCounterClock16.png diff --git a/Project/data/lang/pt_BR/pt_BR.mo b/Project/data/lang/pt_BR/pt_BR.mo Binary files differindex 53d3381..87e0859 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 9f8c581..5b2ef4c 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: 2016-07-28 17:59-0300\n" -"PO-Revision-Date: 2016-07-28 18:06-0300\n" +"POT-Creation-Date: 2016-09-23 17:03-0300\n" +"PO-Revision-Date: 2016-09-23 17:11-0300\n" "Last-Translator: \n" "Language-Team: Thales Lima Oliveira <thaleslima.ufu@gmail.com>\n" "Language: pt_BR\n" @@ -10,130 +10,661 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.8\n" -"X-Poedit-Basepath: ../../..\n" +"X-Poedit-Basepath: ../../../..\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" -#: MainFrame.cpp:71 -msgid "&Bus\tB" -msgstr "&Barramento\tB" +#: Bus.cpp:173 +msgid "Edit bus" +msgstr "" -#: MainFrame.cpp:71 -msgid "Adds a bus to the circuit" +#: BusForm.cpp:92 +msgid "Value entered incorrectly in the field \"Nominal voltage\"." msgstr "" -#: MainFrame.cpp:74 -msgid "&Line\tL" -msgstr "&Linha\tL" +#: BusForm.cpp:98 +msgid "Value entered incorrectly in the field \"Controlled voltage\"." +msgstr "" -#: MainFrame.cpp:74 -msgid "Adds a power line to the circuit" +#: BusForm.cpp:149 +msgid "Value entered incorrectly in the field \"Fault resistance\"." msgstr "" -#: MainFrame.cpp:75 -msgid "&Transformer\tT" +#: BusForm.cpp:153 +msgid "Value entered incorrectly in the field \"Fault reactance\"." msgstr "" -#: MainFrame.cpp:76 -msgid "Adds a transformer to the circuit" +#: BusForm.cpp:160 +msgid "Value entered incorrectly in the field \"Time\"." msgstr "" -#: MainFrame.cpp:77 -msgid "&Generator\tG" +#: BusForm.cpp:164 +msgid "Value entered incorrectly in the field \"Fault lenght\"." msgstr "" -#: MainFrame.cpp:78 -msgid "Adds a generator to the circuit" +#: BusForm.cpp:168 +msgid "" +"Value entered incorrectly in the field \"Fault resistence (stability)\"." msgstr "" -#: MainFrame.cpp:79 -msgid "&Induction motor\tI" +#: BusForm.cpp:172 +msgid "Value entered incorrectly in the field \"Fault reactance (stability)\"." msgstr "" -#: MainFrame.cpp:80 MainFrame.cpp:83 -msgid "Adds an induction motor to the circuit" +#: BusForm.cpp:233 +msgid "Lines AB" msgstr "" -#: MainFrame.cpp:82 -msgid "&Synchronous compensator \tK" +#: BusForm.cpp:234 +msgid "Lines BC" msgstr "" -#: MainFrame.cpp:85 -msgid "&Load\tShift-L" +#: BusForm.cpp:235 +msgid "Lines CA" msgstr "" -#: MainFrame.cpp:85 -msgid "Adds a load to the circuit" +#: BusForm.cpp:241 +msgid "Line A" msgstr "" -#: MainFrame.cpp:86 -msgid "&Capacitor\tShift-C" +#: BusForm.cpp:242 +msgid "Line B" msgstr "" -#: MainFrame.cpp:87 -msgid "Adds a shunt capacitor to the circuit" +#: BusForm.cpp:243 +msgid "Line C" +msgstr "" + +#: BusForm.cpp:253 +msgid "V" +msgstr "" + +#: BusForm.cpp:258 +msgid "kV" +msgstr "" + +#: Capacitor.cpp:105 +msgid "Edit Capacitor" +msgstr "" + +#: Element.cpp:298 MainFrameBase.cpp:150 +msgid "Rotate clockwise" +msgstr "" + +#: Element.cpp:302 +msgid "Rotate counter-clockwise" +msgstr "" + +#: Element.cpp:306 Line.cpp:270 MainFrameBase.cpp:146 +msgid "Delete" +msgstr "Excluir" + +#: Element.cpp:345 Element.cpp:359 +msgid "Error" +msgstr "" + +#: ElementForm.cpp:35 ElementForm.cpp:404 +msgid "General" +msgstr "" + +#: ElementForm.cpp:40 ElementForm.cpp:409 +msgid "Name" +msgstr "Nome" + +#: ElementForm.cpp:60 +msgid "Nominal voltage" +msgstr "" + +#: ElementForm.cpp:87 +msgid "Controlled voltage" +msgstr "" + +#: ElementForm.cpp:111 +msgid "Slack Bus" +msgstr "" + +#: ElementForm.cpp:117 ElementForm.cpp:579 MainFrameBase.cpp:194 +msgid "Fault" +msgstr "Falta" + +#: ElementForm.cpp:122 ElementForm.cpp:223 +msgid "Insert fault in the bus" +msgstr "" + +#: ElementForm.cpp:135 +msgid "Fault type" +msgstr "" + +#: ElementForm.cpp:153 +msgid "Fault place" +msgstr "" + +#: ElementForm.cpp:170 ElementForm.cpp:282 +msgid "Fault resistance (R)" +msgstr "" + +#: ElementForm.cpp:185 ElementForm.cpp:208 ElementForm.cpp:297 +#: ElementForm.cpp:320 ElementForm.cpp:852 ElementForm.cpp:909 +#: ElementForm.cpp:932 ElementForm.cpp:955 ElementForm.cpp:986 +#: ElementForm.cpp:1009 ElementForm.cpp:1040 ElementForm.cpp:1063 +#: ElementForm.cpp:1140 ElementForm.cpp:1163 +msgid "p.u." +msgstr "" + +#: ElementForm.cpp:193 ElementForm.cpp:305 +msgid "Fault reactance (Xl)" +msgstr "" + +#: ElementForm.cpp:213 ElementForm.cpp:725 +msgid "Stability" +msgstr "Estabilidade" + +#: ElementForm.cpp:218 +msgid "Plot bus data" +msgstr "" + +#: ElementForm.cpp:236 +msgid "Time" +msgstr "" + +#: ElementForm.cpp:251 ElementForm.cpp:274 ElementForm.cpp:829 +#: ElementForm.cpp:1086 ElementForm.cpp:1109 ElementForm.cpp:1186 +#: ElementForm.cpp:1209 +msgid "s" +msgstr "" + +#: ElementForm.cpp:259 +msgid "Fault length" +msgstr "" + +#: ElementForm.cpp:328 ElementForm.cpp:731 ElementForm.cpp:1235 +msgid "OK" +msgstr "" + +#: ElementForm.cpp:332 ElementForm.cpp:735 ElementForm.cpp:1239 +msgid "Cancel" +msgstr "" + +#: ElementForm.cpp:429 +msgid "Nominal power" +msgstr "" + +#: ElementForm.cpp:459 +msgid "Active power" +msgstr "" + +#: ElementForm.cpp:488 +msgid "Reactive power" +msgstr "" + +#: ElementForm.cpp:517 +msgid "Max reactive power" +msgstr "" + +#: ElementForm.cpp:547 +msgid "Min reactive power" +msgstr "" + +#: ElementForm.cpp:573 +msgid "Use machine nominal power as base" +msgstr "" + +#: ElementForm.cpp:584 +msgid "Sequence impedances (p.u.)" +msgstr "Impedâncias de sequência (p.u.)" + +#: ElementForm.cpp:596 +msgid "Positive resistance (R1)" +msgstr "Resistência positiva (R1)" + +#: ElementForm.cpp:611 +msgid "Positive reactance (X1)" +msgstr "Reatância positiva (X1)" + +#: ElementForm.cpp:626 +msgid "Negative resistance (R2)" +msgstr "Resistência negativa (R2)" + +#: ElementForm.cpp:641 +msgid "Negative reactance (X2)" +msgstr "Reatância negativa (X2)" + +#: ElementForm.cpp:656 +msgid "Zero resistance (R0)" +msgstr "Resistência zero (R0)" + +#: ElementForm.cpp:671 +msgid "Zero reactance (X0)" +msgstr "Reatância zero (X0)" + +#: ElementForm.cpp:690 +msgid "Ground resistance (p.u.)" +msgstr "Resistência de aterramento (p.u.)" + +#: ElementForm.cpp:705 +msgid "Ground reactance (p.u.)" +msgstr "Reatância de aterramento (p.u.)" + +#: ElementForm.cpp:716 +msgid "Grounded neutral" +msgstr "Neutro aterrado" + +#: ElementForm.cpp:801 +msgid "Plot synchronous machine data" +msgstr "" + +#: ElementForm.cpp:814 +msgid "Inertia (H)" +msgstr "" + +#: ElementForm.cpp:837 +msgid "Damping factor" +msgstr "" + +#: ElementForm.cpp:860 +msgid "Use AVR" +msgstr "" + +#: ElementForm.cpp:865 +msgid "Edit AVR" msgstr "" +#: ElementForm.cpp:873 +msgid "Use speed governor" +msgstr "" + +#: ElementForm.cpp:878 +msgid "Edit speed governor" +msgstr "" + +#: ElementForm.cpp:894 +msgid "Armature resistance (Ra)" +msgstr "" + +#: ElementForm.cpp:917 +msgid "Potier reactance (Xp)" +msgstr "" + +#: ElementForm.cpp:940 +msgid "Saturation factor" +msgstr "" + +#: ElementForm.cpp:959 +msgid "Syncronous" +msgstr "" + +#: ElementForm.cpp:971 +msgid "Direct-axis reactance (Xd)" +msgstr "" + +#: ElementForm.cpp:994 +msgid "Quadrature-axis reactance (Xq)" +msgstr "" + +#: ElementForm.cpp:1013 +msgid "Transitory" +msgstr "" + +#: ElementForm.cpp:1025 +msgid "Direct-axis reactance (X'd)" +msgstr "" + +#: ElementForm.cpp:1048 +msgid "Quadrature-axis reactance (X'q)" +msgstr "" + +#: ElementForm.cpp:1071 +msgid "Direct-axis time constant (T'd0)" +msgstr "" + +#: ElementForm.cpp:1094 +msgid "Quadrature-axis time constant (T'q0)" +msgstr "" + +#: ElementForm.cpp:1113 +msgid "Subtransitory" +msgstr "" + +#: ElementForm.cpp:1125 +msgid "Direct-axis reactance (X''d)" +msgstr "" + +#: ElementForm.cpp:1148 +msgid "Quadrature-axis reactance (X''q)" +msgstr "" + +#: ElementForm.cpp:1171 +msgid "Direct-axis time constant (T''d0)" +msgstr "" + +#: ElementForm.cpp:1194 +msgid "Quadrature-axis time constant (T''q0)" +msgstr "" + +#: ElementForm.cpp:1229 +msgid "Switching" +msgstr "" + +#: GeneratorForm.cpp:177 +msgid "Value entered incorrectly in the field \"Nominal power\"." +msgstr "" + +#: GeneratorForm.cpp:193 +msgid "Value entered incorrectly in the field \"Active power\"." +msgstr "" + +#: GeneratorForm.cpp:212 +msgid "Value entered incorrectly in the field \"Reactive power\"." +msgstr "" + +#: GeneratorForm.cpp:233 +msgid "Value entered incorrectly in the field \"Max reactive power\"." +msgstr "" + +#: GeneratorForm.cpp:255 +msgid "Value entered incorrectly in the field \"Min reactive power\"." +msgstr "" + +#: GeneratorForm.cpp:277 +msgid "Value entered incorrectly in the field \"Positive resistance\"." +msgstr "" + +#: GeneratorForm.cpp:281 +msgid "Value entered incorrectly in the field \"Positive reactance\"." +msgstr "" + +#: GeneratorForm.cpp:285 +msgid "Value entered incorrectly in the field \"Negative resistance\"." +msgstr "" + +#: GeneratorForm.cpp:289 +msgid "Value entered incorrectly in the field \"Negative reactance\"." +msgstr "" + +#: GeneratorForm.cpp:293 +msgid "Value entered incorrectly in the field \"Zero resistance\"." +msgstr "" + +#: GeneratorForm.cpp:297 +msgid "Value entered incorrectly in the field \"Zero reactance\"." +msgstr "" + +#: GeneratorForm.cpp:301 +msgid "Value entered incorrectly in the field \"Ground resistance\"." +msgstr "" + +#: GeneratorForm.cpp:305 +msgid "Value entered incorrectly in the field \"Ground reactance\"." +msgstr "" + +#: GeneratorStabForm.cpp:57 +msgid "Value entered incorrectly in the field \"Inertia\"." +msgstr "" + +#: GeneratorStabForm.cpp:61 +msgid "Value entered incorrectly in the field \"Damping factor\"." +msgstr "" + +#: GeneratorStabForm.cpp:68 +msgid "Value entered incorrectly in the field \"Armature resistance\"." +msgstr "" + +#: GeneratorStabForm.cpp:72 +msgid "Value entered incorrectly in the field \"Potier reactance\"." +msgstr "" + +#: GeneratorStabForm.cpp:76 +msgid "Value entered incorrectly in the field \"Saturation factor\"." +msgstr "" + +#: GeneratorStabForm.cpp:81 +msgid "" +"Value entered incorrectly in the field \"Synchronous direct-axis reactance\"." +msgstr "" + +#: GeneratorStabForm.cpp:86 +msgid "" +"Value entered incorrectly in the field \"Synchronous quadrature-axis " +"reactance\"." +msgstr "" + +#: GeneratorStabForm.cpp:91 +msgid "" +"Value entered incorrectly in the field \"Transitory direct-axis reactance\"." +msgstr "" + +#: GeneratorStabForm.cpp:96 +msgid "" +"Value entered incorrectly in the field \"Transitory quadrature-axis reactance" +"\"." +msgstr "" + +#: GeneratorStabForm.cpp:101 +msgid "" +"Value entered incorrectly in the field \"Transitory direct-axis time constant" +"\"." +msgstr "" + +#: GeneratorStabForm.cpp:106 +msgid "" +"Value entered incorrectly in the field \"Transitory quadrature-axis time " +"constant\"." +msgstr "" + +#: GeneratorStabForm.cpp:111 +msgid "" +"Value entered incorrectly in the field \"Subtransitory direct-axis reactance" +"\"." +msgstr "" + +#: GeneratorStabForm.cpp:116 +msgid "" +"Value entered incorrectly in the field \"Subtransitory quadrature-axis " +"reactance\"." +msgstr "" + +#: GeneratorStabForm.cpp:121 +msgid "" +"Value entered incorrectly in the field \"Subtransitory direct-axis time " +"constant\"." +msgstr "" + +#: GeneratorStabForm.cpp:126 +msgid "" +"Value entered incorrectly in the field \"Subtransitory quadrature-axis time " +"constant\"." +msgstr "" + +#: IndMotor.cpp:24 +msgid "Edit induction motor" +msgstr "" + +#: Inductor.cpp:97 +msgid "Edit Inductor" +msgstr "" + +#: Line.cpp:262 +msgid "Edit line" +msgstr "" + +#: Line.cpp:264 +msgid "Insert node" +msgstr "" + +#: Line.cpp:268 +msgid "Remove node" +msgstr "" + +#: Load.cpp:103 +msgid "Edit Load" +msgstr "" + +#: MainFrame.cpp:80 +msgid "&Bus\tB" +msgstr "&Barramento\tB" + +#: MainFrame.cpp:80 +msgid "Adds a bus at the circuit" +msgstr "Adiciona um barramento no circuito" + +#: MainFrame.cpp:83 +msgid "&Line\tL" +msgstr "&Linha\tL" + +#: MainFrame.cpp:83 +msgid "Adds a power line at the circuit" +msgstr "Adiciona uma linha no circuito" + +#: MainFrame.cpp:84 +msgid "&Transformer\tT" +msgstr "&Transformador\tT" + +#: MainFrame.cpp:85 +msgid "Adds a transformer at the circuit" +msgstr "Adiciona um transformador no circuito" + +#: MainFrame.cpp:86 +msgid "&Generator\tG" +msgstr "&Gerador\tG" + +#: MainFrame.cpp:87 +msgid "Adds a generator at the circuit" +msgstr "Adiciona um gerador no circuito" + #: MainFrame.cpp:88 +msgid "&Induction motor\tI" +msgstr "&Motor de indução\tI" + +#: MainFrame.cpp:89 MainFrame.cpp:92 +msgid "Adds an induction motor at the circuit" +msgstr "Adiciona um motor de indução no circuito" + +#: MainFrame.cpp:91 +msgid "&Synchronous compensator \tK" +msgstr "&Compensador síncrono \tK" + +#: MainFrame.cpp:94 +msgid "&Load\tShift-L" +msgstr "&Carga\tShift-L" + +#: MainFrame.cpp:94 +msgid "Adds a load at the circuit" +msgstr "Adiciona uma carga no circuito" + +#: MainFrame.cpp:95 +msgid "&Capacitor\tShift-C" +msgstr "&Capacitor\tShift-C" + +#: MainFrame.cpp:96 +msgid "Adds a shunt capacitor at the circuit" +msgstr "Adiciona um capacitor shunt no circuito" + +#: MainFrame.cpp:97 msgid "&Inductor\tShift-I" +msgstr "&Inductor\tShift-I" + +#: MainFrame.cpp:98 +msgid "Adds a shunt inductor at the circuit" +msgstr "Adiciona um indutor shunt no circuito" + +#: MainFrame.cpp:119 +#, c-format +msgid "New project %d" +msgstr "" + +#: MainFrame.cpp:223 MainFrame.cpp:249 Workspace.cpp:583 +#, c-format +msgid "Bus %d" +msgstr "Barra %d" + +#: MainFrame.cpp:226 Workspace.cpp:587 +msgid "Insert Bus: Click to insert, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:234 Workspace.cpp:608 +msgid "Insert Line: Click on two buses, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:242 Workspace.cpp:621 +msgid "Insert Transformer: Click on two buses, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:252 Workspace.cpp:634 +msgid "Insert Generator: Click on a buses, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:260 Workspace.cpp:600 +msgid "Insert Load: Click on a buses, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:268 Workspace.cpp:681 +msgid "Insert Capacitor: Click on a buses, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:276 Workspace.cpp:647 +msgid "Insert Inductor: Click on a buses, ESC to cancel." +msgstr "" + +#: MainFrame.cpp:284 Workspace.cpp:655 +msgid "Insert Induction Motor: Click on a buses, ESC to cancel." msgstr "" -#: MainFrame.cpp:89 -msgid "Adds a shunt inductor to the circuit" +#: MainFrame.cpp:292 Workspace.cpp:668 +msgid "Insert Synchronous Condenser: Click on a buses, ESC to cancel." msgstr "" #: MainFrameBase.cpp:72 MainFrameBase.cpp:73 msgid "File" -msgstr "" +msgstr "Arquivo" #: MainFrameBase.cpp:76 MainFrameBase.cpp:77 MainFrameBase.cpp:80 msgid "Projects" -msgstr "" +msgstr "Projetos" #: MainFrameBase.cpp:82 msgid "New" -msgstr "" +msgstr "Novo" #: MainFrameBase.cpp:82 msgid "Create new project" -msgstr "" +msgstr "Criar novo projeto" #: MainFrameBase.cpp:84 msgid "Open" -msgstr "" +msgstr "Abrir" #: MainFrameBase.cpp:84 msgid "Open saved project" -msgstr "" +msgstr "Abrir projetos salvos" #: MainFrameBase.cpp:86 msgid "Export Import" -msgstr "" +msgstr "Exportar Importar" #: MainFrameBase.cpp:86 msgid "Export or import projects" -msgstr "" +msgstr "Exporta ou importa projetos" #: MainFrameBase.cpp:88 -msgid "Exit" +msgid "General Settings" msgstr "" #: MainFrameBase.cpp:88 -msgid "Closes the application" +msgid "Opens a dialog to set the main settings of the program" msgstr "" -#: MainFrameBase.cpp:91 MainFrameBase.cpp:92 -msgid "Current project" -msgstr "" +#: MainFrameBase.cpp:90 +msgid "Exit" +msgstr "Sair" -#: MainFrameBase.cpp:96 -msgid "Project settings" -msgstr "" +#: MainFrameBase.cpp:90 +msgid "Closes the application" +msgstr "Fecha a aplicação" -#: MainFrameBase.cpp:96 -msgid "Opens a dialog to set the main settings of the current project" -msgstr "" +#: MainFrameBase.cpp:93 MainFrameBase.cpp:94 +msgid "Current project" +msgstr "Projeto atual" #: MainFrameBase.cpp:98 msgid "Save" @@ -141,244 +672,354 @@ msgstr "Salvar" #: MainFrameBase.cpp:98 msgid "Save the current project" -msgstr "" +msgstr "Salvar o projeto atual" #: MainFrameBase.cpp:100 -msgid "Save as..." -msgstr "Salvar como..." +msgid "Save As..." +msgstr "" #: MainFrameBase.cpp:100 msgid "Save as the current project" -msgstr "" +msgstr "Salvar como o projeto atual" #: MainFrameBase.cpp:102 msgid "Close" -msgstr "" +msgstr "Fechar" #: MainFrameBase.cpp:102 msgid "Close the current project" -msgstr "" +msgstr "Fechar o projeto atual" #: MainFrameBase.cpp:105 MainFrameBase.cpp:106 MainFrameBase.cpp:109 msgid "Help" -msgstr "" +msgstr "Ajuda" #: MainFrameBase.cpp:111 msgid "PSP-UFU Guide" -msgstr "" +msgstr "Manual do PSP-UFU" #: MainFrameBase.cpp:111 msgid "Open PSP-UFU Guide" -msgstr "" +msgstr "Abrir o manual do PSP-UFU" #: MainFrameBase.cpp:113 msgid "About..." -msgstr "" +msgstr "Sobre..." #: MainFrameBase.cpp:113 msgid "About PSP-UFU" -msgstr "" +msgstr "Sobre o PSP-UFU" #: MainFrameBase.cpp:116 MainFrameBase.cpp:117 msgid "Tools" -msgstr "" +msgstr "Ferramentas" #: MainFrameBase.cpp:119 MainFrameBase.cpp:120 MainFrameBase.cpp:123 msgid "Clipboard" -msgstr "" +msgstr "Área de transferência" #: MainFrameBase.cpp:125 msgid "Copy" -msgstr "" +msgstr "Copiar" #: MainFrameBase.cpp:125 msgid "Copies the selected elements" -msgstr "" +msgstr "Copia os elementos selecionados" #: MainFrameBase.cpp:127 msgid "Paste" -msgstr "" +msgstr "Colar" #: MainFrameBase.cpp:127 msgid "Pastes the elements from clipboard" -msgstr "" +msgstr "Cola os elementos da área de transferência" #: MainFrameBase.cpp:129 msgid "Undo" -msgstr "" +msgstr "Desfazer" #: MainFrameBase.cpp:129 msgid "Undoes the last action" -msgstr "" +msgstr "Desfaz a última ação" #: MainFrameBase.cpp:131 msgid "Redo" -msgstr "" +msgstr "Refazer" #: MainFrameBase.cpp:131 msgid "Redoes the last undo action" -msgstr "" +msgstr "Refaz a última ação desfeita" #: MainFrameBase.cpp:134 MainFrameBase.cpp:135 MainFrameBase.cpp:138 msgid "Circuit" -msgstr "" +msgstr "Circuito" #: MainFrameBase.cpp:140 -msgid "Add element" +msgid "Add Element" msgstr "" #: MainFrameBase.cpp:140 msgid "Add a new element in the project" -msgstr "" +msgstr "Adicionar um elemento novo no projeto" #: MainFrameBase.cpp:142 -msgid "Enable solution" -msgstr "" +msgid "Drag" +msgstr "Arrastar" #: MainFrameBase.cpp:142 -msgid "" -"Enables the power flow and fault (if exists) calculations after any circuit " -"change" -msgstr "" +msgid "Drag all the elements" +msgstr "Arrasta todos os elementos" #: MainFrameBase.cpp:144 -msgid "Disable solution" -msgstr "" +msgid "Move" +msgstr "Mover" #: MainFrameBase.cpp:144 -msgid "" -"Disables the power flow and fault calculations after any circuit changes" -msgstr "" +msgid "Move the selected elements" +msgstr "Move os elementos selecionados" #: MainFrameBase.cpp:146 -msgid "Reset voltages" -msgstr "" +msgid "Removes all selected elements" +msgstr "Remove todos os elementos selecionados" -#: MainFrameBase.cpp:146 -msgid "Reset all voltages to initial state" -msgstr "" +#: MainFrameBase.cpp:148 +msgid "Fit" +msgstr "Encaixar" -#: MainFrameBase.cpp:149 MainFrameBase.cpp:150 MainFrameBase.cpp:153 -msgid "Handling" +#: 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:155 -msgid "Drag" +#: MainFrameBase.cpp:150 +msgid "Rotate Clockwise" msgstr "" -#: MainFrameBase.cpp:155 -msgid "Drag all the elements" +#: MainFrameBase.cpp:152 +msgid "Rotate Counter-clockwise" msgstr "" -#: MainFrameBase.cpp:157 -msgid "Move" +#: MainFrameBase.cpp:152 +msgid "Rotate the selected elements counter-clockwise" msgstr "" -#: MainFrameBase.cpp:157 -msgid "Move the selected elements" +#: MainFrameBase.cpp:154 +msgid "Project Settings" msgstr "" -#: MainFrameBase.cpp:159 -msgid "Fit" +#: 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:159 -msgid "Applies the drag and zoom tools to show all elements in workspace" +#: MainFrameBase.cpp:157 MainFrameBase.cpp:158 +msgid "Reports" +msgstr "Relatórios" + +#: MainFrameBase.cpp:162 +msgid "Data Report" msgstr "" -#: MainFrameBase.cpp:161 -msgid "Delete" +#: 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 "" -#: MainFrameBase.cpp:161 -msgid "Removes all selected elements" +#: MainFrameBase.cpp:172 MainFrameBase.cpp:173 +msgid "Continuous" msgstr "" -#: MainFrameBase.cpp:164 MainFrameBase.cpp:165 MainFrameBase.cpp:168 -msgid "Calculations" +#: MainFrameBase.cpp:177 +msgid "Enable Solution" msgstr "" -#: MainFrameBase.cpp:170 -msgid "Power flow" +#: 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:170 -msgid "Calculate the circuit power flow" +#: MainFrameBase.cpp:179 +msgid "Disable Solution" msgstr "" -#: MainFrameBase.cpp:172 -msgid "Fault" +#: 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:172 -msgid "Calculate the circuit fault (if exists)" +#: MainFrameBase.cpp:181 +msgid "Reset Voltages" msgstr "" -#: MainFrameBase.cpp:174 -msgid "Short-circuit power" +#: 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 "" -#: MainFrameBase.cpp:174 -msgid "Calculate the short-circuit power in all buses" +#: MainFrameBase.cpp:190 +msgid "Power Flow" msgstr "" -#: MainFrameBase.cpp:177 MainFrameBase.cpp:178 -msgid "Reports" +#: MainFrameBase.cpp:190 +msgid "Calculate the circuit power flow" +msgstr "Calcula o fluxo de carga do circuito" + +#: MainFrameBase.cpp:192 +msgid "Run Stability" msgstr "" -#: MainFrameBase.cpp:182 -msgid "Data report" +#: 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 "" -#: MainFrameBase.cpp:182 -msgid "Opens a data report" +#: 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 "" -#: MainFrameBase.cpp:184 -msgid "Snapshot" +#: MainFrameBase.cpp:198 +msgid "Opens a dialog to set the settings of the simulations" msgstr "" -#: MainFrameBase.cpp:184 -msgid "Capture a snapshot of the circuit" +#: SyncGenerator.cpp:41 +msgid "Edit Generator" msgstr "" -#: MainFrameBase.cpp:187 MainFrameBase.cpp:188 MainFrameBase.cpp:190 -#: MainFrameBase.cpp:191 MainFrameBase.cpp:194 -msgid "Stability" +#: SyncMotor.cpp:18 +msgid "Edit Synchronous Condenser" msgstr "" -#: MainFrameBase.cpp:196 -msgid "Settings" +#: Transformer.cpp:224 +msgid "Edit tranformer" msgstr "" -#: MainFrameBase.cpp:196 -msgid "Opens the stability settings" +#: Workspace.cpp:630 +#, c-format +msgid "Generator %d" +msgstr "Gerador %d" + +#: Workspace.cpp:702 +msgid "MODE: DRAG" msgstr "" -#: MainFrameBase.cpp:198 -msgid "Run" +#: Workspace.cpp:709 +msgid "MODE: INSERT" msgstr "" -#: MainFrameBase.cpp:198 -msgid "Run the stability calculations" +#: Workspace.cpp:720 +msgid "MODE: EDIT" msgstr "" -#: MainFrameBase.cpp:201 MainFrameBase.cpp:202 -msgid "Data" +#: Workspace.cpp:725 +#, c-format +msgid "ZOOM: %d%%" msgstr "" -#: MainFrameBase.cpp:205 -msgid "Stability data" +#: ElementForm.h:139 +msgid "Bus" msgstr "" -#: MainFrameBase.cpp:207 -msgid "Charts" +#: ElementForm.h:238 +msgid "Generator" msgstr "" -#: MainFrameBase.cpp:207 -msgid "Open the charts" +#: ElementForm.h:365 +msgid "Generator: Stability" msgstr "" -#: MainFrameBase.h:140 +#: MainFrameBase.h:143 msgid "PSP-UFU" -msgstr "" +msgstr "PSP-UFU" + +#~ msgid "Project settings" +#~ msgstr "Opções do projeto" + +#~ msgid "Save as..." +#~ msgstr "Salvar como..." + +#~ msgid "Add element" +#~ msgstr "Adicionar elemento" + +#~ msgid "Enable solution" +#~ msgstr "Habilitar solução" + +#~ msgid "Disable solution" +#~ msgstr "Desabilitar solução" + +#~ msgid "Reset voltages" +#~ msgstr "Reiniciar tensões" + +#~ msgid "Handling" +#~ msgstr "Manipulação" + +#~ msgid "Calculations" +#~ msgstr "Cálculos" + +#~ msgid "Power flow" +#~ msgstr "Fluxo de carga" + +#~ msgid "Short-circuit power" +#~ msgstr "Nível de curto-circuito" + +#~ msgid "Data report" +#~ msgstr "Relatório de dados" + +#~ msgid "Settings" +#~ msgstr "Opções" + +#~ msgid "Opens the stability settings" +#~ msgstr "Abre as opções de estabilidade" + +#~ msgid "Run" +#~ msgstr "Executar" + +#~ msgid "Data" +#~ msgstr "Dados" + +#~ msgid "Stability data" +#~ msgstr "Dados de estabilidade" + +#~ msgid "Adds a bus to the circuit" +#~ msgstr "Insere um barramento no circuito" + +#~ msgid "Adds a power line to the circuit" +#~ msgstr "Insere uma linha no " diff --git a/Project/wxGLString.cpp b/Project/wxGLString.cpp index b54a953..23286bc 100644 --- a/Project/wxGLString.cpp +++ b/Project/wxGLString.cpp @@ -8,85 +8,76 @@ #include "wx/wx.h" - GLuint* loadImage(wxImage* img) { - GLuint* ID=new GLuint[1]; - glGenTextures( 1, &ID[0] ); - - glBindTexture( GL_TEXTURE_2D, *ID ); + GLuint* ID = new GLuint[1]; + glGenTextures(1, &ID[0]); + glBindTexture(GL_TEXTURE_2D, *ID); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1 ); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); const int w = img->GetWidth(), h = img->GetHeight(); - // note: must make a local copy before passing the data to OpenGL, as GetData() returns RGB // and we want the Alpha channel. Furthermore, the current rendering is black-on-white, we'll // convert it to an alpha channel by the way (not all platforms support transparency in wxDCs // so it's the easiest way to go) - GLubyte *bitmapData=img->GetData(); - GLubyte *imageData; + GLubyte* bitmapData = img->GetData(); + GLubyte* imageData; int bytesPerPixel = 4; int imageSize = w * h * bytesPerPixel; - imageData=(GLubyte *)malloc(imageSize); + imageData = (GLubyte*)malloc(imageSize); - int rev_val=h-1; + int rev_val = h - 1; - for(int y=0; y<h; y++) - { - for(int x=0; x<w; x++) - { - imageData[(x+y*w)*bytesPerPixel+0] = 255; - imageData[(x+y*w)*bytesPerPixel+1] = 255; - imageData[(x+y*w)*bytesPerPixel+2] = 255; + for(int y = 0; y < h; y++) { + for(int x = 0; x < w; x++) { + imageData[(x + y * w) * bytesPerPixel + 0] = 255; + imageData[(x + y * w) * bytesPerPixel + 1] = 255; + imageData[(x + y * w) * bytesPerPixel + 2] = 255; // alpha - imageData[(x+y*w)*bytesPerPixel+3] = 255 - bitmapData[( x+(rev_val-y)*w)*3]; - }//next - }//next + imageData[(x + y * w) * bytesPerPixel + 3] = 255 - bitmapData[(x + (rev_val - y) * w) * 3]; + } // next + } // next - glTexImage2D(GL_TEXTURE_2D, 0, bytesPerPixel, w, h, 0, - GL_RGBA, GL_UNSIGNED_BYTE, imageData); + glTexImage2D(GL_TEXTURE_2D, 0, bytesPerPixel, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, imageData); free(imageData); - // set texture parameters as you wish - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + // set texture parameters as you wish + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - // GL_CLAMP_TO_EDGE - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - return ID; + // GL_CLAMP_TO_EDGE + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + return ID; } - class TextTexture { friend class wxGLString; friend class wxGLStringArray; friend class wxGLStringNumber; + private: GLuint* ID; -protected: +protected: GLuint* getID(); TextTexture(); TextTexture(wxBitmap& bmp); void load(wxImage* img); -public: - +public: ~TextTexture(); - }; #if 0 @@ -94,21 +85,22 @@ public: #pragma mark TextGLDrawable implementation #endif - TextGLDrawable::TextGLDrawable(TextTexture* image_arg) { - x=0; - y=0; - angle=0; + x = 0; + y = 0; + angle = 0; - xscale=1; - yscale=1; + xscale = 1; + yscale = 1; - xflip=false; - yflip=false; + xflip = false; + yflip = false; - if(image_arg!=NULL) setImage(image_arg); - else image=NULL; + if(image_arg != NULL) + setImage(image_arg); + else + image = NULL; tex_coord_x1 = 0; tex_coord_y1 = 1; @@ -118,140 +110,117 @@ TextGLDrawable::TextGLDrawable(TextTexture* image_arg) void TextGLDrawable::setFlip(bool x, bool y) { - xflip=x; - yflip=y; + xflip = x; + yflip = y; } void TextGLDrawable::move(double x, double y) { - TextGLDrawable::x=x; - TextGLDrawable::y=y; + TextGLDrawable::x = x; + TextGLDrawable::y = y; } void TextGLDrawable::scale(float x, float y) { - TextGLDrawable::xscale=x; - TextGLDrawable::yscale=y; + TextGLDrawable::xscale = x; + TextGLDrawable::yscale = y; } void TextGLDrawable::scale(float k) { - TextGLDrawable::xscale=k; - TextGLDrawable::yscale=k; + TextGLDrawable::xscale = k; + TextGLDrawable::yscale = k; } -void TextGLDrawable::setImage(TextTexture* image) -{ - TextGLDrawable::image=image; -} +void TextGLDrawable::setImage(TextTexture* image) { TextGLDrawable::image = image; } -void TextGLDrawable::rotate(int angle) -{ - TextGLDrawable::angle=angle; -} +void TextGLDrawable::rotate(int angle) { TextGLDrawable::angle = angle; } void TextGLDrawable::render() const { - assert(image!=NULL); + assert(image != NULL); glPushMatrix(); - glTranslatef(x - w/2, y - h/2, 0); - if(xscale!=1 || yscale!=1) glScalef(xscale, yscale, 1); - if(angle!=0) glRotatef(angle, 0,0,1); - + glTranslatef(x - w / 2, y - h / 2, 0); + if(xscale != 1 || yscale != 1) glScalef(xscale, yscale, 1); + if(angle != 0) glRotatef(angle, 0, 0, 1); glBegin(GL_QUADS); - glTexCoord2f(xflip? tex_coord_x2 : tex_coord_x1, - yflip? tex_coord_y2 : tex_coord_y1); - glVertex2f( 0, 0 ); + glTexCoord2f(xflip ? tex_coord_x2 : tex_coord_x1, yflip ? tex_coord_y2 : tex_coord_y1); + glVertex2f(0, 0); - glTexCoord2f(xflip? tex_coord_x1 : tex_coord_x2, - yflip? tex_coord_y2 : tex_coord_y1); - glVertex2f( w, 0 ); + glTexCoord2f(xflip ? tex_coord_x1 : tex_coord_x2, yflip ? tex_coord_y2 : tex_coord_y1); + glVertex2f(w, 0); - glTexCoord2f(xflip? tex_coord_x1 : tex_coord_x2, - yflip? tex_coord_y1 : tex_coord_y2); - glVertex2f( w, h ); + glTexCoord2f(xflip ? tex_coord_x1 : tex_coord_x2, yflip ? tex_coord_y1 : tex_coord_y2); + glVertex2f(w, h); - glTexCoord2f(xflip? tex_coord_x2 : tex_coord_x1, - yflip? tex_coord_y1 : tex_coord_y2); - glVertex2f( 0, h ); + glTexCoord2f(xflip ? tex_coord_x2 : tex_coord_x1, yflip ? tex_coord_y1 : tex_coord_y2); + glVertex2f(0, h); glEnd(); glPopMatrix(); } - #if 0 #pragma mark - #pragma mark TextTexture implementation #endif -TextTexture::TextTexture() -{ -} +TextTexture::TextTexture() {} TextTexture::TextTexture(wxBitmap& bmp) { wxImage img = bmp.ConvertToImage(); load(&img); } -void TextTexture::load(wxImage* img) -{ - ID=loadImage(img); -} +void TextTexture::load(wxImage* img) { ID = loadImage(img); } -GLuint* TextTexture::getID() -{ - return ID; -} +GLuint* TextTexture::getID() { return ID; } TextTexture::~TextTexture() { - //glDeleteTextures (1, ID); - glDeleteTextures (1, ID); + glDeleteTextures(1, ID); delete ID; } - #if 0 #pragma mark - #pragma mark wxGLString implementation #endif -wxGLString::wxGLString() : wxString(wxT("")), TextGLDrawable() +wxGLString::wxGLString() + : wxString(wxT("")) + , TextGLDrawable() { img = NULL; } -wxGLString::wxGLString(wxString message) : wxString(message), TextGLDrawable() +wxGLString::wxGLString(wxString message) + : wxString(message) + , TextGLDrawable() { img = NULL; } -void wxGLString::operator=(wxString& string) -{ - (*((wxString*)this))=string; -} -void wxGLString::bind() const -{ - glBindTexture(GL_TEXTURE_2D, img->getID()[0] ); -} +void wxGLString::operator=(wxString& string) { (*((wxString*)this)) = string; } +void wxGLString::bind() const { glBindTexture(GL_TEXTURE_2D, img->getID()[0]); } void wxGLString::calculateSize(wxDC* dc, const bool ignore_font /* when from array */) { - if(!ignore_font) - { - if(font.IsOk()) dc->SetFont(font); - else dc->SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); + if(!ignore_font) { + if(font.IsOk()) + dc->SetFont(font); + else + dc->SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); } - + dc->GetTextExtent(*this, &w, &h); } void wxGLString::consolidate(wxDC* dc) { calculateSize(dc); - const int power_of_2_w = std::max(32, (int)pow( (double)2, (int)ceil((float)log((double)w)/log(2.0)) )); - const int power_of_2_h = std::max(32, (int)pow( (double)2, (int)ceil((float)log((double)h)/log(2.0)) )); + const int power_of_2_w = std::max(32, (int)pow((double)2, (int)ceil((float)log((double)w) / log(2.0)))); + const int power_of_2_h = std::max(32, (int)pow((double)2, (int)ceil((float)log((double)h) / log(2.0)))); wxBitmap bmp(power_of_2_w, power_of_2_h); assert(bmp.IsOk()); @@ -262,9 +231,11 @@ void wxGLString::consolidate(wxDC* dc) temp_dc.SetBrush(*wxWHITE_BRUSH); temp_dc.Clear(); - if(font.IsOk()) temp_dc.SetFont(font); - else temp_dc.SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); - + if(font.IsOk()) + temp_dc.SetFont(font); + else + temp_dc.SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); + temp_dc.DrawText(*this, 0, 0); } @@ -274,23 +245,17 @@ void wxGLString::consolidate(wxDC* dc) TextGLDrawable::texw = power_of_2_w; TextGLDrawable::texh = power_of_2_h; TextGLDrawable::tex_coord_x2 = (float)w / (float)power_of_2_w; - TextGLDrawable::tex_coord_y2 = 1-(float)h / (float)power_of_2_h; + TextGLDrawable::tex_coord_y2 = 1 - (float)h / (float)power_of_2_h; TextGLDrawable::tex_coord_y1 = 1; TextGLDrawable::setImage(img); } -void wxGLString::consolidateFromArray(wxDC* dc, double x, double y) -{ - dc->DrawText(*this, x, y); -} +void wxGLString::consolidateFromArray(wxDC* dc, double x, double y) { dc->DrawText(*this, x, y); } -void wxGLString::setFont(wxFont font) -{ - wxGLString::font = font; -} +void wxGLString::setFont(wxFont font) { wxGLString::font = font; } -void wxGLString::render(const double x, const double y) +void wxGLString::render(const double x, const double y) { TextGLDrawable::move(x, y); TextGLDrawable::render(); @@ -300,38 +265,37 @@ wxGLString::~wxGLString() if(img != NULL) delete img; } - #if 0 #pragma mark - #pragma mark wxGLNumberRenderer implementation #endif -wxGLNumberRenderer::wxGLNumberRenderer() : wxGLString( wxT("0 1 2 3 4 5 6 7 8 9 . - ") ) +wxGLNumberRenderer::wxGLNumberRenderer() + : wxGLString(wxT("0 1 2 3 4 5 6 7 8 9 . - ")) { number_location = new int[13]; } -wxGLNumberRenderer::~wxGLNumberRenderer() -{ - delete[] number_location; -} +wxGLNumberRenderer::~wxGLNumberRenderer() { delete[] number_location; } void wxGLNumberRenderer::consolidate(wxDC* dc) { wxGLString::consolidate(dc); - if(font.IsOk()) dc->SetFont(font); - else dc->SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); - + if(font.IsOk()) + dc->SetFont(font); + else + dc->SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); + number_location[0] = 0; - number_location[1] = dc->GetTextExtent(wxT("0 ")).GetWidth(); - number_location[2] = dc->GetTextExtent(wxT("0 1 ")).GetWidth(); - number_location[3] = dc->GetTextExtent(wxT("0 1 2 ")).GetWidth(); - number_location[4] = dc->GetTextExtent(wxT("0 1 2 3 ")).GetWidth(); - number_location[5] = dc->GetTextExtent(wxT("0 1 2 3 4 ")).GetWidth(); - number_location[6] = dc->GetTextExtent(wxT("0 1 2 3 4 5 ")).GetWidth(); - number_location[7] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 ")).GetWidth(); - number_location[8] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 ")).GetWidth(); - number_location[9] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 8 ")).GetWidth(); + number_location[1] = dc->GetTextExtent(wxT("0 ")).GetWidth(); + number_location[2] = dc->GetTextExtent(wxT("0 1 ")).GetWidth(); + number_location[3] = dc->GetTextExtent(wxT("0 1 2 ")).GetWidth(); + number_location[4] = dc->GetTextExtent(wxT("0 1 2 3 ")).GetWidth(); + number_location[5] = dc->GetTextExtent(wxT("0 1 2 3 4 ")).GetWidth(); + number_location[6] = dc->GetTextExtent(wxT("0 1 2 3 4 5 ")).GetWidth(); + number_location[7] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 ")).GetWidth(); + number_location[8] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 ")).GetWidth(); + number_location[9] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 8 ")).GetWidth(); number_location[10] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 8 9 ")).GetWidth(); number_location[11] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 8 9 . ")).GetWidth(); number_location[12] = dc->GetTextExtent(wxT("0 1 2 3 4 5 6 7 8 9 . - ")).GetWidth(); @@ -353,39 +317,62 @@ void wxGLNumberRenderer::renderNumber(float f, double x, double y) void wxGLNumberRenderer::renderNumber(wxString s, double x, double y) { const int full_string_w = TextGLDrawable::texw; - + const int char_amount = s.Length(); - for(int c=0; c<char_amount; c++) - { + for(int c = 0; c < char_amount; c++) { int charid = -1; char schar = s[c]; - switch(schar) - { - case '0' : charid = 0; break; - case '1' : charid = 1; break; - case '2' : charid = 2; break; - case '3' : charid = 3; break; - case '4' : charid = 4; break; - case '5' : charid = 5; break; - case '6' : charid = 6; break; - case '7' : charid = 7; break; - case '8' : charid = 8; break; - case '9' : charid = 9; break; - case '.' : - case ',' : charid = 10; break; - case '-' : charid = 11; break; - default: printf("Warning: character %c unexpected in number!\n", schar); continue; + switch(schar) { + case '0': + charid = 0; + break; + case '1': + charid = 1; + break; + case '2': + charid = 2; + break; + case '3': + charid = 3; + break; + case '4': + charid = 4; + break; + case '5': + charid = 5; + break; + case '6': + charid = 6; + break; + case '7': + charid = 7; + break; + case '8': + charid = 8; + break; + case '9': + charid = 9; + break; + case '.': + case ',': + charid = 10; + break; + case '-': + charid = 11; + break; + default: + printf("Warning: character %c unexpected in number!\n", schar); + continue; } - assert( charid != -1 ); + assert(charid != -1); TextGLDrawable::tex_coord_x1 = (float)number_location[charid] / (float)full_string_w; - TextGLDrawable::tex_coord_x2 = (float)(number_location[charid+1]-space_w) / (float)full_string_w; - - const int char_width = number_location[charid+1] - number_location[charid] - space_w; - TextGLDrawable::w = char_width; + TextGLDrawable::tex_coord_x2 = (float)(number_location[charid + 1] - space_w) / (float)full_string_w; + const int char_width = number_location[charid + 1] - number_location[charid] - space_w; + TextGLDrawable::w = char_width; TextGLDrawable::move(x, y); TextGLDrawable::render(); @@ -393,7 +380,7 @@ void wxGLNumberRenderer::renderNumber(wxString s, double x, double y) x += char_width; } // next - // TextGLDrawable::w = full_string_w; + // TextGLDrawable::w = full_string_w; } #if 0 @@ -401,69 +388,55 @@ void wxGLNumberRenderer::renderNumber(wxString s, double x, double y) #pragma mark wxGLStringArray implementation #endif -wxGLStringArray::wxGLStringArray() -{ - img = NULL; -} +wxGLStringArray::wxGLStringArray() { img = NULL; } wxGLStringArray::wxGLStringArray(const wxString strings_arg[], int amount) { img = NULL; - - for(int n=0; n<amount; n++) - strings.push_back( wxGLString(strings_arg[n]) ); + + for(int n = 0; n < amount; n++) strings.push_back(wxGLString(strings_arg[n])); } wxGLStringArray::~wxGLStringArray() { if(img != NULL) delete img; } -wxGLString& wxGLStringArray::get(const int id) -{ - return strings[id]; -} -void wxGLStringArray::bind() -{ - glBindTexture(GL_TEXTURE_2D, img->getID()[0] ); -} -void wxGLStringArray::addString(wxString string) -{ - strings.push_back( wxGLString(string) ); -} -void wxGLStringArray::setFont(wxFont font) -{ - wxGLStringArray::font = font; -} +wxGLString& wxGLStringArray::get(const int id) { return strings[id]; } +void wxGLStringArray::bind() { glBindTexture(GL_TEXTURE_2D, img->getID()[0]); } +void wxGLStringArray::addString(wxString string) { strings.push_back(wxGLString(string)); } +void wxGLStringArray::setFont(wxFont font) { wxGLStringArray::font = font; } void wxGLStringArray::consolidate(wxDC* dc) { - int x=0, y=0; + int x = 0, y = 0; + + if(font.IsOk()) + dc->SetFont(font); + else + dc->SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); - if(font.IsOk()) dc->SetFont(font); - else dc->SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); - // find how much space we need int longest_string = 0; const int amount = strings.size(); - for(int n=0; n<amount; n++) - { + for(int n = 0; n < amount; n++) { strings[n].calculateSize(dc, true); y += strings[n].h; if(strings[n].w > longest_string) longest_string = strings[n].w; - }//next + } // next const int average_string_height = y / amount; - + // split in multiple columns if necessary int column_amount = 1; - while (amount/column_amount > 30 && column_amount<10) - column_amount ++; - - const int power_of_2_w = pow( (double)2, (int)ceil((float)log((double)longest_string*(double)column_amount)/log(2.0)) ); - const int power_of_2_h = pow( (double)2, (int)ceil((float)log((double)y/(double)column_amount)/log(2.0)) ); - - //std::cout << "bitmap size : " << power_of_2_w << ", " << power_of_2_h << " // " << column_amount << " columns" << std::endl; - + while(amount / column_amount > 30 && column_amount < 10) column_amount++; + + const int power_of_2_w = + pow((double)2, (int)ceil((float)log((double)longest_string * (double)column_amount) / log(2.0))); + const int power_of_2_h = pow((double)2, (int)ceil((float)log((double)y / (double)column_amount) / log(2.0))); + + // std::cout << "bitmap size : " << power_of_2_w << ", " << power_of_2_h << " // " << column_amount << " columns" + // << std::endl; + wxBitmap bmp(power_of_2_w, power_of_2_h); assert(bmp.IsOk()); @@ -475,17 +448,18 @@ void wxGLStringArray::consolidate(wxDC* dc) y = 0; x = 0; - if(font.IsOk()) temp_dc.SetFont(font); - else temp_dc.SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); - - for(int n=0; n<amount; n++) - { + if(font.IsOk()) + temp_dc.SetFont(font); + else + temp_dc.SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); + + for(int n = 0; n < amount; n++) { strings[n].consolidateFromArray(&temp_dc, x, y); - strings[n].tex_coord_x1 = (float)x/(float)power_of_2_w; - strings[n].tex_coord_y1 = 1.0 - (float)y/(float)power_of_2_h; - strings[n].tex_coord_x2 = (float)(x+strings[n].w)/(float)power_of_2_w; - strings[n].tex_coord_y2 = 1.0 - (float)(y+strings[n].h)/(float)power_of_2_h; + strings[n].tex_coord_x1 = (float)x / (float)power_of_2_w; + strings[n].tex_coord_y1 = 1.0 - (float)y / (float)power_of_2_h; + strings[n].tex_coord_x2 = (float)(x + strings[n].w) / (float)power_of_2_w; + strings[n].tex_coord_y2 = 1.0 - (float)(y + strings[n].h) / (float)power_of_2_h; y += strings[n].h; if(y > power_of_2_h - average_string_height) // check if we need to switch to next column @@ -498,6 +472,5 @@ void wxGLStringArray::consolidate(wxDC* dc) if(img != NULL) delete img; img = new TextTexture(bmp); - for(int n=0; n<amount; n++) - strings[n].setImage(img); + for(int n = 0; n < amount; n++) strings[n].setImage(img); } |
