Bump to v0.10.1

Configuration.ui

@@ -23,7 +23,7 @@
       <string>Select tab to change configuration parameters.</string>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="general_tab">
       <attribute name="title">
@@ -279,8 +279,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>738</width>
-                <height>453</height>
+                <width>654</width>
+                <height>489</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_26">
@@ -685,7 +685,7 @@ text message.</string>
                <item>
                 <widget class="QGroupBox" name="heartbeatGroupBox">
                  <property name="visible">
-                 <bool>true</bool>
+                  <bool>false</bool>
                  </property>
                  <property name="title">
                   <string>Heartbeat (HB)</string>
@@ -2031,7 +2031,7 @@ both here.</string>
             <x>0</x>
             <y>0</y>
             <width>746</width>
-            <height>525</height>
+            <height>554</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_30">
@@ -2078,13 +2078,13 @@ both here.</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="1">
+                <item row="1" column="1">
                  <widget class="QCheckBox" name="clear_callsign_check_box">
                   <property name="enabled">
                    <bool>true</bool>
                   </property>
                   <property name="visible">
-                   <bool>false</bool>
+                   <bool>true</bool>
                   </property>
                   <property name="toolTip">
                    <string>Check this option to force deselect callsign after logging.</string>
@@ -2111,7 +2111,7 @@ both here.</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1">
+                <item row="2" column="1">
                  <widget class="QCheckBox" name="report_in_comments_check_box">
                   <property name="enabled">
                    <bool>false</bool>
@@ -4067,12 +4067,12 @@ soundcard changes</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="TX_audio_source_button_group"/>
-  <buttongroup name="CAT_handshake_button_group"/>
-  <buttongroup name="CAT_data_bits_button_group"/>
   <buttongroup name="PTT_method_button_group"/>
-  <buttongroup name="CAT_stop_bits_button_group"/>
+  <buttongroup name="CAT_data_bits_button_group"/>
+  <buttongroup name="TX_audio_source_button_group"/>
   <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="CAT_handshake_button_group"/>
+  <buttongroup name="CAT_stop_bits_button_group"/>
   <buttongroup name="TX_mode_button_group"/>
  </buttongroups>
 </ui>

Versions.cmake

@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 0)
 set (WSJTX_VERSION_MINOR 10)
-set (WSJTX_VERSION_PATCH 0)
+set (WSJTX_VERSION_PATCH 1)
 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

mainwindow.cpp

@@ -3722,7 +3722,7 @@ void MainWindow::writeAllTxt(QString message, int bits)
         if(m_RxLog==1) {
           out << DriftingDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hh:mm:ss")
               << "  " << qSetRealNumberPrecision (12) << (m_freqNominal / 1.e6) << " MHz  "
-              << m_mode << endl;
+              << "JS8" << endl;
           m_RxLog=0;
         }
         auto dt = DecodedText(message, bits);
@@ -3827,7 +3827,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
         if(m_RxLog==1) {
           out << DriftingDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hh:mm:ss")
               << "  " << qSetRealNumberPrecision (12) << (m_freqNominal / 1.e6) << " MHz  "
-              << m_mode << endl;
+              << "JS8" << endl;
           m_RxLog=0;
         }
         int n=t.length();
@@ -5931,7 +5931,7 @@ void MainWindow::checkRepeat(){
 
     if(ui->cqMacroButton->isChecked() && m_cqInterval > 0 && m_nextCQ.isValid()){
         if(DriftingDateTime::currentDateTimeUtc().secsTo(m_nextCQ) <= 0){
-            sendCQ();
+            sendCQ(true);
         }
     }
 }
@@ -6620,7 +6620,7 @@ void MainWindow::buildCQMenu(QMenu *menu){
     menu->addSeparator();
 
     auto now = menu->addAction("Send CQ Message Now");
-    connect(now, &QAction::triggered, this, &MainWindow::sendCQ);
+    connect(now, &QAction::triggered, this, [this](){ sendCQ(true); });
 }
 
 void MainWindow::buildRepeatMenu(QMenu *menu, QPushButton * button, int * interval){
@@ -6693,7 +6693,7 @@ void MainWindow::on_hbMacroButton_toggled(bool checked){
 void MainWindow::on_hbMacroButton_clicked(){
 }
 
-void MainWindow::sendCQ(){
+void MainWindow::sendCQ(bool repeat){
     auto message = m_config.cq_message();
     if(message.isEmpty()){
         QString mygrid = m_config.my_grid().left(4);
@@ -6704,7 +6704,7 @@ void MainWindow::sendCQ(){
 
     addMessageText(replaceMacros(message, buildMacroValues(), true));
 
-    if(m_config.transmit_directed()) toggleTx(true);
+    if(repeat || m_config.transmit_directed()) toggleTx(true);
 }
 
 void MainWindow::on_cqMacroButton_toggled(bool checked){
@@ -7929,7 +7929,7 @@ void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const&
                 QTextStream out(&f2);
                 out << DriftingDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hh:mm:ss")
                     << "  " << qSetRealNumberPrecision (12) << (m_freqNominal / 1.e6) << " MHz  "
-                    << m_mode << endl;
+                    << "JS8" << endl;
                 f2.close();
               } else {
                 MessageBox::warning_message (this, tr ("File Error")
@@ -8544,7 +8544,7 @@ void MainWindow::updateTextDisplay(){
 
 
 #if __APPLE__
-#define USE_SYNC_FRAME_COUNT 1
+#define USE_SYNC_FRAME_COUNT 0
 #else
 #define USE_SYNC_FRAME_COUNT 0
 #endif
@@ -8600,28 +8600,14 @@ void MainWindow::refreshTextDisplay(){
     );
 
     connect(t, &BuildMessageFramesThread::finished, t, &QObject::deleteLater);
-    connect(t, &BuildMessageFramesThread::resultReady, this, [this, text](QStringList frames, QList<int> bits){
-
-        QStringList textList;
-        qDebug() << "frames:";
-        int i = 0;
-        foreach(auto frame, frames){
-            auto dt = DecodedText(frame, bits.at(i));
-            qDebug() << "->" << frame << dt.message() << Varicode::frameTypeString(dt.frameType());
-            textList.append(dt.message());
-            i++;
-        }
-
-        auto transmitText = textList.join("");
-        auto count = frames.length();
-
+    connect(t, &BuildMessageFramesThread::resultReady, this, [this, text](QString transmitText, int frames){
         // ugh...i hate these globals
         m_txTextDirtyLastSelectedCall = callsignSelected(true);
         m_txTextDirtyLastText = text;
-        m_txFrameCountEstimate = count;
+        m_txFrameCountEstimate = frames;
         m_txTextDirty = false;
 
-        updateTextStatsDisplay(transmitText, count);
+        updateTextStatsDisplay(transmitText, frames);
         updateTxButtonDisplay();
 
     });
@@ -10946,7 +10932,7 @@ void MainWindow::write_transmit_entry (QString const& file_name)
       auto dt = DecodedText(m_currentMessage, m_currentMessageBits);
       out << time.toString("yyyy-MM-dd hh:mm:ss")
           << "  Transmitting " << qSetRealNumberPrecision (12) << (m_freqNominal / 1.e6)
-          << " MHz  " << QString(m_modeTx).replace("FT8", "JS8")
+          << " MHz  " << "JS8"
           << ":  " << dt.message() << endl;
       f.close();
     }

mainwindow.h

@@ -280,7 +280,7 @@ private slots:
   void sendHeartbeat();
   void on_hbMacroButton_toggled(bool checked);
   void on_hbMacroButton_clicked();
-  void sendCQ();
+  void sendCQ(bool repeat=false);
   void on_cqMacroButton_toggled(bool checked);
   void on_cqMacroButton_clicked();
   void on_replyMacroButton_clicked();

varicode.cpp

@@ -27,6 +27,7 @@
 
 #include "varicode.h"
 #include "jsc.h"
+#include "decodedtext.h"
 
 #include <cmath>
 
@@ -1892,12 +1893,15 @@ void BuildMessageFramesThread::run(){
         m_text
     );
 
-    QList<QString> frames;
-    QList<int> bits;
-    foreach(auto pair, results){
-        frames.append(pair.first);
-        bits.append(pair.second);
+    // TODO: jsherer - we wouldn't normally use decodedtext.h here... but it's useful for computing the actual frames transmitted.
+    QStringList textList;
+    qDebug() << "frames:";
+    foreach(auto frame, results){
+        auto dt = DecodedText(frame.first, frame.second);
+        qDebug() << "->" << frame << dt.message() << Varicode::frameTypeString(dt.frameType());
+        textList.append(dt.message());
     }
 
-    emit resultReady(frames, bits);
+    auto transmitText = textList.join("");
+    emit resultReady(transmitText, results.length());
 }

varicode.h

@@ -174,7 +174,7 @@ public:
                              QObject *parent=nullptr);
     void run() override;
 signals:
-    void resultReady(QStringList, QList<int>);
+    void resultReady(QString, int);
 
 private:
     QString m_mycall;