Skip to content

Commit bafc40f

Browse files
committed
LP-597 fixes from review
- m_timer_tick -> m_timerTick - rename signals: setPlaybackPosition -> playbackPositionChanged & setBeginAndEndTimes -> timesChanged - remove extraneous parentheses - make pretty
1 parent ba0869c commit bafc40f

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

ground/gcs/src/libs/utils/logfile.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ LogFile::LogFile(QObject *parent) : QIODevice(parent),
4242
m_providedTimeStamp(0),
4343
m_beginTimeStamp(0),
4444
m_endTimeStamp(0),
45-
m_timer_tick(0)
45+
m_timerTick(0)
4646
{
4747
connect(&m_timer, &QTimer::timeout, this, &LogFile::timerFired);
4848
}
@@ -154,7 +154,7 @@ void LogFile::timerFired()
154154
if (m_replayState != PLAYING) {
155155
return;
156156
}
157-
m_timer_tick++;
157+
m_timerTick++;
158158

159159
if (m_file.bytesAvailable() > TIMESTAMP_SIZE_BYTES) {
160160
int time;
@@ -210,8 +210,8 @@ void LogFile::timerFired()
210210
emit readyRead();
211211

212212
// rate-limit slider bar position updates to 10 updates per second
213-
if (m_timer_tick % 10 == 0) {
214-
emit setPlaybackPosition(m_nextTimeStamp);
213+
if (m_timerTick % 10 == 0) {
214+
emit playbackPositionChanged(m_nextTimeStamp);
215215
}
216216
// read next timestamp
217217
if (m_file.bytesAvailable() < (qint64)sizeof(m_nextTimeStamp)) {
@@ -262,7 +262,7 @@ bool LogFile::startReplay()
262262
return false;
263263
}
264264

265-
m_timer_tick = 0;
265+
m_timerTick = 0;
266266

267267
if (!m_file.isOpen() || m_timer.isActive()) {
268268
return false;
@@ -552,7 +552,7 @@ bool LogFile::buildIndex()
552552
}
553553
}
554554

555-
emit setBeginAndEndTimes(m_beginTimeStamp, m_endTimeStamp);
555+
emit timesChanged(m_beginTimeStamp, m_endTimeStamp);
556556

557557
// reset the read pointer to the start of the file
558558
m_file.seek(0);

ground/gcs/src/libs/utils/logfile.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ protected slots:
9797

9898
signals:
9999
void replayStarted();
100-
void replayFinished(); // Emitted on error during replay or when logfile disconnected
101-
void replayCompleted(); // Emitted at the end of normal logfile playback
102-
void setPlaybackPosition(quint32);
103-
void setBeginAndEndTimes(quint32, quint32);
100+
void replayFinished(); // Emitted on error during replay or when logfile disconnected
101+
void replayCompleted(); // Emitted at the end of normal logfile playback
102+
void playbackPositionChanged(quint32);
103+
void timesChanged(quint32, quint32);
104104

105105
protected:
106106
QByteArray m_dataBuffer;
@@ -123,7 +123,7 @@ protected slots:
123123
qint32 m_providedTimeStamp;
124124
quint32 m_beginTimeStamp;
125125
quint32 m_endTimeStamp;
126-
quint32 m_timer_tick;
126+
quint32 m_timerTick;
127127
QVector<quint32> m_timeStamps;
128128
QVector<qint64> m_timeStampPositions;
129129

ground/gcs/src/plugins/logging/logginggadgetwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ void LoggingGadgetWidget::setPlugin(LoggingPlugin *p)
8181

8282
// Feedback from logfile to GUI
8383
connect(loggingPlugin, &LoggingPlugin::stateChanged, this, &LoggingGadgetWidget::stateChanged);
84-
connect(logFile, &LogFile::setBeginAndEndTimes, this, &LoggingGadgetWidget::setBeginAndEndTimes);
85-
connect(logFile, &LogFile::setPlaybackPosition, this, &LoggingGadgetWidget::setPlaybackPosition);
84+
connect(logFile, &LogFile::timesChanged, this, &LoggingGadgetWidget::setBeginAndEndTimes);
85+
connect(logFile, &LogFile::playbackPositionChanged, this, &LoggingGadgetWidget::setPlaybackPosition);
8686
connect(logFile, &LogFile::replayStarted, this, &LoggingGadgetWidget::enableWidgets);
8787
connect(logFile, &LogFile::replayFinished, this, &LoggingGadgetWidget::disableWidgets);
8888
connect(logFile, &LogFile::replayCompleted, this, &LoggingGadgetWidget::stopButtonAction);
@@ -96,7 +96,7 @@ void LoggingGadgetWidget::setPlugin(LoggingPlugin *p)
9696

9797
void LoggingGadgetWidget::playButtonAction()
9898
{
99-
ReplayState replayState = (loggingPlugin->getLogfile())->getReplayState();
99+
ReplayState replayState = loggingPlugin->getLogfile()->getReplayState();
100100

101101
if (replayState != PLAYING) {
102102
emit resumeReplay(m_logging->playbackPosition->value());
@@ -109,7 +109,7 @@ void LoggingGadgetWidget::playButtonAction()
109109

110110
void LoggingGadgetWidget::pauseButtonAction()
111111
{
112-
ReplayState replayState = (loggingPlugin->getLogfile())->getReplayState();
112+
ReplayState replayState = loggingPlugin->getLogfile()->getReplayState();
113113

114114
if (replayState == PLAYING) {
115115
emit pauseReplay();

0 commit comments

Comments
 (0)