From e013dc42ba693d7397c8c770a4fc94fb612dcea7 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Thu, 15 Mar 2018 16:26:31 +0000
Subject: [PATCH] Display number of QSOs in progress rather than number of
 Hounds queued.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8562 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp       |  9 ++++-----
 messageaveraging.cpp |  2 +-
 messageaveraging.ui  | 30 ++++++++++++++++++++++++++----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3112196e8..bf9f0dc55 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -7428,10 +7428,6 @@ void MainWindow::selectHound(QString line)
   QTextCursor cursor = ui->textBrowser4->textCursor();
   cursor.setPosition(0);                                 // Scroll to top of list
   ui->textBrowser4->setTextCursor(cursor);
-  if(m_msgAvgWidget != NULL and m_msgAvgWidget->isVisible()) {
-    m_msgAvgWidget->foxLabQueued(m_houndQueue.size());
-  }
-
 }
 
 //------------------------------------------------------------------------------
@@ -7657,7 +7653,10 @@ Transmit:
     if(age < 3600) break;
     m_foxRateQueue.dequeue();
   }
-  m_msgAvgWidget->foxLabRate(m_foxRateQueue.size());
+  if(m_msgAvgWidget != NULL and m_msgAvgWidget->isVisible()) {
+    m_msgAvgWidget->foxLabRate(m_foxRateQueue.size());
+    m_msgAvgWidget->foxLabQueued(m_foxQSOqueue.count());
+  }
 }
 
 void MainWindow::rm_tb4(QString houndCall)
diff --git a/messageaveraging.cpp b/messageaveraging.cpp
index 684d69084..052de7273 100644
--- a/messageaveraging.cpp
+++ b/messageaveraging.cpp
@@ -105,7 +105,7 @@ void MessageAveraging::foxLabCallers(int n)
 void MessageAveraging::foxLabQueued(int n)
 {
   QString t;
-  t.sprintf("Queued: %3d",n);
+  t.sprintf("In progress: %3d",n);
   ui->lab2->setText(t);
 }
 
diff --git a/messageaveraging.ui b/messageaveraging.ui
index 7588ce08c..7bb37df00 100644
--- a/messageaveraging.ui
+++ b/messageaveraging.ui
@@ -55,7 +55,7 @@
         <widget class="QLabel" name="lab1">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>77</width>
            <height>20</height>
           </size>
          </property>
@@ -68,17 +68,39 @@
         <widget class="QLabel" name="lab2">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>77</width>
            <height>20</height>
           </size>
          </property>
          <property name="text">
-          <string>Queued:    0</string>
+          <string>In progress:    0</string>
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>25</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QLabel" name="lab3">
+         <property name="minimumSize">
+          <size>
+           <width>77</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Logged:    0</string>
          </property>
@@ -88,7 +110,7 @@
         <widget class="QLabel" name="lab4">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>77</width>
            <height>20</height>
           </size>
          </property>