From 22dad6327a374189a769e1750b5344a11946c345 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 27 Apr 2013 13:11:29 +0000 Subject: [PATCH] Write dial frequency and JT9 submode to all.txt. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3232 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 30 +++++++++++++++++++++--------- wsjtx.pro | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 89d78e90a..e1611ec1b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -300,6 +300,14 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) : ui->labDialFreq->setStyleSheet( \ "QLabel { background-color : black; color : yellow; }"); ui->frame->hide(); + + QFile f2("ALL.TXT"); + f2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); + QTextStream out(&f2); + out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") + << m_dialFreq << " MHz " << m_mode << endl; + f2.close(); + } // End of MainWindow constructor //--------------------------------------------------- MainWindow destructor @@ -1276,9 +1284,9 @@ void MainWindow::readFromStdout() //readFromStdout QFile f("ALL.TXT"); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); QTextStream out(&f); - if(m_RxLog & 1) { + if(m_RxLog && 1) { out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") - << endl; + << m_dialFreq << " MHz " << m_mode << endl; m_RxLog=0; } int n=t.length(); @@ -1526,7 +1534,8 @@ void MainWindow::guiUpdate() f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); QTextStream out(&f); out << QDateTime::currentDateTimeUtc().toString("hhmm") - << " Transmitting: " << t << endl; + << " Transmitting " << m_dialFreq << " MHz " << m_mode + << ": " << t << endl; f.close(); if(m_tx2QSO) displayTxMsg(t); } @@ -1593,12 +1602,15 @@ void MainWindow::guiUpdate() soundInThread.setMonitoring(false); btxok=true; m_transmitting=true; - QFile f("ALL.TXT"); - f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); - QTextStream out(&f); - out << QDateTime::currentDateTimeUtc().toString("hhmm") - << " Transmitting: " << t << endl; - f.close(); + if(!m_tune) { + QFile f("ALL.TXT"); + f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); + QTextStream out(&f); + out << QDateTime::currentDateTimeUtc().toString("hhmm") + << " Transmitting " << m_dialFreq << " MHz " << m_mode + << ": " << t << endl; + f.close(); + } if(m_tx2QSO and !m_tune) displayTxMsg(t); } diff --git a/wsjtx.pro b/wsjtx.pro index 6cf14c81e..fe6932d5b 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -10,7 +10,7 @@ CONFIG += qwt thread TARGET = wsjtx DESTDIR = ../wsjtx_install -VERSION = 0.9 +VERSION = 0.95 TEMPLATE = app win32 {