From 7622915147c248f120289d5802ba82c273e84750 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 7 Dec 2023 13:00:21 -0500
Subject: [PATCH] Add submode to display of decoded messages.

---
 qmap/libqmap/q65b.f90 | 20 +++++++++++---------
 qmap/mainwindow.ui    |  9 +++------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/qmap/libqmap/q65b.f90 b/qmap/libqmap/q65b.f90
index 797f3686e..617c8f648 100644
--- a/qmap/libqmap/q65b.f90
+++ b/qmap/libqmap/q65b.f90
@@ -24,7 +24,8 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,          &
   character*12 mycall,hiscall
   character*6 hisgrid
   character*4 grid4
-  character*60 result
+  character*3 csubmode
+  character*60 result,ctmp
   character*20 datetime
   common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy,              &
        nWTransmitting,result(50)
@@ -117,15 +118,16 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,          &
      ndecodes=ndecodes+1
      frx=0.001*k0*df+nkhz_center-48.0+1.0 - 0.001*nfcal
      fsked=frx - 0.001*ndop00/2.0 - 0.001*offset
-     if(ntrperiod.eq.60) then
-        write(result(ndecodes),1120) nutc,frx,fsked,xdt0,nsnr0,trim(msg0)
-1120    format(i4.4,f9.3,f7.1,f7.2,i5,2x,a)
-     else
-        nhhmmss=100*nutc
-        if(iseq.eq.1) nhhmmss=100*nutc+30
-        write(result(ndecodes),1121) nhhmmss,frx,fsked,xdt0,nsnr0,trim(msg0)
-1121    format(i6.6,f9.3,f7.1,f7.2,i5,2x,a)
+     nhhmmss=100*nutc
+     csubmode(1:2)='60'
+     csubmode(3:3)=char(ichar('A')+nsubmode)
+     if(ntrperiod.eq.30) then
+        csubmode(1:2)='30'
+        nhhmmss=100*nutc + iseq*30
      endif
+     ctmp=csubmode//'  '//trim(msg0)
+     write(result(ndecodes),1120) nhhmmss,frx,fsked,xdt0,nsnr0,trim(ctmp)
+1120 format(i6.6,f9.3,f7.1,f7.2,i5,2x,a)
      write(12,1130) datetime,trim(result(ndecodes)(5:))
 1130 format(a11,1x,a)
      result(ndecodes)=trim(result(ndecodes))//char(0)
diff --git a/qmap/mainwindow.ui b/qmap/mainwindow.ui
index b2c893394..e7764d944 100644
--- a/qmap/mainwindow.ui
+++ b/qmap/mainwindow.ui
@@ -355,7 +355,7 @@
          </size>
         </property>
         <property name="title">
-         <string>     UTC                Frx            Fsked             DT           dB       Message</string>
+         <string>      UTC                   Frx              Fsked             DT           dB       Q65-     Message</string>
         </property>
         <layout class="QFormLayout" name="formLayout_2">
          <item row="0" column="0" colspan="2">
@@ -398,11 +398,8 @@
            </property>
            <property name="html">
             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-hr { height: 1px; border-width: 0; }
-li.unchecked::marker { content: &quot;\2610&quot;; }
-li.checked::marker { content: &quot;\2612&quot;; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
@@ -424,7 +421,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">