summaryrefslogtreecommitdiffstats
path: root/Project/SyncMachineForm.cpp
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-06-02 21:47:06 -0300
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-06-02 21:47:06 -0300
commit113a35d0fe8938973fa1c100b77f456ed250e61b (patch)
tree586d1c3113082cbb2b92cd46c3c96a25a0e75e67 /Project/SyncMachineForm.cpp
parent6ce2bdcf85dffee6b6ef7b95b888b8b96372a3d6 (diff)
downloadPSP.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/SyncMachineForm.cpp')
-rw-r--r--Project/SyncMachineForm.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Project/SyncMachineForm.cpp b/Project/SyncMachineForm.cpp
index 486a043..3c27a7c 100644
--- a/Project/SyncMachineForm.cpp
+++ b/Project/SyncMachineForm.cpp
@@ -20,7 +20,7 @@
#include "SyncGenerator.h"
#include "SyncMotor.h"
-SyncMachineForm::SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator) : SyncMachineFormBase(parent)
+SyncMachineForm::SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator, wxGLContext* sharedGLContext) : SyncMachineFormBase(parent)
{
SetSize(GetBestSize());
ReplaceStaticTextLabelChar(m_staticTextPosResistance, L'\u2081');
@@ -32,6 +32,7 @@ SyncMachineForm::SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator)
Layout();
m_syncGenerator = syncGenerator;
m_parent = parent;
+ m_sharedGLContext = sharedGLContext;
SyncGeneratorElectricalData data = syncGenerator->GetElectricalData();
@@ -286,7 +287,7 @@ void SyncMachineForm::OnStabilityButtonClick(wxCommandEvent& event)
{
if(ValidateData()) {
if(m_syncGenerator) {
- GeneratorStabForm* stabForm = new GeneratorStabForm(m_parent, m_syncGenerator);
+ GeneratorStabForm* stabForm = new GeneratorStabForm(m_parent, m_syncGenerator, m_sharedGLContext);
if(stabForm->ShowModal() == wxID_OK) {
stabForm->Destroy();
EndModal(wxID_OK);