OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4054 Remove play backwards and repeat backwards

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-02-12 08:42:02 +01:00
parent 8c130bbc6e
commit 2b9f6e10bc
2 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.cpp
View File

@ -78,13 +78,8 @@ void AnimationToolBar::init()
// Create actions and widgets
m_animSkipToStartAction = new QAction(QIcon(":/cafAnimControl/SkipToStart.png"), tr("Skip to Start"), this);
m_animStepBackwardAction = new QAction(QIcon(":/cafAnimControl/StepBwd.png"), tr("Step Backward"), this);
m_animPlayBwdAction = new QAction(QIcon(":/cafAnimControl/PlayBwd.png"), tr("Play Backwards"), this);
m_animPauseAction = new QAction(QIcon(":/cafAnimControl/Pause.png"), tr("Pause"), this);
m_animPlayAction = new QAction(QIcon(":/cafAnimControl/Play.png"), tr("Play"), this);
m_animPlayBwdButton = new QToolButton(this);
m_animPlayBwdButton->setIcon(m_animPlayBwdAction->icon());
m_animPlayBwdButton->setToolTip(m_animPlayBwdAction->toolTip());
QObject::connect(m_animPlayBwdButton, SIGNAL(clicked()), this, SLOT(playBwdClicked()));
m_animPlayPauseButton = new QToolButton(this);
m_animPlayPauseButton->setIcon(m_animPlayAction->icon());
m_animPlayPauseButton->setToolTip(m_animPlayAction->toolTip());
@ -95,8 +90,6 @@ void AnimationToolBar::init()
m_animRepeatFromStartAction = new QAction(QIcon(":/cafAnimControl/RepeatFromStart.png"), tr("Repeat From start"), this);
m_animRepeatFromStartAction->setCheckable(true);
m_animRepeatFwdBwdAction = new QAction(QIcon(":/cafAnimControl/RepeatFwdBwd.png"), tr("Repeat Forward/Backward"), this);
m_animRepeatFwdBwdAction->setCheckable(true);
m_timestepCombo = new QComboBox(this);
m_timestepCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
@ -124,7 +117,6 @@ void AnimationToolBar::init()
// Add actions and widgets to animation toolbar
addAction(m_animSkipToStartAction);
addAction(m_animStepBackwardAction);
addWidget(m_animPlayBwdButton);
addWidget(m_animPlayPauseButton);
addAction(m_animStepForwardAction);
addAction(m_animSkipToEndAction);
@ -132,7 +124,6 @@ void AnimationToolBar::init()
addAction(separator1);
addAction(m_animRepeatFromStartAction );
addAction(m_animRepeatFwdBwdAction );
addAction(separator2);
@ -171,11 +162,9 @@ void AnimationToolBar::updateAnimationButtons()
// Going backwards actions disabled when we're stopped at the start
m_animSkipToStartAction->setEnabled(isPlaying || !isAtStart);
m_animStepBackwardAction->setEnabled(isPlaying || !isAtStart);
m_animPlayBwdButton->setEnabled(isPlaying || !isAtStart);
bool isRepeat = m_activeAnimationControl &&
(m_activeAnimationControl->isRepeatingFromStart() ||
m_activeAnimationControl->isRepeatingFwdBwd());
m_activeAnimationControl->isRepeatingFromStart();
// Going forwards actions disabled when we're stopped at the end
m_animStepForwardAction->setEnabled(isPlaying || !isAtEnd);
@ -205,9 +194,7 @@ void AnimationToolBar::connectAnimationControl(caf::FrameAnimationControl* anima
m_animStepForwardAction->disconnect();
m_animSkipToEndAction->disconnect();
m_animPlayBwdAction ->disconnect();
m_animRepeatFromStartAction->disconnect();
m_animRepeatFwdBwdAction ->disconnect();
m_timestepCombo->disconnect();
m_frameRateSlider->disconnect();
@ -221,16 +208,9 @@ void AnimationToolBar::connectAnimationControl(caf::FrameAnimationControl* anima
connect(m_animStepForwardAction, SIGNAL(triggered()), animationControl, SLOT(slotStepForward()));
connect(m_animSkipToEndAction, SIGNAL(triggered()), animationControl, SLOT(slotSkipToEnd()));
connect(m_animPlayBwdAction ,SIGNAL(triggered()), animationControl, SLOT(slotPlayBwd()));
m_animRepeatFromStartAction->setChecked(animationControl->isRepeatingFromStart());
m_animRepeatFwdBwdAction->setChecked(animationControl->isRepeatingFwdBwd());
connect(m_animRepeatFromStartAction,SIGNAL(triggered(bool)), animationControl, SLOT(slotRepeatFromStart(bool)));
connect(m_animRepeatFwdBwdAction ,SIGNAL(triggered(bool)), animationControl, SLOT(slotRepeatFwdBwd(bool)));
connect(m_animRepeatFromStartAction,SIGNAL(triggered(bool)), this, SLOT(slotFromStartModeToggled(bool)));
connect(m_animRepeatFwdBwdAction ,SIGNAL(triggered(bool)), this, SLOT(slotFwdBwdModeToggled(bool)));
connect(m_timestepCombo, SIGNAL(currentIndexChanged(int)), animationControl, SLOT(setCurrentFrame(int)));
connect(m_frameRateSlider, SIGNAL(valueChanged(int)), this, SLOT(slotFrameRateSliderChanged(int)));
@ -357,15 +337,6 @@ void AnimationToolBar::slotUpdateTimestepList(int frameCount)
m_timestepCombo->blockSignals(false);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void AnimationToolBar::playBwdClicked()
{
m_animPlayBwdAction->trigger();
updateAnimationButtons();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -383,34 +354,6 @@ void AnimationToolBar::playPauseChanged()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void AnimationToolBar::slotFromStartModeToggled(bool on)
{
if (on)
{
m_animRepeatFwdBwdAction->blockSignals(true);
m_animRepeatFwdBwdAction->setChecked(false);
updateAnimationButtons();
m_animRepeatFwdBwdAction->blockSignals(false);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void AnimationToolBar::slotFwdBwdModeToggled(bool on)
{
if (on)
{
m_animRepeatFromStartAction->blockSignals(true);
m_animRepeatFromStartAction->setChecked(false);
updateAnimationButtons();
m_animRepeatFromStartAction->blockSignals(false);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.h
View File

@ -74,13 +74,10 @@ public:
public slots:
void slotUpdateTimestepList(int frameCount);
void playBwdClicked();
void playPauseChanged();
private slots:
void slotFrameRateSliderChanged(int value);
void slotFromStartModeToggled(bool on);
void slotFwdBwdModeToggled(bool on);
void slotUpdateAnimationGuiFromFrameIndex(int value);
private:
@ -89,8 +86,6 @@ private:
private:
QAction* m_animSkipToStartAction;
QAction* m_animStepBackwardAction;
QAction* m_animPlayBwdAction;
QToolButton* m_animPlayBwdButton;
QToolButton* m_animPlayPauseButton;
QAction* m_animPauseAction;
QAction* m_animPlayAction;
@ -98,7 +93,6 @@ private:
QAction* m_animSkipToEndAction;
QAction* m_animRepeatFromStartAction;
QAction* m_animRepeatFwdBwdAction;
QSlider* m_frameRateSlider;