diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-06-02 21:47:06 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-06-02 21:47:06 -0300 |
| commit | 113a35d0fe8938973fa1c100b77f456ed250e61b (patch) | |
| tree | 586d1c3113082cbb2b92cd46c3c96a25a0e75e67 /Project/GeneratorStabForm.cpp | |
| parent | 6ce2bdcf85dffee6b6ef7b95b888b8b96372a3d6 (diff) | |
| download | PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.tar.gz PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.tar.xz PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.zip | |
OpenGL bugfixes and wxGC port alternative init
OpenGL major bugfixes;
Device context port alternative to OpenGL code init (WorkspaceDC). Some machines don't support OpenGL 3+;
Fixed some issues with MSVC.
Diffstat (limited to 'Project/GeneratorStabForm.cpp')
| -rw-r--r-- | Project/GeneratorStabForm.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 3eb3a39..f22ecdb 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -21,12 +21,13 @@ #include "SwitchingForm.h" #include "SyncGenerator.h" -GeneratorStabForm::GeneratorStabForm(wxWindow* parent, SyncGenerator* syncGenerator) +GeneratorStabForm::GeneratorStabForm(wxWindow* parent, SyncGenerator* syncGenerator, wxGLContext* sharedGLContext) : GeneratorStabFormBase(parent) { SetSize(GetBestSize()); m_syncGenerator = syncGenerator; m_parent = parent; + m_sharedGLContext = sharedGLContext; SyncGeneratorElectricalData data = syncGenerator->GetElectricalData(); @@ -75,7 +76,7 @@ void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event) data.avr = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = new ControlEditor(m_parent, IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_ACTIVE_POWER | + ControlEditor* cEditor = new ControlEditor(NULL, m_sharedGLContext, IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | IOControl::IN_INITIAL_TERMINAL_VOLTAGE | IOControl::IN_VELOCITY | IOControl::IN_INITIAL_VELOCITY | IOControl::IN_DELTA_VELOCITY | IOControl::IN_DELTA_ACTIVE_POWER | IOControl::OUT_FIELD_VOLTAGE); @@ -105,7 +106,7 @@ void GeneratorStabForm::OnSpeedGovernorButtonClick(wxCommandEvent& event) m_syncGenerator->SetElectricalData(data); } ControlEditor* cEditor = - new ControlEditor(NULL, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | + new ControlEditor(NULL, m_sharedGLContext, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | IOControl::IN_INITIAL_VELOCITY | IOControl::IN_INITIAL_MEC_POWER | IOControl::OUT_MEC_POWER); cEditor->SetElementsList(data.speedGov->GetControlElementsList()); cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList()); |