diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index 8d39dce1cee5cc0663e94714bc6f9ca97d1334c8..e3242e1c3f560dc1809cba023be78027f8106fca 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/src/ui/QGCMAVLinkLogPlayer.cc @@ -24,18 +24,22 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(QWidget *parent) : // Setup buttons connect(_ui->selectFileButton, &QPushButton::clicked, this, &QGCMAVLinkLogPlayer::_selectLogFileForPlayback); connect(_ui->playButton, &QPushButton::clicked, this, &QGCMAVLinkLogPlayer::_playPauseToggle); - connect(_ui->speedSlider, &QSlider::valueChanged, this, &QGCMAVLinkLogPlayer::_setAccelerationFromSlider); connect(_ui->positionSlider, &QSlider::valueChanged, this, &QGCMAVLinkLogPlayer::_setPlayheadFromSlider); connect(_ui->positionSlider, &QSlider::sliderPressed, this, &QGCMAVLinkLogPlayer::_pause); +#if 0 + // Speed slider is removed from 3.0 release. Too broken to fix. + connect(_ui->speedSlider, &QSlider::valueChanged, this, &QGCMAVLinkLogPlayer::_setAccelerationFromSlider); + _ui->speedSlider->setMinimum(-100); + _ui->speedSlider->setMaximum(100); + _ui->speedSlider->setValue(0); +#endif + _enablePlaybackControls(false); _ui->positionSlider->setMinimum(0); _ui->positionSlider->setMaximum(100); - _ui->speedSlider->setMinimum(-100); - _ui->speedSlider->setMaximum(100); - _ui->speedSlider->setValue(0); } QGCMAVLinkLogPlayer::~QGCMAVLinkLogPlayer() @@ -90,7 +94,9 @@ void QGCMAVLinkLogPlayer::_selectLogFileForPlayback(void) connect(_replayLink, &LogReplayLink::disconnected, this, &QGCMAVLinkLogPlayer::_replayLinkDisconnected); _ui->positionSlider->setValue(0); +#if 0 _ui->speedSlider->setValue(0); +#endif } void QGCMAVLinkLogPlayer::_playbackError(void) @@ -155,10 +161,13 @@ void QGCMAVLinkLogPlayer::_setPlayheadFromSlider(int value) void QGCMAVLinkLogPlayer::_enablePlaybackControls(bool enabled) { _ui->playButton->setEnabled(enabled); +#if 0 _ui->speedSlider->setEnabled(enabled); +#endif _ui->positionSlider->setEnabled(enabled); } +#if 0 void QGCMAVLinkLogPlayer::_setAccelerationFromSlider(int value) { //qDebug() << value; @@ -183,6 +192,7 @@ void QGCMAVLinkLogPlayer::_setAccelerationFromSlider(int value) _ui->speedLabel->setText(QString("Speed: %1X").arg(accelerationFactor, 5, 'f', 2, '0')); } +#endif void QGCMAVLinkLogPlayer::_replayLinkDisconnected(void) { diff --git a/src/ui/QGCMAVLinkLogPlayer.h b/src/ui/QGCMAVLinkLogPlayer.h index a347e931ad620f6cf44026cd2689d1ae08401555..da63a27e5bf0e060ff9f28453a996742ba3c881d 100644 --- a/src/ui/QGCMAVLinkLogPlayer.h +++ b/src/ui/QGCMAVLinkLogPlayer.h @@ -33,7 +33,9 @@ private slots: void _playPauseToggle(void); void _pause(void); void _setPlayheadFromSlider(int value); +#if 0 void _setAccelerationFromSlider(int value); +#endif void _logFileStats(bool logTimestamped, int logDurationSeconds, int binaryBaudRate); void _playbackStarted(void); void _playbackPaused(void); diff --git a/src/ui/QGCMAVLinkLogPlayer.ui b/src/ui/QGCMAVLinkLogPlayer.ui index 663c2b85294a97757feb6cdd39ef5306aec031c0..6693ac3366b171efa74c07c2a03296c90f86f714 100644 --- a/src/ui/QGCMAVLinkLogPlayer.ui +++ b/src/ui/QGCMAVLinkLogPlayer.ui @@ -48,7 +48,7 @@ ... - + :/res/Play:/res/Play @@ -82,50 +82,6 @@ - - - - Current replay speed - - - Current replay speed - - - Current replay speed - - - Speed - - - - - - - Set the replay speed - - - Set the replay speed - - - Set the replay speed - - - 1 - - - 100 - - - 50 - - - 50 - - - Qt::Horizontal - - - @@ -152,7 +108,7 @@ - +