diff --git a/Source/Fractorium/Fractorium.cpp b/Source/Fractorium/Fractorium.cpp index a75172c..637fa5e 100644 --- a/Source/Fractorium/Fractorium.cpp +++ b/Source/Fractorium/Fractorium.cpp @@ -234,7 +234,7 @@ Fractorium::~Fractorium() { SyncSequenceSettings(); m_VarDialog->SyncSettings(); - m_Settings->ShowXforms(ui.ActionDrawPreAffines->isChecked() || ui.ActionDrawPostAffines->isChecked()); + m_Settings->ShowXforms(ui.ActionDrawPreAffines->isChecked() || ui.ActionDrawPostAffines->isChecked()); m_Settings->ShowGrid(ui.ActionDrawGrid->isChecked()); m_Settings->setValue("windowState", saveState()); m_Settings->sync(); @@ -487,6 +487,10 @@ bool Fractorium::eventFilter(QObject* o, QEvent* e) return true; } + else if (!DrawXforms())//Everything below this must be for editing xforms via key press. + { + return true; + } else if (ke->key() == Qt::Key_W) { wcount++; @@ -1079,8 +1083,6 @@ void Fractorium::SetTabOrders() w = SetTabOrder(this, w, ui.PreScaleCombo); w = SetTabOrder(this, w, ui.PreScaleUpButton); w = SetTabOrder(this, w, ui.PreRandomButton); - w = SetTabOrder(this, w, ui.ShowPreAffineSelectedRadio); - w = SetTabOrder(this, w, ui.ShowPreAffineAllRadio); w = SetTabOrder(this, w, ui.SwapAffinesButton); w = SetTabOrder(this, w, ui.PostAffineGroupBox); w = SetTabOrder(this, w, m_PostX1Spin); @@ -1108,8 +1110,6 @@ void Fractorium::SetTabOrders() w = SetTabOrder(this, w, ui.PostScaleCombo); w = SetTabOrder(this, w, ui.PostScaleUpButton); w = SetTabOrder(this, w, ui.PostRandomButton); - w = SetTabOrder(this, w, ui.ShowPostAffineSelectedRadio); - w = SetTabOrder(this, w, ui.ShowPostAffineAllRadio); w = SetTabOrder(this, w, ui.PolarAffineCheckBox); w = SetTabOrder(this, w, ui.LocalPivotRadio); w = SetTabOrder(this, w, ui.WorldPivotRadio); diff --git a/Source/Fractorium/Fractorium.h b/Source/Fractorium/Fractorium.h index 51a6455..5117e44 100644 --- a/Source/Fractorium/Fractorium.h +++ b/Source/Fractorium/Fractorium.h @@ -16,7 +16,7 @@ #include "PaletteEditor/PaletteEditor.h" /// -/// An enum representing the type of edit being done. +/// An enum representing the affines being shown. /// enum class eAffineState : int { PRE, ALL_PRE, POST, ALL_POST }; @@ -121,8 +121,8 @@ public: void CurrentXform(uint i); //Xforms Affine. - bool DrawPreAffines(); - bool DrawPostAffines(); + bool DrawPreAffines(); + bool DrawPostAffines(); bool DrawSelectedPre(); bool DrawAllPre(); bool DrawSelectedPost(); @@ -181,8 +181,8 @@ public slots: void OnActionDP(bool checked); void OnActionStyle(bool checked); void OnActionStartStopRenderer(bool checked); - void OnActionDrawAffines(bool checked); - void OnActionDrawAllAffines(bool checked); + void OnActionDrawAffines(bool checked); + void OnActionDrawAllAffines(bool checked); void OnActionDrawImage(bool checked); void OnActionDrawGrid(bool checked); @@ -420,8 +420,8 @@ private: bool HaveFinal(); //Toolbar. - void SaveAffineState(); - void SyncAffineStateToToolbar(); + void SaveAffineState(); + void SyncAffineStateToToolbar(); void SyncOptionsToToolbar(); //Library. @@ -602,7 +602,7 @@ private: QColor m_VariationTreeBgColorNonZero, m_VariationTreeBgColorZero; vector m_Docks; - bool m_PreviousAffineState[4]; + bool m_PreviousAffineState[4]; int m_FontSize; int m_VarSortMode; int m_PaletteSortMode; diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui index 331f559..3917fd2 100644 --- a/Source/Fractorium/Fractorium.ui +++ b/Source/Fractorium/Fractorium.ui @@ -80,8 +80,8 @@ 0 0 - 1213 - 978 + 1277 + 985 @@ -173,7 +173,7 @@ 0 0 230 - 928 + 934 @@ -263,30 +263,30 @@ false - - 35 - 145 false + + 35 + true false - - 22 - 22 false + + 22 + false @@ -455,30 +455,30 @@ false - - 15 - 15 false + + 15 + true false - - 15 - 15 false + + 15 + Geometry @@ -536,30 +536,30 @@ false - - 15 - 15 false + + 15 + true false - - 15 - 15 false + + 15 + Iteration @@ -636,30 +636,30 @@ false - - 15 - 15 false + + 15 + true false - - 15 - 15 false + + 15 + Filter @@ -773,30 +773,30 @@ false - - 35 - 120 false + + 35 + true false - - 22 - 22 false + + 22 + false @@ -1123,30 +1123,30 @@ false - - 35 - 145 false + + 35 + true false - - 22 - 22 false + + 22 + false @@ -1299,30 +1299,30 @@ false - - 15 - 15 false + + 15 + true false - - 15 - 15 false + + 15 + Animation @@ -1408,30 +1408,30 @@ false - - 35 - 145 false + + 35 + true false - - 22 - 22 false + + 22 + Interpolation @@ -1572,30 +1572,30 @@ false - - 35 - 120 false + + 35 + true false - - 22 - 22 false + + 22 + false @@ -1821,30 +1821,30 @@ false - - 15 - 15 false + + 15 + true false - - 16 - 16 false + + 16 + Color @@ -2093,27 +2093,27 @@ false - - 35 - 35 false + + 35 + false - - 22 - 22 false + + 22 + @@ -2216,10 +2216,10 @@ false - + 35 - + 35 @@ -2231,10 +2231,10 @@ false - + 22 - + 22 @@ -2290,17 +2290,14 @@ true - - 35 - 35 false - - 22 + + 35 22 @@ -2308,6 +2305,9 @@ false + + 22 + @@ -2370,8 +2370,8 @@ 0 0 - 389 - 690 + 285 + 675 @@ -2474,10 +2474,10 @@ false - + 62 - + 62 @@ -2486,15 +2486,15 @@ false - - 22 - 22 false + + 22 + @@ -2713,10 +2713,10 @@ false - + 20 - + 20 @@ -2825,15 +2825,15 @@ false - - 16 - 16 false + + 16 + false @@ -3059,8 +3059,8 @@ 0 0 - 277 - 880 + 291 + 876 @@ -3409,30 +3409,30 @@ false - - 27 - 110 false + + 27 + true false - - 21 - 21 false + + 21 + @@ -3502,7 +3502,7 @@ QTabWidget::Triangular - 1 + 2 @@ -3627,27 +3627,27 @@ false - - 27 - false + + 27 + true false - - 21 - 21 false + + 21 + false @@ -3963,30 +3963,30 @@ false - - 27 - 125 false + + 27 + true false - - 22 - 22 false + + 22 + false @@ -4219,7 +4219,7 @@ false - false + true 3 @@ -4230,15 +4230,15 @@ false - - 40 - 100 false + + 40 + true @@ -4248,15 +4248,15 @@ false - - 22 - 22 false + + 22 + false @@ -4897,62 +4897,6 @@ - - - - <html><head/><body><p>Show current only draws the current xform’s pre affine transform.</p><p>Show all draws all xforms’ pre affine transforms. This can sometimes clutter the view if the flame contains many xforms.</p></body></html> - - - false - - - Show - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - false - - - - 6 - - - 6 - - - 2 - - - 6 - - - 6 - - - - - Selected - - - - - - - All - - - true - - - - - - @@ -5080,7 +5024,7 @@ false - false + true 3 @@ -5091,15 +5035,15 @@ false - - 40 - 100 false + + 40 + true @@ -5109,15 +5053,15 @@ false - - 22 - 22 false + + 22 + false @@ -5791,56 +5735,6 @@ - - - - true - - - <html><head/><body><p>Show current only draws the current xform’s post affine transform.</p><p>Show all draws all xforms’ post affine transforms. This can sometimes clutter the view if the flame contains many xforms.</p></body></html> - - - false - - - Show - - - - 6 - - - 2 - - - 6 - - - 6 - - - - - Selected - - - true - - - - - - - true - - - All - - - - - - @@ -6061,15 +5955,15 @@ 3 - - 10 - 70 true + + 10 + true @@ -6293,8 +6187,8 @@ 0 0 - 253 - 646 + 267 + 670 @@ -6424,7 +6318,7 @@ 0 0 291 - 854 + 856 @@ -6554,10 +6448,10 @@ false - + 22 - + 22 @@ -6569,10 +6463,10 @@ false - + 21 - + 21 @@ -6689,12 +6583,12 @@ false - - 30 - 100 + + 30 + false @@ -7093,30 +6987,30 @@ false - - 27 - 110 false + + 27 + true false - - 22 - 22 false + + 22 + false @@ -7302,7 +7196,7 @@ 0 0 1712 - 22 + 20 @@ -7533,8 +7427,8 @@ 0 0 - 488 - 643 + 424 + 574 diff --git a/Source/Fractorium/FractoriumMenus.cpp b/Source/Fractorium/FractoriumMenus.cpp index 2c47a63..c5bb28e 100644 --- a/Source/Fractorium/FractoriumMenus.cpp +++ b/Source/Fractorium/FractoriumMenus.cpp @@ -766,20 +766,20 @@ void Fractorium::OnActionResetWorkspace(bool checked) /// Ignored void Fractorium::OnActionAlternateEditorImage(bool checked) { - if (DrawPreAffines() || DrawPostAffines()) + if (DrawPreAffines() || DrawPostAffines()) { - ui.ActionDrawPreAffines->setChecked(false); - ui.ActionDrawAllPreAffines->setChecked(false); - ui.ActionDrawPostAffines->setChecked(false); - ui.ActionDrawAllPostAffines->setChecked(false); - ui.ActionDrawGrid->setChecked(false); - ui.ActionDrawImage->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.ActionDrawImage->setChecked(false); - ui.ActionDrawGrid->setChecked(true); - SyncAffineStateToToolbar(); + ui.ActionDrawImage->setChecked(false); + ui.ActionDrawGrid->setChecked(true); + SyncAffineStateToToolbar(); } ui.GLDisplay->update(); diff --git a/Source/Fractorium/FractoriumToolbar.cpp b/Source/Fractorium/FractoriumToolbar.cpp index 684c10f..5c38c32 100644 --- a/Source/Fractorium/FractoriumToolbar.cpp +++ b/Source/Fractorium/FractoriumToolbar.cpp @@ -15,22 +15,22 @@ void Fractorium::InitToolbarUI() spGroup->addAction(ui.ActionDP); SyncOptionsToToolbar(); ui.ActionDrawImage->setChecked(true); - m_PreviousAffineState[(int)eAffineState::PRE] = true; - m_PreviousAffineState[(int)eAffineState::ALL_PRE] = true; - m_PreviousAffineState[(int)eAffineState::POST] = false; - m_PreviousAffineState[(int)eAffineState::ALL_POST] = false; - connect(ui.ActionCpu, SIGNAL(triggered(bool)), this, SLOT(OnActionCpu(bool)), Qt::QueuedConnection); - connect(ui.ActionCL, SIGNAL(triggered(bool)), this, SLOT(OnActionCL(bool)), Qt::QueuedConnection); - connect(ui.ActionSP, SIGNAL(triggered(bool)), this, SLOT(OnActionSP(bool)), Qt::QueuedConnection); - connect(ui.ActionDP, SIGNAL(triggered(bool)), this, SLOT(OnActionDP(bool)), Qt::QueuedConnection); - connect(ui.ActionStyle, SIGNAL(triggered(bool)), this, SLOT(OnActionStyle(bool)), Qt::QueuedConnection); - connect(ui.ActionStartStopRenderer, SIGNAL(triggered(bool)), this, SLOT(OnActionStartStopRenderer(bool)), Qt::QueuedConnection); - connect(ui.ActionDrawImage, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawImage(bool)), Qt::QueuedConnection); - connect(ui.ActionDrawPreAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAffines(bool)), Qt::QueuedConnection); - connect(ui.ActionDrawPostAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAffines(bool)), Qt::QueuedConnection); - connect(ui.ActionDrawAllPreAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAllAffines(bool)), Qt::QueuedConnection); - connect(ui.ActionDrawAllPostAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAllAffines(bool)), Qt::QueuedConnection); - connect(ui.ActionDrawGrid, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawGrid(bool)), Qt::QueuedConnection); + m_PreviousAffineState[int(eAffineState::PRE) ] = true; + m_PreviousAffineState[int(eAffineState::ALL_PRE) ] = true; + m_PreviousAffineState[int(eAffineState::POST) ] = false; + m_PreviousAffineState[int(eAffineState::ALL_POST)] = false; + connect(ui.ActionCpu, SIGNAL(triggered(bool)), this, SLOT(OnActionCpu(bool)), Qt::QueuedConnection); + connect(ui.ActionCL, SIGNAL(triggered(bool)), this, SLOT(OnActionCL(bool)), Qt::QueuedConnection); + connect(ui.ActionSP, SIGNAL(triggered(bool)), this, SLOT(OnActionSP(bool)), Qt::QueuedConnection); + connect(ui.ActionDP, SIGNAL(triggered(bool)), this, SLOT(OnActionDP(bool)), Qt::QueuedConnection); + connect(ui.ActionStyle, SIGNAL(triggered(bool)), this, SLOT(OnActionStyle(bool)), Qt::QueuedConnection); + connect(ui.ActionStartStopRenderer, SIGNAL(triggered(bool)), this, SLOT(OnActionStartStopRenderer(bool)), Qt::QueuedConnection); + connect(ui.ActionDrawImage, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawImage(bool)), Qt::QueuedConnection); + connect(ui.ActionDrawPreAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAffines(bool)), Qt::QueuedConnection); + connect(ui.ActionDrawPostAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAffines(bool)), Qt::QueuedConnection); + connect(ui.ActionDrawAllPreAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAllAffines(bool)), Qt::QueuedConnection); + connect(ui.ActionDrawAllPostAffines, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawAllAffines(bool)), Qt::QueuedConnection); + connect(ui.ActionDrawGrid, SIGNAL(triggered(bool)), this, SLOT(OnActionDrawGrid(bool)), Qt::QueuedConnection); } /// @@ -140,14 +140,13 @@ void Fractorium::OnActionStartStopRenderer(bool checked) /// Check state, show pre affines if true, else hide. void Fractorium::OnActionDrawAffines(bool checked) { - m_Settings->ShowXforms(checked); + m_Settings->ShowXforms(checked); - if (!ui.ActionDrawImage->isChecked() && !(ui.ActionDrawPreAffines->isChecked() || ui.ActionDrawPostAffines->isChecked())) - ui.ActionDrawImage->setChecked(true); + if (!ui.ActionDrawImage->isChecked() && !(ui.ActionDrawPreAffines->isChecked() || ui.ActionDrawPostAffines->isChecked())) + ui.ActionDrawImage->setChecked(true); - SaveAffineState(); - - ui.GLDisplay->update(); + SaveAffineState(); + ui.GLDisplay->update(); } /// @@ -157,8 +156,8 @@ void Fractorium::OnActionDrawAffines(bool checked) /// Check state, show all pre affines if true, else show selected. void Fractorium::OnActionDrawAllAffines(bool checked) { - SaveAffineState(); - ui.GLDisplay->update(); + SaveAffineState(); + ui.GLDisplay->update(); } /// @@ -168,8 +167,8 @@ void Fractorium::OnActionDrawAllAffines(bool checked) /// Check state, show image if true, else hide. void Fractorium::OnActionDrawImage(bool checked) { - if (!ui.ActionDrawImage->isChecked()) - SyncAffineStateToToolbar(); + if (!ui.ActionDrawImage->isChecked()) + SyncAffineStateToToolbar(); ui.GLDisplay->update(); } @@ -190,13 +189,13 @@ void Fractorium::OnActionDrawGrid(bool checked) /// void Fractorium::SaveAffineState() { - if(!ui.ActionDrawPreAffines->isChecked() && !ui.ActionDrawPostAffines->isChecked()) - return; + if (!ui.ActionDrawPreAffines->isChecked() && !ui.ActionDrawPostAffines->isChecked()) + return; - m_PreviousAffineState[(int)eAffineState::PRE] = ui.ActionDrawPreAffines->isChecked(); - m_PreviousAffineState[(int)eAffineState::ALL_PRE] = ui.ActionDrawAllPreAffines->isChecked(); - m_PreviousAffineState[(int)eAffineState::POST] = ui.ActionDrawPostAffines->isChecked(); - m_PreviousAffineState[(int)eAffineState::ALL_POST] = ui.ActionDrawAllPostAffines->isChecked(); + m_PreviousAffineState[int(eAffineState::PRE) ] = ui.ActionDrawPreAffines->isChecked(); + m_PreviousAffineState[int(eAffineState::ALL_PRE) ] = ui.ActionDrawAllPreAffines->isChecked(); + m_PreviousAffineState[int(eAffineState::POST) ] = ui.ActionDrawPostAffines->isChecked(); + m_PreviousAffineState[int(eAffineState::ALL_POST)] = ui.ActionDrawAllPostAffines->isChecked(); } /// @@ -205,10 +204,10 @@ void Fractorium::SaveAffineState() /// void Fractorium::SyncAffineStateToToolbar() { - ui.ActionDrawPreAffines->setChecked(m_PreviousAffineState[(int)eAffineState::PRE]); - ui.ActionDrawAllPreAffines->setChecked(m_PreviousAffineState[(int)eAffineState::ALL_PRE]); - ui.ActionDrawPostAffines->setChecked(m_PreviousAffineState[(int)eAffineState::POST]); - ui.ActionDrawAllPostAffines->setChecked(m_PreviousAffineState[(int)eAffineState::ALL_POST]); + ui.ActionDrawPreAffines->setChecked(m_PreviousAffineState [int(eAffineState::PRE) ]); + ui.ActionDrawAllPreAffines->setChecked(m_PreviousAffineState [int(eAffineState::ALL_PRE) ]); + ui.ActionDrawPostAffines->setChecked(m_PreviousAffineState [int(eAffineState::POST) ]); + ui.ActionDrawAllPostAffines->setChecked(m_PreviousAffineState[int(eAffineState::ALL_POST)]); } /// @@ -247,8 +246,7 @@ void Fractorium::SyncOptionsToToolbar() } ui.ActionDrawGrid->setChecked(m_Settings->ShowGrid()); - ui.ActionDrawPreAffines->setChecked(m_Settings->ShowXforms()); - ui.ActionDrawAllPreAffines->setChecked(m_Settings->ShowXforms()); - - SaveAffineState(); + ui.ActionDrawPreAffines->setChecked(m_Settings->ShowXforms()); + ui.ActionDrawAllPreAffines->setChecked(m_Settings->ShowXforms()); + SaveAffineState(); } diff --git a/Source/Fractorium/FractoriumXformsAffine.cpp b/Source/Fractorium/FractoriumXformsAffine.cpp index fdafc1a..a9c8946 100644 --- a/Source/Fractorium/FractoriumXformsAffine.cpp +++ b/Source/Fractorium/FractoriumXformsAffine.cpp @@ -96,10 +96,6 @@ void Fractorium::InitXformsAffineUI() connect(ui.PreAffineGroupBox, SIGNAL(toggled(bool)), this, SLOT(OnAffineGroupBoxToggled(bool)), Qt::QueuedConnection); connect(ui.PostAffineGroupBox, SIGNAL(toggled(bool)), this, SLOT(OnAffineGroupBoxToggled(bool)), Qt::QueuedConnection); connect(ui.SwapAffinesButton, SIGNAL(clicked(bool)), this, SLOT(OnSwapAffinesButtonClicked(bool)), Qt::QueuedConnection); - connect(ui.ShowPreAffineAllRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); - connect(ui.ShowPreAffineSelectedRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); - connect(ui.ShowPostAffineAllRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); - connect(ui.ShowPostAffineSelectedRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); connect(ui.PolarAffineCheckBox, SIGNAL(stateChanged(int)), this, SLOT(OnPolarAffineCheckBoxStateChanged(int)), Qt::QueuedConnection); #ifndef _WIN32 //For some reason linux makes these 24x24, even though the designer explicitly says 16x16. @@ -154,10 +150,8 @@ void Fractorium::InitXformsAffineUI() m_PostSpins[5] = m_PostO2Spin; ui.PreAffineGroupBox->setChecked(false);//Flip both once to force enabling/disabling the disabling of the group boxes and the corner buttons. ui.PreAffineGroupBox->setChecked(true);//Pre affine enabled. - ui.PostAffineGroupBox->setChecked(false); - ui.PostAffineGroupBox->setChecked(true);//Post affine enabled. - ui.PreAffineShowGroupBox->setVisible(false); // michel - to delete - ui.PostAffineShowGroupBox->setVisible(false); // michel - to delete + ui.PostAffineGroupBox->setChecked(false); + ui.PostAffineGroupBox->setChecked(true);//Post affine enabled. } /// diff --git a/Source/Fractorium/GLWidget.cpp b/Source/Fractorium/GLWidget.cpp index 1cbe296..d90c967 100644 --- a/Source/Fractorium/GLWidget.cpp +++ b/Source/Fractorium/GLWidget.cpp @@ -523,8 +523,8 @@ void GLWidget::paintGL() } //Affine drawing. - bool pre = m_Fractorium->DrawPreAffines(); - bool post = m_Fractorium->DrawPostAffines(); + bool pre = m_Fractorium->DrawPreAffines(); + bool post = m_Fractorium->DrawPostAffines(); this->glEnable(GL_BLEND); this->glEnable(GL_LINE_SMOOTH); this->glEnable(GL_POINT_SMOOTH); @@ -1757,8 +1757,8 @@ void GLWidget::DrawAffineHelper(int index, float circleWidth, float lineWidth, b template int GLEmberController::UpdateHover(const v3T& glCoords) { - bool pre = m_Fractorium->DrawPreAffines(); - bool post = m_Fractorium->DrawPostAffines(); + bool pre = m_Fractorium->DrawPreAffines(); + bool post = m_Fractorium->DrawPostAffines(); int i = 0, bestIndex = -1; T bestDist = 10; auto ember = m_FractoriumEmberController->CurrentEmber();