Fixes for issue #159 on github - Auto stroll sometimes didn't work and
playback didn't always update the current frame#.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
+1
-1
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user