From 05cd8b3462239d0cc0f48af9c322664b5f228fd1 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 4 Jun 2020 11:32:19 -0400
Subject: [PATCH] Improved logic for the way "Lookup" is processed.

---
 widgets/mainwindow.cpp | 25 ++++++++++++++++---------
 widgets/mainwindow.h   |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 37dad9ebc..bfe28899e 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -2065,7 +2065,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       break;
     case Qt::Key_L:
       if(e->modifiers() & Qt::ControlModifier) {
-        lookup();
+        lookup(true);
         genStdMsgs(m_rpt);
         return;
       }
@@ -4912,12 +4912,10 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
     // i.e. compound version of same base call
     ui->dxCallEntry->setText (hiscall);
   }
-
   if (hisgrid.contains (grid_regexp)) {
     if(ui->dxGridEntry->text().mid(0,4) != hisgrid) ui->dxGridEntry->setText(hisgrid);
   }
-  if (!ui->dxGridEntry->text ().size ())
-    lookup();
+  lookup(false);
   m_hisGrid = ui->dxGridEntry->text();
 
   QString rpt = message.report();
@@ -5325,9 +5323,10 @@ void MainWindow::clearDX ()
   m_QSOProgress = CALLING;
 }
 
-void MainWindow::lookup()                                       //lookup()
+void MainWindow::lookup(bool lookupButtonClicked)
 {
   QString hisCall {ui->dxCallEntry->text()};
+  QString hisgrid0 {ui->dxGridEntry->text()};
   if (!hisCall.size ()) return;
   QFile f {m_config.writeable_data_dir ().absoluteFilePath ("CALL3.TXT")};
   if (f.open (QIODevice::ReadOnly | QIODevice::Text))
@@ -5337,7 +5336,13 @@ void MainWindow::lookup()                                       //lookup()
       for(int i=0; i<999999; i++) {
         n=f.readLine(c,sizeof(c));
         if(n <= 0) {
-          ui->dxGridEntry->clear ();
+          if(lookupButtonClicked) {
+            QString msg=hisCall + tr(" not found in CALL3.TXT");
+            MessageBox::information_message (this, msg);
+          }
+          if(!hisgrid0.contains(grid_regexp)) {
+            ui->dxGridEntry->clear();
+          }
           break;
         }
         QString t=QString(c);
@@ -5348,9 +5353,11 @@ void MainWindow::lookup()                                       //lookup()
           if(i1>0) {
             hisgrid=hisgrid.mid(0,4);
           } else {
-            hisgrid=hisgrid.mid(0,4) + hisgrid.mid(4,2).toLower();
+            hisgrid=hisgrid.mid(0,6).toUpper();
+          }
+          if(hisgrid.left(4)==hisgrid0.left(4) or (hisgrid0.size()==0)) {
+            ui->dxGridEntry->setText(hisgrid);
           }
-          ui->dxGridEntry->setText(hisgrid);
           break;
         }
       }
@@ -5360,7 +5367,7 @@ void MainWindow::lookup()                                       //lookup()
 
 void MainWindow::on_lookupButton_clicked()                    //Lookup button
 {
-  lookup();
+  lookup(true);
 }
 
 void MainWindow::on_addButton_clicked()                       //Add button
diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h
index 969993098..7a32c9d97 100644
--- a/widgets/mainwindow.h
+++ b/widgets/mainwindow.h
@@ -700,7 +700,7 @@ private:
   void genStdMsgs(QString rpt, bool unconditional = false);
   void genCQMsg();
   void clearDX ();
-  void lookup();
+  void lookup(bool lookupButtonClicked);
   void ba2msg(QByteArray ba, char* message);
   void msgtype(QString t, QLineEdit* tx);
   void stub();