From f492a2560ded4980b68165ec18204294c17eb9ab Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 22 Dec 2017 17:25:16 +0000
Subject: [PATCH] Clean up behavior for Fox with compound callsign.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8363 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 CMakeLists.txt     |  2 +-
 Versions.cmake     |  4 ++--
 lib/ft8/ft8sim.f90 |  3 ++-
 mainwindow.cpp     | 19 ++++++++++++-------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd74059f2..384f05faa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -949,7 +949,7 @@ if (Fortran_COMPILER_NAME MATCHES "gfortran.*")
     set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
   endif (CMAKE_OSX_SYSROOT)
 
-  set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -funroll-all-loops -fno-f2c ${General_FFLAGS}")
+  set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fbounds-check -funroll-all-loops -fno-f2c ${General_FFLAGS}")
   set (CMAKE_Fortran_FLAGS_DEBUG   "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}")
 elseif (Fortran_COMPILER_NAME MATCHES "ifort.*")
   # ifort (untested)
diff --git a/Versions.cmake b/Versions.cmake
index 11b2106d3..bf77ff75e 100644
--- a/Versions.cmake
+++ b/Versions.cmake
@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 1)
-set (WSJTX_VERSION_MINOR 7)
-set (WSJTX_VERSION_PATCH 1)
+set (WSJTX_VERSION_MINOR 8)
+set (WSJTX_VERSION_PATCH 2)
 set (WSJTX_RC 0)		 # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
diff --git a/lib/ft8/ft8sim.f90 b/lib/ft8/ft8sim.f90
index 1b7bddf4c..f5c008b72 100644
--- a/lib/ft8/ft8sim.f90
+++ b/lib/ft8/ft8sim.f90
@@ -92,7 +92,8 @@ program ft8sim
         c0=0.
         if(nsig.eq.2) then
            if(index(msg,'R-').gt.0) f0=500
-           msg(9:9)=char(ichar('W')+isig)
+           i1=index(msg,' ')
+           msg(i1+4:i1+4)=char(ichar('A')+isig-1)
            if(isig.eq.2) then
               f0=f0+100
            endif
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 36c1bbe2e..6538657c5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -902,7 +902,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
 
   if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
      m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ" or
-     m_config.my_callsign()=="K1ABC") {
+     m_config.my_callsign()=="K1ABC" or m_config.my_callsign()=="K1ABC/2" or
+     m_config.my_callsign()=="KH1/KH7Z") {
     ui->actionWSPR_LF->setEnabled(true);
   } else {
     QString errorMsg;
@@ -2853,11 +2854,15 @@ void MainWindow::readFromStdout()                             //readFromStdout
             ui->cbVHFcontest->isChecked(), m_config.my_grid ()};
 
       if(m_mode=="FT8" and m_config.bFox() and
-         decodedtext.string().contains(" " + m_config.my_callsign() + " ") and
          (decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
-        QString houndCall,houndGrid;
-        decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid);
-        foxRxSequencer(decodedtext.string(),houndCall,houndGrid);
+        auto for_us  = decodedtext.string().contains(" " + m_config.my_callsign() + " ") or
+            decodedtext.string().contains(" "+m_baseCall) or
+            decodedtext.string().contains(m_baseCall+" ");
+        if(for_us) {
+          QString houndCall,houndGrid;
+          decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid);
+          foxRxSequencer(decodedtext.string(),houndCall,houndGrid);
+        }
       }
 
       //Left (Band activity) window
@@ -7189,7 +7194,7 @@ QString MainWindow::sortHoundCalls(QString t, int isort, int max_dB)
   nlines=lines.length()-1;
   for(i=0; i<nlines; i++) {
     msg=lines.at(i);                        //key = callsign
-    if(msg.mid(13,1)==" ") msg=msg.mid(0,16) + "_" + msg.mid(17);
+    if(msg.mid(13,1)==" ") msg=msg.mid(0,13) + "...." + msg.mid(17);
     houndCall=msg.split(" ").at(0);         //value = "call grid snr freq dist age"
     map[houndCall]=msg;
   }
@@ -7413,7 +7418,7 @@ void MainWindow::foxTxSequencer()
              << m_rptRcvd << m_lastBand;
     QDateTime logTime {QDateTime::currentDateTimeUtc ()};
     QString logLine=logTime.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall +
-        " " + m_hisGrid + "  " + m_rptSent + "  " + m_rptRcvd + " " + m_lastBand;
+        "  " + m_hisGrid + "  " + m_rptSent + "  " + m_rptRcvd + " " + m_lastBand;
     if(m_msgAvgWidget != NULL and m_msgAvgWidget->isVisible()) {
       m_msgAvgWidget->foxAddLog(logLine);
     }