From 0de8e994b9767845661ff151b40a5912daf08340 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Wed, 26 Jul 2017 22:03:02 +0000
Subject: [PATCH] Extend grids looked up from CALL3.TXT from 4 to 6-digits if
 first 4 match

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

diff --git a/mainwindow.cpp b/mainwindow.cpp
index bb953c0a4..72903c172 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1776,7 +1776,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       break;
     case Qt::Key_L:
       if(e->modifiers() & Qt::ControlModifier) {
-        lookup();
+        lookup (true);
         genStdMsgs(m_rpt);
         return;
       }
@@ -4203,7 +4203,7 @@ void MainWindow::clearDX ()
   m_QSOProgress = CALLING;
 }
 
-void MainWindow::lookup()                                       //lookup()
+void MainWindow::lookup (bool extend_grid)
 {
   QString hisCall {ui->dxCallEntry->text()};
   if (!hisCall.size ()) return;
@@ -4215,7 +4215,7 @@ void MainWindow::lookup()                                       //lookup()
       for(int i=0; i<999999; i++) {
         n=f.readLine(c,sizeof(c));
         if(n <= 0) {
-          ui->dxGridEntry->clear ();
+          if (!extend_grid) ui->dxGridEntry->clear ();
           break;
         }
         QString t=QString(c);
@@ -4228,7 +4228,10 @@ void MainWindow::lookup()                                       //lookup()
           } else {
             hisgrid=hisgrid.mid(0,4) + hisgrid.mid(4,2).toLower();
           }
-          ui->dxGridEntry->setText(hisgrid);
+          if (!ui->dxGridEntry->text ().size ()
+              || (extend_grid && 6 == hisgrid.size () && hisgrid.left (4) == ui->dxGridEntry->text ())) {
+            ui->dxGridEntry->setText(hisgrid);
+          }
           break;
         }
       }
@@ -4238,7 +4241,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/mainwindow.h b/mainwindow.h
index 4404532da..9ff062b2d 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -578,7 +578,8 @@ private:
   void genStdMsgs(QString rpt, bool unconditional = false);
   void genCQMsg();
   void clearDX ();
-  void lookup();
+  void lookup (bool extend_grid = false); // extend_grid will fetch a
+                                          // 6-digit grid if available
   void ba2msg(QByteArray ba, char* message);
   void msgtype(QString t, QLineEdit* tx);
   void stub();