LP-597 Progress bar for GCS log replay - Resize playPause and stop buttons according to the available space for the widget.

- also make pretty

Author: dr-oblivium

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

@@ -165,7 +165,7 @@ void LogFile::timerFired()
         /*
             This code generates an advancing playback window. All samples that fit the window
             are replayed. The window is about the size of the timer interval: 10 ms.
-  
+
             Description of used variables:
 
             time              : real-time interval since start of playback (in ms) - now()
@@ -176,8 +176,7 @@ void LogFile::timerFired()
 
          */
 
-        while ( m_nextTimeStamp < (m_lastPlayed + (double)(time - m_timeOffset) * m_playbackSpeed) ) {
-
+        while (m_nextTimeStamp < (m_lastPlayed + (double)(time - m_timeOffset) * m_playbackSpeed)) {
             // advance the replay window for the next time period
             m_lastPlayed += ((double)(time - m_timeOffset) * m_playbackSpeed);
 
@@ -344,12 +343,11 @@ bool LogFile::resumeReplay(quint32 desiredPosition)
        Looking for the next log timestamp after the desired position
        has the advantage that it skips over parts of the log
        where data might be missing.
-    */
+     */
     for (int i = 0; i < m_timeStamps.size(); i++) {
         if (m_timeStamps.at(i) >= desiredPosition) {
-
             int bytesToSkip = m_timeStampPositions.at(i);
-            bool seek_ok = m_file.seek(bytesToSkip);
+            bool seek_ok    = m_file.seek(bytesToSkip);
             if (!seek_ok) {
                 qWarning() << "LogFile resumeReplay - an error occurred while seeking through the logfile.";
             }
@@ -365,7 +363,7 @@ bool LogFile::resumeReplay(quint32 desiredPosition)
 
     // Set the real-time interval to 0 to start with:
     m_myTime.restart();
-    m_timeOffset = 0;
+    m_timeOffset   = 0;
 
     m_replayStatus = PLAYING;
 
@@ -409,7 +407,7 @@ bool LogFile::pauseAndResetPosition()
     }
     qDebug() << "LogFile - pauseAndResetPosition";
     m_timer.stop();
-    m_replayStatus = STOPPED;
+    m_replayStatus      = STOPPED;
 
     m_timeOffset        = 0;
     m_lastPlayed        = m_timeStamps.at(0);
@@ -467,10 +465,10 @@ bool LogFile::buildIndex()
         }
         m_timeStamps.append(timeStamp);
         m_timeStampPositions.append(readPointer);
-        readPointer += TIMESTAMP_SIZE_BYTES;
+        readPointer     += TIMESTAMP_SIZE_BYTES;
         index++;
         m_beginTimeStamp = timeStamp;
-        m_endTimeStamp = timeStamp;
+        m_endTimeStamp   = timeStamp;
     }
 
     while (true) {
@@ -511,7 +509,7 @@ bool LogFile::buildIndex()
             if (bytesRead != TIMESTAMP_SIZE_BYTES) {
                 qWarning() << "LogFile buildIndex - read timeStamp, readRawData returned unexpected number of bytes:" << bytesRead << "at position" << readPointer << "\n";
                 return false;
-           }
+            }
 
             // some validity checks
             if (timeStamp < m_endTimeStamp // logfile goes back in time
@@ -522,7 +520,7 @@ bool LogFile::buildIndex()
 
             m_timeStamps.append(timeStamp);
             m_timeStampPositions.append(readPointer);
-            readPointer += TIMESTAMP_SIZE_BYTES;
+            readPointer   += TIMESTAMP_SIZE_BYTES;
             index++;
             m_endTimeStamp = timeStamp;
         } else {

ground/gcs/src/plugins/logging/logging.ui

@@ -36,8 +36,8 @@
        <item>
         <widget class="QPushButton" name="playPauseButton">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
+          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+           <horstretch>80</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
@@ -47,11 +47,17 @@
            <height>0</height>
           </size>
          </property>
+         <property name="maximumSize">
+          <size>
+           <width>80</width>
+           <height>16777215</height>
+          </size>
+         </property>
          <property name="text">
           <string>  Play</string>
          </property>
          <property name="icon">
-          <iconset resource="../logging/res.qrc">
+          <iconset resource="res.qrc">
            <normaloff>:/logging/images/play.png</normaloff>:/logging/images/play.png</iconset>
          </property>
          <property name="iconSize">
@@ -65,8 +71,8 @@
        <item>
         <widget class="QPushButton" name="stopButton">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
+          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+           <horstretch>80</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
@@ -76,11 +82,17 @@
            <height>0</height>
           </size>
          </property>
+         <property name="maximumSize">
+          <size>
+           <width>80</width>
+           <height>16777215</height>
+          </size>
+         </property>
          <property name="text">
           <string>  Stop</string>
          </property>
          <property name="icon">
-          <iconset resource="../logging/res.qrc">
+          <iconset resource="res.qrc">
            <normaloff>:/logging/images/stop.png</normaloff>:/logging/images/stop.png</iconset>
          </property>
          <property name="iconSize">
@@ -113,6 +125,12 @@
        </item>
        <item>
         <widget class="QDoubleSpinBox" name="playbackSpeed">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -203,6 +221,12 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>40</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -229,6 +253,12 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>40</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -255,6 +285,12 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>40</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -283,7 +319,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../logging/res.qrc"/>
+  <include location="res.qrc"/>
  </resources>
  <connections/>
 </ui>