t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for issue #159 on github - Auto stroll sometimes didn't work and

Browse Source 
playback didn't always update the current frame#.
This commit is contained in:
Collin Kidder
2019-02-13 22:38:20 -05:00
parent 151217bc3f
commit 842831e929
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameplaybackobject.cpp
+4
View File
@@ -231,6 +231,7 @@ void FramePlaybackObject::stepPlaybackForward()
playbackActive = false; playbackActive = false;
updatePosition(true); updatePosition(true);
CANConManager::getInstance()->sendFrames(sendingBuffer); CANConManager::getInstance()->sendFrames(sendingBuffer);
emit statusUpdate(currentPosition);
} }
void FramePlaybackObject::stepPlaybackBackward() void FramePlaybackObject::stepPlaybackBackward()
@@ -248,6 +249,7 @@ void FramePlaybackObject::stepPlaybackBackward()
updatePosition(false); updatePosition(false);
CANConManager::getInstance()->sendFrames(sendingBuffer); CANConManager::getInstance()->sendFrames(sendingBuffer);
emit statusUpdate(currentPosition);
} }
void FramePlaybackObject::stopPlayback() void FramePlaybackObject::stopPlayback()
@@ -262,6 +264,7 @@ void FramePlaybackObject::stopPlayback()
playbackTimer->stop(); //pushing this button halts automatic playback playbackTimer->stop(); //pushing this button halts automatic playback
playbackActive = false; playbackActive = false;
currentPosition = 0; currentPosition = 0;
emit statusUpdate(currentPosition);
} }
void FramePlaybackObject::pausePlayback() void FramePlaybackObject::pausePlayback()
@@ -275,6 +278,7 @@ void FramePlaybackObject::pausePlayback()
playbackActive = false; playbackActive = false;
playbackTimer->stop(); playbackTimer->stop();
emit statusUpdate(currentPosition);
} }
void FramePlaybackObject::setSequenceObject(SequenceItem *item) void FramePlaybackObject::setSequenceObject(SequenceItem *item)
frameplaybackwindow.cpp
+1 -1
View File
@@ -539,6 +539,7 @@ void FramePlaybackWindow::btnReverseClick()
forward = false; forward = false;
isPlaying = true; isPlaying = true;
playbackObject.startPlaybackBackward(); playbackObject.startPlaybackBackward();
updateFrameLabel();
} }
void FramePlaybackWindow::btnStopClick() void FramePlaybackWindow::btnStopClick()
@@ -559,7 +560,6 @@ void FramePlaybackWindow::btnStopClick()
ui->tblSequence->setCurrentCell(0, 0); ui->tblSequence->setCurrentCell(0, 0);
refreshIDList(); refreshIDList();
} }
updateFrameLabel();
} }
void FramePlaybackWindow::btnPlayClick() void FramePlaybackWindow::btnPlayClick()
mainwindow.cpp
+1 -1
View File
@@ -470,7 +470,7 @@ void MainWindow::tickGUIUpdate()
framesPerSec = 0; framesPerSec = 0;
ui->lbNumFrames->setText(QString::number(model->rowCount())); 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)); ui->lbFPS->setText(QString::number(framesPerSec));
if (rxFrames > 0) if (rxFrames > 0)
{ {