From 842831e929714477c8f36b043a62f0a10cdab94e Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Wed, 13 Feb 2019 22:38:20 -0500 Subject: [PATCH] Fixes for issue #159 on github - Auto stroll sometimes didn't work and playback didn't always update the current frame#. --- frameplaybackobject.cpp | 4 ++++ frameplaybackwindow.cpp | 2 +- mainwindow.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frameplaybackobject.cpp b/frameplaybackobject.cpp index e6acd84..0310141 100644 --- a/frameplaybackobject.cpp +++ b/frameplaybackobject.cpp @@ -231,6 +231,7 @@ void FramePlaybackObject::stepPlaybackForward() playbackActive = false; updatePosition(true); CANConManager::getInstance()->sendFrames(sendingBuffer); + emit statusUpdate(currentPosition); } void FramePlaybackObject::stepPlaybackBackward() @@ -248,6 +249,7 @@ void FramePlaybackObject::stepPlaybackBackward() updatePosition(false); CANConManager::getInstance()->sendFrames(sendingBuffer); + emit statusUpdate(currentPosition); } void FramePlaybackObject::stopPlayback() @@ -262,6 +264,7 @@ void FramePlaybackObject::stopPlayback() playbackTimer->stop(); //pushing this button halts automatic playback playbackActive = false; currentPosition = 0; + emit statusUpdate(currentPosition); } void FramePlaybackObject::pausePlayback() @@ -275,6 +278,7 @@ void FramePlaybackObject::pausePlayback() playbackActive = false; playbackTimer->stop(); + emit statusUpdate(currentPosition); } void FramePlaybackObject::setSequenceObject(SequenceItem *item) diff --git a/frameplaybackwindow.cpp b/frameplaybackwindow.cpp index 3d486bb..d200e0c 100644 --- a/frameplaybackwindow.cpp +++ b/frameplaybackwindow.cpp @@ -539,6 +539,7 @@ void FramePlaybackWindow::btnReverseClick() forward = false; isPlaying = true; playbackObject.startPlaybackBackward(); + updateFrameLabel(); } void FramePlaybackWindow::btnStopClick() @@ -559,7 +560,6 @@ void FramePlaybackWindow::btnStopClick() ui->tblSequence->setCurrentCell(0, 0); refreshIDList(); } - updateFrameLabel(); } void FramePlaybackWindow::btnPlayClick() diff --git a/mainwindow.cpp b/mainwindow.cpp index a980eb7..ff65fb3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -470,7 +470,7 @@ void MainWindow::tickGUIUpdate() framesPerSec = 0; ui->lbNumFrames->setText(QString::number(model->rowCount())); - if (allowCapture && ui->cbAutoScroll->isChecked()) ui->canFramesView->scrollToBottom(); + if (rxFrames > 0 && /*allowCapture && */ ui->cbAutoScroll->isChecked()) ui->canFramesView->scrollToBottom(); ui->lbFPS->setText(QString::number(framesPerSec)); if (rxFrames > 0) {