Merged in mmastriani/fractorium_michel (pull request #34)

--User changes -Add pre/post in Toolbar

Approved-by: Matt Feemster <matt.feemster@gmail.com>
This commit is contained in:
Michel Mastriani
2020-01-25 22:50:48 +00:00
committed by Matt Feemster
11 changed files with 328 additions and 222 deletions

View File

@ -766,17 +766,20 @@ void Fractorium::OnActionResetWorkspace(bool checked)
/// <param name="checked">Ignored</param>
void Fractorium::OnActionAlternateEditorImage(bool checked)
{
if (DrawImage())
if (DrawPreAffines() || DrawPostAffines())
{
ui.ActionDrawImage->setChecked(false);
ui.ActionDrawXforms->setChecked(true);
ui.ActionDrawGrid->setChecked(true);
ui.ActionDrawPreAffines->setChecked(false);
ui.ActionDrawAllPreAffines->setChecked(false);
ui.ActionDrawPostAffines->setChecked(false);
ui.ActionDrawAllPostAffines->setChecked(false);
ui.ActionDrawGrid->setChecked(false);
ui.ActionDrawImage->setChecked(true);
}
else
{
ui.ActionDrawXforms->setChecked(false);
ui.ActionDrawGrid->setChecked(false);
ui.ActionDrawImage->setChecked(true);
ui.ActionDrawImage->setChecked(false);
ui.ActionDrawGrid->setChecked(true);
SyncAffineStateToToolbar();
}
ui.GLDisplay->update();