From 966a801f4eb405360ff7255fb512cb04e6405be5 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 3 Apr 2013 15:35:11 +0000
Subject: [PATCH] 1. Blank lines between decoding periods now optional. 2. "CQ
 DX" is now treated properly when the decoded line is double.clicked. 3.
 Displayed sync values reduced by 1/2.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3124 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/decoder.f90 |  3 ++-
 mainwindow.cpp  | 13 ++++++++++++-
 mainwindow.h    |  4 ++--
 mainwindow.ui   | 29 +++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index 1404d14bf..dff39771d 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -111,7 +111,8 @@ subroutine decoder(ss,c0)
         call decode9(i1SoftSymbols,limit,nlim,msg)
         call timer('decode9 ',1)
  
-        sync=(syncpk-1.0)/2.0
+!        sync=(syncpk-1.0)/2.0
+        sync=(syncpk+1)/4.0
         if(sync.lt.0.0 .or. snrdb.lt.dblim-2.0) sync=0.0
         nsync=sync
         if(nsync.gt.10) nsync=10
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ea270f7bf..cdc5c70f5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -160,6 +160,7 @@ MainWindow::MainWindow(QWidget *parent) :
   m_secID=0;
   m_promptToLog=false;
   m_blankLine=false;
+  m_insertBlank=false;
   decodeBusy(false);
 
   ui->xThermo->setFillBrush(Qt::green);
@@ -369,6 +370,7 @@ void MainWindow::writeSettings()
   settings.setValue("HandshakeIndex",m_handshakeIndex);
   settings.setValue("BandIndex",m_band);
   settings.setValue("PromptToLog",m_promptToLog);
+  settings.setValue("InsertBlank",m_insertBlank);
   settings.endGroup();
 }
 
@@ -462,6 +464,8 @@ void MainWindow::readSettings()
   ui->bandComboBox->setCurrentIndex(m_band);
   m_promptToLog=settings.value("PromptToLog",false).toBool();
   ui->actionPrompt_to_log_QSO->setChecked(m_promptToLog);
+  m_insertBlank=settings.value("InsertBlank",false).toBool();
+  ui->actionBlank_line_between_decoding_periods->setChecked(m_insertBlank);
 
   settings.endGroup();
 
@@ -1180,7 +1184,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
 
       QTextCursor cursor;
       QTextBlockFormat bf;
-      if(m_blankLine) {
+      if(m_insertBlank and m_blankLine) {
         QString bg="#9fb6cd";
         bf.setBackground(QBrush(QColor(bg)));
         QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
@@ -1651,6 +1655,8 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
   int i4=t.mid(i1).length();
   if(i4>60) i4=60;
   QString t3=t.mid(i1,i4);
+  int i5=t3.indexOf(" CQ DX ");
+  if(i5>0) t3=t3.mid(0,i5+3) + "_" + t3.mid(i5+4);  //Make it "CQ_DX" (one word)
   QStringList t4=t3.split(" ",QString::SkipEmptyParts);
   if(t4.length() <7) return;           //Skip the rest if no decoded text
   QString firstcall=t4.at(6);
@@ -2244,3 +2250,8 @@ void MainWindow::on_actionPrompt_to_log_QSO_triggered(bool checked)
 {
   m_promptToLog=checked;
 }
+
+void MainWindow::on_actionBlank_line_between_decoding_periods_triggered(bool checked)
+{
+  m_insertBlank=checked;
+}
diff --git a/mainwindow.h b/mainwindow.h
index ebeee8584..76ab09a89 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -129,10 +129,9 @@ private slots:
   void startTx2();
   void stopTx();
   void stopTx2();
-
   void on_bandComboBox_currentIndexChanged(int index);
-
   void on_actionPrompt_to_log_QSO_triggered(bool checked);
+  void on_actionBlank_line_between_decoding_periods_triggered(bool checked);
 
 private:
     Ui::MainWindow *ui;
@@ -212,6 +211,7 @@ private:
     bool    m_After73;
     bool    m_promptToLog;
     bool    m_blankLine;
+    bool    m_insertBlank;
 
     char    m_decoded[80];
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 54fb424f6..045266bcf 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1633,6 +1633,23 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
+        <item row="0" column="11">
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Now</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="10">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Next</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
@@ -1675,6 +1692,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionConvert_JT9_x_to_RTTY"/>
     <addaction name="actionLog_dB_reports_to_Comments"/>
     <addaction name="actionPrompt_to_log_QSO"/>
+    <addaction name="actionBlank_line_between_decoding_periods"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -1744,6 +1762,9 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionDeviceSetup">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Options</string>
    </property>
@@ -2160,6 +2181,14 @@ p, li { white-space: pre-wrap; }
     <string>Prompt me to log QSO</string>
    </property>
   </action>
+  <action name="actionBlank_line_between_decoding_periods">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Blank line between decoding periods</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>