From 5d0236755d993ab75170faf6cc70998619c3e32c Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 4 Dec 2017 18:58:38 +0000
Subject: [PATCH] Further progress with fox-mode coding.  Not finished yet!

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8289 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 commons.h          | 5 +++--
 lib/ft8/foxgen.f90 | 3 +--
 mainwindow.cpp     | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/commons.h b/commons.h
index ee10ff1bb..126681ccb 100644
--- a/commons.h
+++ b/commons.h
@@ -82,8 +82,9 @@ extern struct {
 
 extern struct {
   float wave[606720];
-  int nslots;
-  char cmsg[5][32];
+  int   nslots;
+  int   i3bit[5];
+  char  cmsg[5][32];
 } foxcom_;
 
 #ifdef __cplusplus
diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90
index 1ff128c2f..a6f7c6dc7 100644
--- a/lib/ft8/foxgen.f90
+++ b/lib/ft8/foxgen.f90
@@ -11,7 +11,7 @@ subroutine foxgen()
   real x(NFFT),y(NFFT)
   real*8 dt,twopi,f0,fstep,dfreq,phi,dphi
   complex cx(0:NH),cy(0:NH)
-  common/foxcom/wave(NWAVE),nslots,cmsg(5)
+  common/foxcom/wave(NWAVE),nslots,i3bit(5),cmsg(5)
   equivalence (x,cx),(y,cy)
 
   call system_clock(count0,clkfreq)
@@ -25,7 +25,6 @@ subroutine foxgen()
 
   do n=1,nslots
      i3bit=0
-     print*,n,i3bit,cmsg(n)
      msg=cmsg(n)(1:22)
      call genft8(msg,"      ",bcontest,i3bit,msgsent,msgbits,itone)
      
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9f50e0474..c00523b71 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2782,8 +2782,8 @@ void MainWindow::decodeDone ()
           m_logBook.match(/*in*/houndCall,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
           int i1=countryName.lastIndexOf(";");
           continent=countryName.mid(i1+2,-1);
-          qDebug() << "D" << t0 << continent;
-          t += (t0 + "\n");  //Don't list calls already in QSO or in the stack
+//          qDebug() << "D" << t0 << continent;
+          t = t + t0 + "  " + continent + "\n";  //Don't list calls already in QSO or in the stack
         }
       }
       if(t.length()>30) {
@@ -3342,7 +3342,7 @@ void MainWindow::guiUpdate()
                   if(t1.indexOf("-")>=0 or t1.indexOf("+")>6) m_houndRptSent[i]=t1;
                   msg[i]= m_houndCall[i] + m_config.my_callsign() + t1;
                 }
-                if(msg[i]=="") msg[i]=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() + m_houndRptSent[i];
+                if(msg[i]=="") msg[i]=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() +
                     " " + m_config.my_grid().mid(0,4);
                 msg[i] += "                                ";
                 msg[i]=msg[i].mid(0,32);
@@ -3351,6 +3351,9 @@ void MainWindow::guiUpdate()
                 }
                 ui->decodedTextBrowser2->displayTransmittedText(msg[i], m_modeTx,
                       300+60*i,m_config.color_TxMsg(),m_bFastMode);
+                foxcom_.i3bit[i]=0;
+                if(msg[i].indexOf("<")>0) foxcom_.i3bit[i]=1;
+                qDebug() << i << foxcom_.i3bit[i] << msg[i].trimmed();
                 strncpy(&foxcom_.cmsg[i][0], msg[i].toLatin1(),32);
               }
               foxcom_.nslots=m_Nslots;