1. Activated "Name" and Comments" fields on the LogQSO confirmation screen.

2. Decoding now starts at t=50 s rather than t=52 s.
3. Label on "Auto is On/Off" button changed to "Enable Tx".
4. Three new options on the Setup menu, to help importing ADIF log into some
   fussy loggers:
   - Log HT9 without submode
   - Convert JT9-x to RTTY for logging
   - Log dB reports to Comments



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3077 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

logqso.cpp

@@ -19,10 +19,19 @@ LogQSO::~LogQSO()
 void LogQSO::initLogQSO(QString hisCall, QString hisGrid, QString mode,
                         QString rptSent, QString rptRcvd, QString date,
                         QString qsoStart, QString qsoStop, double dialFreq,
-                        QString myCall, QString myGrid)
+                        QString myCall, QString myGrid, bool noSuffix,
+                        bool toRTTY, bool dBtoComments)
 {
   ui->call->setText(hisCall);
   ui->grid->setText(hisGrid);
+  if(dBtoComments) {
+    QString t=mode;
+    if(rptSent!="") t+="  Sent: " + rptSent;
+    if(rptRcvd!="") t+="  Rcvd: " + rptRcvd;
+    ui->comments->setText(t);
+  }
+  if(noSuffix and mode.mid(0,3)=="JT9") mode="JT9";
+  if(toRTTY and mode.mid(0,3)=="JT9") mode="RTTY";
   ui->mode->setText(mode);
   ui->sent->setText(rptSent);
   ui->rcvd->setText(rptRcvd);
@@ -71,6 +80,7 @@ void LogQSO::accept()
     m.exec();
   } else {
     QString hisCall,hisGrid,mode,rptSent,rptRcvd,date,qsoStart,band;
+    QString comments,name;
 //    if(qsoStart=="") qsoStart=qsoStop;
 //    if(qsoStop=="") qsoStop=qsoStart;
 
@@ -83,6 +93,8 @@ void LogQSO::accept()
     date=date.mid(0,4) + date.mid(5,2) + date.mid(8,2);
     qsoStart=ui->time->text();
     band=ui->band->text();
+    name=ui->name->text();
+    comments=ui->comments->text();
 
     QString strDialFreq(QString::number(m_dialFreq,'f',6));
 
@@ -104,6 +116,10 @@ void LogQSO::accept()
         m_myCall;
     t+=" <my_gridsquare:" + QString::number(m_myGrid.length()) + ">" +
         m_myGrid;
+    if(comments!="") t+=" <comment:" + QString::number(comments.length()) +
+        ">" + comments;
+    if(name!="") t+=" <name:" + QString::number(name.length()) +
+        ">" + name;
     t+=" <eor>";
     out << t << endl;
     f2.close();

logqso.h

@@ -18,7 +18,8 @@ public:
   void initLogQSO(QString hisCall, QString hisGrid, QString mode,
                   QString rptSent, QString rptRcvd, QString date,
                   QString qsoStart, QString qsoStop, double dialFreq,
-                  QString myCall, QString myGrid);
+                  QString myCall, QString myGrid, bool noSuffix,
+                  bool toRTTY, bool dBtoComments);
 
   double m_dialFreq;
   QString m_myCall;

logqso.ui

@@ -406,7 +406,7 @@
       <item>
        <widget class="QLabel" name="lab9">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -427,7 +427,7 @@
          </size>
         </property>
         <property name="text">
-         <string>Op Name</string>
+         <string>Name</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -507,7 +507,7 @@
       <item>
        <widget class="QLineEdit" name="name">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -549,7 +549,7 @@
       <item>
        <widget class="QLabel" name="lab10">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="text">
          <string>Comments</string>
@@ -559,7 +559,7 @@
       <item>
        <widget class="QLineEdit" name="comments">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
        </widget>
       </item>

mainwindow.cpp

@@ -306,6 +306,9 @@ void MainWindow::writeSettings()
   settings.setValue("InGain",m_inGain);
   settings.setValue("PSKReporter",m_pskReporter);
   settings.setValue("Macros",m_macro);
+  settings.setValue("toRTTY",m_toRTTY);
+  settings.setValue("NoSuffix",m_noSuffix);
+  settings.setValue("dBtoComments",m_dBtoComments);
   settings.endGroup();
 }
 
@@ -370,6 +373,12 @@ void MainWindow::readSettings()
   ui->actionMonitor_OFF_at_startup->setChecked(m_monitorStartOFF);
   m_pskReporter=settings.value("PSKReporter",false).toBool();
   m_macro=settings.value("Macros","").toStringList();
+  m_toRTTY=settings.value("toRTTY",false).toBool();
+  ui->actionConvert_JT9_x_to_RTTY->setChecked(m_toRTTY);
+  m_noSuffix=settings.value("NoSuffix",false).toBool();
+  ui->actionLog_JT9_without_submode->setChecked(m_noSuffix);
+  m_dBtoComments=settings.value("dBtoComments",false).toBool();
+  ui->actionLog_dB_reports_to_Comments->setChecked(m_dBtoComments);
   settings.endGroup();
 
   if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() &&
@@ -546,11 +555,11 @@ void MainWindow::on_autoButton_clicked()                     //Auto
   m_auto = !m_auto;
   if(m_auto) {
     ui->autoButton->setStyleSheet(m_pbAutoOn_style);
-    ui->autoButton->setText("Auto is ON");
+//    ui->autoButton->setText("Auto is ON");
   } else {
     btxok=false;
     ui->autoButton->setStyleSheet("");
-    ui->autoButton->setText("Auto is OFF");
+//    ui->autoButton->setText("Auto is OFF");
     on_monitorButton_clicked();
   }
 }
@@ -1743,7 +1752,8 @@ void MainWindow::on_logQSOButton_clicked()                 //Log QSO button
 
   LogQSO logDlg(this);
   logDlg.initLogQSO(m_hisCall,m_hisGrid,m_mode,m_rptSent,m_rptRcvd,date,
-                    m_qsoStart,m_qsoStop,m_dialFreq,m_myCall,m_myGrid);
+                    m_qsoStart,m_qsoStop,m_dialFreq,m_myCall,m_myGrid,
+                    m_noSuffix,m_toRTTY,m_dBtoComments);
   if(logDlg.exec() == QDialog::Accepted) {
   }
   m_rptSent="";
@@ -1758,7 +1768,7 @@ void MainWindow::on_actionJT9_1_triggered()
   statusChanged();
   m_TRperiod=60;
   m_nsps=6912;
-  m_hsymStop=181;
+  m_hsymStop=173;
   soundInThread.setPeriod(m_TRperiod,m_nsps);
   soundOutThread.setPeriod(m_TRperiod,m_nsps);
   g_pWideGraph->setPeriod(m_TRperiod,m_nsps);
@@ -1967,3 +1977,18 @@ bool MainWindow::gridOK(QString g)
       g.mid(3,1).compare("9")<=0;
   return b;
 }
+
+void MainWindow::on_actionConvert_JT9_x_to_RTTY_triggered(bool checked)
+{
+  m_toRTTY=checked;
+}
+
+void MainWindow::on_actionLog_JT9_without_submode_triggered(bool checked)
+{
+  m_noSuffix=checked;
+}
+
+void MainWindow::on_actionLog_dB_reports_to_Comments_triggered(bool checked)
+{
+  m_dBtoComments=checked;
+}

mainwindow.h

@@ -125,8 +125,12 @@ private slots:
   void onPopup8();
   void onPopup9();
   void onPopup10();
+  void on_actionConvert_JT9_x_to_RTTY_triggered(bool checked);
+  void on_actionLog_JT9_without_submode_triggered(bool checked);
 
-  private:
+  void on_actionLog_dB_reports_to_Comments_triggered(bool checked);
+
+private:
     Ui::MainWindow *ui;
 
     double  m_dialFreq;
@@ -181,6 +185,9 @@ private slots:
     bool    m_monitorStartOFF;
     bool    m_pskReporter;
     bool    m_pskReporterInit;
+    bool    m_noSuffix;
+    bool    m_toRTTY;
+    bool    m_dBtoComments;
 
     char    m_decoded[80];
 

mainwindow.ui

@@ -206,7 +206,7 @@ p, li { white-space: pre-wrap; }
            </size>
           </property>
           <property name="text">
-           <string>&amp;Auto is OFF</string>
+           <string>Enable Tx</string>
           </property>
          </widget>
         </item>
@@ -225,7 +225,7 @@ p, li { white-space: pre-wrap; }
            </size>
           </property>
           <property name="text">
-           <string>St&amp;op Tx</string>
+           <string>Halt Tx</string>
           </property>
          </widget>
         </item>
@@ -1222,6 +1222,9 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionMonitor_OFF_at_startup"/>
     <addaction name="actionF4_sets_Tx6"/>
     <addaction name="separator"/>
+    <addaction name="actionLog_JT9_without_submode"/>
+    <addaction name="actionConvert_JT9_x_to_RTTY"/>
+    <addaction name="actionLog_dB_reports_to_Comments"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -1684,6 +1687,30 @@ p, li { white-space: pre-wrap; }
     <string>Erase wsjtx_log.adi</string>
    </property>
   </action>
+  <action name="actionLog_JT9_without_submode">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Log JT9 without submode</string>
+   </property>
+  </action>
+  <action name="actionConvert_JT9_x_to_RTTY">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Convert JT9-x to RTTY for logging</string>
+   </property>
+  </action>
+  <action name="actionLog_dB_reports_to_Comments">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Log dB reports to Comments</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>