Skip to content

Commit

Permalink
Sped up color corrections and comparison wipes.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Apr 19, 2024
1 parent 8af4498 commit 19d0932
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
1 change: 1 addition & 0 deletions mrv2/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ v1.1.3
playing and ability to toggle track and clip info.
- New action icons, which should display properly at high resolutions.
- Sped up comparison wipes with Alt and Shift dragging.
- Sped up color corrections from the Color Panel.


v1.1.2
Expand Down
23 changes: 22 additions & 1 deletion mrv2/lib/mrvApp/mrvMainControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ namespace mrv

p.displayOptions = value;

_widgetUpdate();
_displayUpdate();
}

void MainControl::setImageOptions(const timeline::ImageOptions& value)
Expand All @@ -214,6 +214,27 @@ namespace mrv
}
}

void MainControl::_displayUpdate()
{
TLRENDER_P();

Viewport* view = p.ui->uiView;
view->setLUTOptions(p.lutOptions);
view->setDisplayOptions({p.displayOptions});
if (p.ui->uiSecondary)
{
view = p.ui->uiSecondary->viewport();
view->setLUTOptions(p.lutOptions);
view->setDisplayOptions({p.displayOptions});
}

if (panel::colorPanel)
{
panel::colorPanel->setLUTOptions(p.lutOptions);
panel::colorPanel->setDisplayOptions(p.displayOptions);
}
}

void MainControl::_compareUpdate()
{
TLRENDER_P();
Expand Down
1 change: 1 addition & 0 deletions mrv2/lib/mrvApp/mrvMainControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace mrv
void _timelinePlayersUpdate();
void _widgetUpdate();
void _compareUpdate();
void _displayUpdate();

TLRENDER_PRIVATE();
};
Expand Down

0 comments on commit 19d0932

Please sign in to comment.