manageddisplaywidgets: fixed issue that caused buffers to be drawn on the main window

This commit is contained in:
itsmattkc
2020-04-29 01:24:21 +10:00
parent 3070aa7e40
commit 69d399105a
4 changed files with 4 additions and 23 deletions
+4 -2
View File
@@ -142,9 +142,13 @@ void ManagedDisplayWidget::MenuLookSelect(QAction *action)
void ManagedDisplayWidget::SetColorTransform(const ColorTransform &transform)
{
makeCurrent();
color_transform_ = transform;
SetupColorProcessor();
ColorProcessorChangedEvent();
doneCurrent();
}
void ManagedDisplayWidget::initializeGL()
@@ -248,9 +252,7 @@ void ManagedDisplayWidget::SetupColorProcessor()
color_manager_->GetReferenceColorSpace(),
color_transform_);
makeCurrent();
color_service_->Enable(context(), true);
doneCurrent();
} catch (OCIO::Exception& e) {
-4
View File
@@ -60,8 +60,6 @@ void WaveformScope::initializeGL()
{
ManagedDisplayWidget::initializeGL();
makeCurrent();
pipeline_ = OpenGLShader::Create();
pipeline_->create();
pipeline_->addShaderFromSourceCode(QOpenGLShader::Vertex, OpenGLShader::CodeDefaultVertex());
@@ -70,8 +68,6 @@ void WaveformScope::initializeGL()
framebuffer_.Create(context());
doneCurrent();
connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &WaveformScope::CleanUp, Qt::DirectConnection);
UploadTextureFromBuffer();
@@ -1,6 +0,0 @@
#include "manageddisplayobject.h"
ManagedDisplayObject::ManagedDisplayObject()
{
}
-11
View File
@@ -1,11 +0,0 @@
#ifndef MANAGEDDISPLAYOBJECT_H
#define MANAGEDDISPLAYOBJECT_H
class ManagedDisplayObject
{
public:
ManagedDisplayObject();
};
#endif // MANAGEDDISPLAYOBJECT_H