From 979e400c6d2ca2a142d4dfb973ca57df5232540e Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Sun, 28 Apr 2013 00:40:39 +0000
Subject: [PATCH] 1. Corrected a logic error in rigOpen() procedure. 2. Added a
 "Rig Open" indicator.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3235 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 11 +++++------
 mainwindow.ui  | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 23ddae545..86674f2fe 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -307,7 +307,6 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
   out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm")
       << "  " << m_dialFreq << " MHz  " << m_mode << endl;
   f2.close();
-
 }                                          // End of MainWindow constructor
 
 //--------------------------------------------------- MainWindow destructor
@@ -483,7 +482,6 @@ void MainWindow::readSettings()
   ui->actionLog_JT9_without_submode->setChecked(m_noSuffix);
   m_dBtoComments=settings.value("dBtoComments",false).toBool();
   ui->actionLog_dB_reports_to_Comments->setChecked(m_dBtoComments);
-  m_catEnabled=settings.value("catEnabled",false).toBool();
   m_rig=settings.value("Rig",214).toInt();
   m_rigIndex=settings.value("RigIndex",100).toInt();
   m_catPort=settings.value("CATport","None").toString();
@@ -499,6 +497,7 @@ void MainWindow::readSettings()
   m_band=settings.value("BandIndex",7).toInt();
   ui->bandComboBox->setCurrentIndex(m_band);
   dialFreqChanged2(m_dialFreq);
+  m_catEnabled=settings.value("catEnabled",false).toBool();
   m_promptToLog=settings.value("PromptToLog",false).toBool();
   ui->actionPrompt_to_log_QSO->setChecked(m_promptToLog);
   m_insertBlank=settings.value("InsertBlank",false).toBool();
@@ -635,6 +634,7 @@ void MainWindow::on_actionDeviceSetup_triggered()               //Setup Dialog
 
   if(m_bRigOpen) {
     rig->close();
+    ui->labRigOpen->setStyleSheet("");
     delete rig;
     m_bRigOpen=false;
     m_catEnabled=false;
@@ -2490,11 +2490,9 @@ void MainWindow::on_bandComboBox_currentIndexChanged(int index)
   if(m_catEnabled) {
     if(!m_bRigOpen) {
       rigOpen();
-      m_bRigOpen = true;
     }
-    rig->setFreq(MHz(m_dialFreq));
+    if(m_bRigOpen) rig->setFreq(MHz(m_dialFreq));
   }
-
   QFile f2("ALL.TXT");
   f2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append);
   QTextStream out(&f2);
@@ -2689,11 +2687,12 @@ void MainWindow::rigOpen()
     rigMode=rig->getMode(bw);
     if(rigMode!=RIG_MODE_USB) rig->setMode(RIG_MODE_USB);
     m_bRigOpen=true;
+    ui->labRigOpen->setStyleSheet("QLabel{background-color: red}");
   }
   catch (const RigException &Ex) {
     m_catEnabled=false;
     m_bRigOpen=false;
-    msgBox("Failed to open rig (mainwindow)");
+    ui->labRigOpen->setStyleSheet("");
     delete rig;
   }
 }
diff --git a/mainwindow.ui b/mainwindow.ui
index ec96e3ea8..2ca16edad 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2149,6 +2149,31 @@ p, li { white-space: pre-wrap; }
           </layout>
          </widget>
         </item>
+        <item row="0" column="2">
+         <widget class="QLabel" name="labRigOpen">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>20</horstretch>
+            <verstretch>20</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>10</width>
+            <height>10</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>10</width>
+            <height>10</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>