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

added option to disable color management menu on viewer

Browse Source 
While the Viewer is _always_ color managed, In some contexts, the color
management may be controlled from an external UI making the menu unnecessary.
This commit is contained in:
itsmattkc
2019-12-16 16:43:27 +11:00
parent 1fd62948e8
commit baab21a3ab
4 changed files with 129 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewer.cpp
+28 -3
View File
@@ -93,12 +93,12 @@ void ViewerWidget::SetTimebase(const rational &r)
playback_timer_.setInterval(qFloor(r.toDouble()));
}
const double &ViewerWidget::scale()
const double &ViewerWidget::scale() const
{
return ruler_->scale();
}
rational ViewerWidget::GetTime()
rational ViewerWidget::GetTime() const
{
return olive::timestamp_to_time(ruler_->GetTime(), time_base_);
}
@@ -123,7 +123,7 @@ void ViewerWidget::TogglePlayPause()
}
}
bool ViewerWidget::IsPlaying()
bool ViewerWidget::IsPlaying() const
{
return playback_timer_.isActive();
}
@@ -171,6 +171,11 @@ ViewerOutput *ViewerWidget::GetConnectedViewer() const
return viewer_node_;
}
void ViewerWidget::SetColorMenuEnabled(bool enabled)
{
gl_widget_->SetColorMenuEnabled(enabled);
}
void ViewerWidget::SetTexture(OpenGLTexturePtr tex)
{
if (tex == nullptr) {
@@ -337,6 +342,26 @@ void ViewerWidget::ShuttleRight()
}
}
void ViewerWidget::SetOCIOParameters(const QString &display, const QString &view, const QString &look)
{
gl_widget_->SetOCIOParameters(display, view, look);
}
void ViewerWidget::SetOCIODisplay(const QString &display)
{
gl_widget_->SetOCIODisplay(display);
}
void ViewerWidget::SetOCIOView(const QString &view)
{
gl_widget_->SetOCIOView(view);
}
void ViewerWidget::SetOCIOLook(const QString &look)
{
gl_widget_->SetOCIOLook(look);
}
void ViewerWidget::PlaybackTimerUpdate()
{
int64_t real_time = QDateTime::currentMSecsSinceEpoch() - start_msec_;