oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nodeview-redux

Browse Source
This commit is contained in:
itsmattkc
2021-05-29 20:57:52 +10:00
parent e7ec9ccde2 ae3393f031
commit e8a326aed9
49 changed files with 674 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/scope/scope.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ QString ScopePanel::TypeToName(ScopePanel::Type t)
return QString();
}
void ScopePanel::SetReferenceBuffer(Frame *frame)
void ScopePanel::SetReferenceBuffer(TexturePtr frame)
{
histogram_->SetBuffer(frame);
waveform_view_->SetBuffer(frame);
app/panel/scope/scope.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
static QString TypeToName(Type t);
public slots:
void SetReferenceBuffer(Frame* frame);
void SetReferenceBuffer(TexturePtr frame);
void SetColorManager(ColorManager* manager);
app/panel/viewer/viewerbase.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ void ViewerPanelBase::CreateScopePanel(ScopePanel::Type type)
p->SetType(type);
// Connect viewer widget texture drawing to scope panel
connect(vw, &ViewerWidget::LoadedBuffer, p, &ScopePanel::SetReferenceBuffer);
connect(vw, &ViewerWidget::TextureChanged, p, &ScopePanel::SetReferenceBuffer);
connect(vw, &ViewerWidget::ColorManagerChanged, p, &ScopePanel::SetColorManager);
p->SetColorManager(vw->color_manager());