From 79bdc5c82f592ab0f205624a9cebe0a92811de7a Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Tue, 7 May 2013 18:19:15 +0000
Subject: [PATCH] 1. Correct annoying bug producing infinite "Error rigOpen -1"
 messages: must do a rig->Close() if user has done "Test CAT Control" and then
 hit "Cancel".

2. Remove the "0%" part of Rx noise label; exchange positions of "Rx
Noise" and "QSO Freq" on Status Bar.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3260 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 devsetup.cpp   |  7 +++++++
 devsetup.h     |  1 +
 mainwindow.cpp | 12 ++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/devsetup.cpp b/devsetup.cpp
index b2a9bd961..412b802ef 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -284,6 +284,13 @@ void DevSetup::accept()
   QDialog::accept();
 }
 
+//------------------------------------------------------- reject()
+void DevSetup::reject()
+{
+  if(m_bRigOpen) rig->close();
+  QDialog::reject();
+}
+
 void DevSetup::p4ReadFromStdout()                        //p4readFromStdout
 {
   while(p4.canReadLine()) {
diff --git a/devsetup.h b/devsetup.h
index 0fdcf3814..e922198f0 100644
--- a/devsetup.h
+++ b/devsetup.h
@@ -65,6 +65,7 @@ public:
 
 public slots:
   void accept();
+  void reject();
   void p4ReadFromStdout();
   void p4ReadFromStderr();
   void p4Error();
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e2f833529..e7f45e10f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -572,8 +572,8 @@ void MainWindow::dataSink(int k)
   if(ihsym <=0) return;
   QString t;
   m_pctZap=nzap*100.0/m_nsps;
-  t.sprintf(" Rx noise: %5.1f  %5.1f %% ",px,m_pctZap);
-  lab3->setText(t);
+  t.sprintf(" Rx noise: %5.1f ",px);
+  lab2->setText(t);
   ui->xThermo->setValue((double)px);                    //Update thermometer
   if(m_monitoring || m_diskData) {
     g_pWideGraph->dataSink2(s,red,df3,ihsym,m_diskData,lstrong);
@@ -914,13 +914,13 @@ void MainWindow::createStatusBar()                           //createStatusBar
 
   lab2 = new QLabel("");
   lab2->setAlignment(Qt::AlignHCenter);
-  lab2->setMinimumSize(QSize(90,18));
+  lab2->setMinimumSize(QSize(80,18));
   lab2->setFrameStyle(QFrame::Panel | QFrame::Sunken);
   statusBar()->addWidget(lab2);
 
   lab3 = new QLabel("");
   lab3->setAlignment(Qt::AlignHCenter);
-  lab3->setMinimumSize(QSize(80,18));
+  lab3->setMinimumSize(QSize(90,18));
   lab3->setFrameStyle(QFrame::Panel | QFrame::Sunken);
   statusBar()->addWidget(lab3);
 
@@ -932,7 +932,7 @@ void MainWindow::createStatusBar()                           //createStatusBar
 
   lab5 = new QLabel("");
   lab5->setAlignment(Qt::AlignHCenter);
-  lab5->setMinimumSize(QSize(100,18));
+  lab5->setMinimumSize(QSize(150,18));
   lab5->setFrameStyle(QFrame::Panel | QFrame::Sunken);
   statusBar()->addWidget(lab5);
 }
@@ -1668,7 +1668,7 @@ void MainWindow::guiUpdate()
     ui->monitorButton->setStyleSheet("");
   }
 
-  lab2->setText("QSO Freq:  " + QString::number(g_pWideGraph->QSOfreq()));
+  lab3->setText("QSO Freq:  " + QString::number(g_pWideGraph->QSOfreq()));
 
   if(m_startAnother) {
     m_startAnother=false;