From 5f924c305a531a85129801a8aee952122c8340a7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 24 Sep 2012 15:20:48 +0000 Subject: [PATCH] Initial changes from JTMS3 to WSJTX. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2593 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- about.cpp | 4 ++-- jtms3.iss | 20 ---------------- libm65/{specjtmsk.f90 => specjtms.f90} | 0 mainwindow.cpp | 32 +++++++++++++------------- mainwindow.h | 6 ++--- mainwindow.ui | 14 +++++------ wsjtx.iss | 20 ++++++++++++++++ jtms3.pro => wsjtx.pro | 14 +++++------ jtms3.rc => wsjtx.rc | 0 9 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 jtms3.iss rename libm65/{specjtmsk.f90 => specjtms.f90} (100%) create mode 100644 wsjtx.iss rename jtms3.pro => wsjtx.pro (89%) rename jtms3.rc => wsjtx.rc (100%) diff --git a/about.cpp b/about.cpp index 88b63e149..2c5d4ce91 100644 --- a/about.cpp +++ b/about.cpp @@ -9,8 +9,8 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) : ui->setupUi(this); ui->labelTxt->clear(); m_Str = "

" + m_Revision + "

\n\n"; - m_Str += "JTMS3 implements an experimental mode for Amateur Radio
"; - m_Str += "communication by Meteor Scatter.

"; + m_Str += "WSJT-X implements experimental mode JT8 for
"; + m_Str += "Amateur Radio communication at MF and LF.

"; m_Str += "Copyright 2001-2012 by Joe Taylor, K1JT. Additional
"; m_Str += "acknowledgments are contained in the source code.
"; ui->labelTxt->setText(m_Str); diff --git a/jtms3.iss b/jtms3.iss deleted file mode 100644 index 2f91f39c6..000000000 --- a/jtms3.iss +++ /dev/null @@ -1,20 +0,0 @@ -[Setup] -AppName=JTMS3 -AppVerName=JTMS3 Version 0.2 r2517 -AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT -DefaultDirName=c:\JTMS3 -DefaultGroupName=JTMS3 - -[Files] -Source: "c:\Users\joe\wsjt\jtms3_install\jtms3.exe"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\jtms3_install\wsjt.ico"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\jtms3_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\wsjt\jtms3_install\afmhot.dat"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\jtms3_install\blue.dat"; DestDir: "{app}"; -Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\wsjt\jtms3_install\save\dummy"; DestDir: "{app}\save"; - -[Icons] -Name: "{group}\JTMS3"; Filename: "{app}\jtms3.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico -Name: "{userdesktop}\JTMS3"; Filename: "{app}\jtms3.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico - diff --git a/libm65/specjtmsk.f90 b/libm65/specjtms.f90 similarity index 100% rename from libm65/specjtmsk.f90 rename to libm65/specjtms.f90 diff --git a/mainwindow.cpp b/mainwindow.cpp index 8b017971d..238cbad98 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -17,7 +17,7 @@ qint16 id[30*48000]; WideGraph* g_pWideGraph = NULL; QString rev="$Rev$"; -QString Program_Title_Version=" JTMS3 v0.2, r" + rev.mid(6,4) + +QString Program_Title_Version=" WSJT-X v0.1, r" + rev.mid(6,4) + " by K1JT"; //-------------------------------------------------- MainWindow constructor @@ -94,7 +94,7 @@ MainWindow::MainWindow(QWidget *parent) : m_myCall="K1JT"; m_myGrid="FN20qi"; m_appDir = QApplication::applicationDirPath(); - m_saveDir="/users/joe/jtms3/install/save"; + m_saveDir="/users/joe/wsjt-x/install/save"; m_txFreq=125; m_setftx=0; m_loopall=false; @@ -103,7 +103,7 @@ MainWindow::MainWindow(QWidget *parent) : m_onlyEME=false; m_sec0=-1; m_palette="CuteSDR"; - m_jtms3RxLog=1; //Write Date and Time to RxLog + m_RxLog=1; //Write Date and Time to RxLog m_nutc0=9999; m_NB=false; m_mode="JTMSK"; @@ -194,7 +194,7 @@ MainWindow::~MainWindow() //-------------------------------------------------------- writeSettings() void MainWindow::writeSettings() { - QString inifile = m_appDir + "/jtms3.ini"; + QString inifile = m_appDir + "/wsjt-x.ini"; QSettings settings(inifile, QSettings::IniFormat); settings.beginGroup("MainWindow"); @@ -261,7 +261,7 @@ void MainWindow::writeSettings() //---------------------------------------------------------- readSettings() void MainWindow::readSettings() { - QString inifile = m_appDir + "/jtms3.ini"; + QString inifile = m_appDir + "/wsjt-x.ini"; QSettings settings(inifile, QSettings::IniFormat); settings.beginGroup("MainWindow"); restoreGeometry(settings.value("geometry").toByteArray()); @@ -677,7 +677,7 @@ void MainWindow::stub() //stub() void MainWindow::on_actionOnline_Users_Guide_triggered() //Display manual { QDesktopServices::openUrl(QUrl( - "http://www.physics.princeton.edu/pulsar/K1JT/JTMS3_Users_Guide.pdf", + "http://www.physics.princeton.edu/pulsar/K1JT/WSJT-X_Users_Guide.pdf", QUrl::TolerantMode)); } @@ -704,7 +704,7 @@ void MainWindow::on_actionOpen_triggered() //Open File soundInThread.setMonitoring(m_monitoring); QString fname; fname=QFileDialog::getOpenFileName(this, "Open File", m_path, - "JTMS3 Files (*.wav)"); + "WSJT Files (*.wav)"); if(fname != "") { m_path=fname; int i; @@ -799,7 +799,7 @@ void MainWindow::on_actionDelete_all_wav_files_in_SaveDir_triggered() void MainWindow::on_actionFind_Delta_Phi_triggered() //Find dPhi { - m_jtms3RxLog |= 8; + m_RxLog |= 8; on_DecodeButton_clicked(); } @@ -948,7 +948,7 @@ void MainWindow::guiUpdate() int len1=28; genmsk_(message,iwave,&nwave,len1); if(m_restart) { - QFile f("jtms3_tx.log"); + QFile f("wsjt-x_tx.log"); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); QTextStream out(&f); out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") @@ -969,7 +969,7 @@ void MainWindow::guiUpdate() btxok=true; m_transmitting=true; - QFile f("jtms3_tx.log"); + QFile f("wsjt-x_tx.log"); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); QTextStream out(&f); out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") @@ -1430,24 +1430,24 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button } /* -void MainWindow::on_actionErase_jtms3_rx_log_triggered() //Erase Rx log +void MainWindow::on_actionErase_wsjtx_rx_log_triggered() //Erase Rx log { int ret = QMessageBox::warning(this, "Confirm Erase", - "Are you sure you want to erase file jtms3_rx.log ?", + "Are you sure you want to erase file wsjt-x_rx.log ?", QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if(ret==QMessageBox::Yes) { - m_jtms3RxLog |= 2; // Rewind jtms3_rx.log + m_RxLog |= 2; // Rewind wsjt-x_rx.log } } */ -void MainWindow::on_actionErase_jtms3_tx_log_triggered() //Erase Tx log +void MainWindow::on_actionErase_wsjtx_tx_log_triggered() //Erase Tx log { int ret = QMessageBox::warning(this, "Confirm Erase", - "Are you sure you want to erase file jtms3_tx.log ?", + "Are you sure you want to erase file wsjt-x_tx.log ?", QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if(ret==QMessageBox::Yes) { - QFile f("jtms3_tx.log"); + QFile f("wsjt-x_tx.log"); f.remove(); } } diff --git a/mainwindow.h b/mainwindow.h index e647157c8..781da3fa2 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -98,8 +98,8 @@ private slots: void on_genStdMsgsPushButton_clicked(); void bumpDF(int n); void on_logQSOButton_clicked(); -// void on_actionErase_jtms3_rx_log_triggered(); - void on_actionErase_jtms3_tx_log_triggered(); +// void on_actionErase_wsjt-x_rx_log_triggered(); + void on_actionErase_wsjtx_tx_log_triggered(); void on_actionAFMHot_triggered(); void on_actionBlue_triggered(); @@ -121,7 +121,7 @@ private: qint32 m_setftx; qint32 m_ndepth; qint32 m_sec0; - qint32 m_jtms3RxLog; + qint32 m_RxLog; qint32 m_nutc0; qint32 m_mode65; qint32 m_nrx; diff --git a/mainwindow.ui b/mainwindow.ui index 2ed0cd6e2..29acac49c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1068,8 +1068,8 @@ p, li { white-space: pre-wrap; } - - + + @@ -1159,7 +1159,7 @@ p, li { white-space: pre-wrap; } - About JTMS3 + About WSJTX Ctrl+F1 @@ -1219,9 +1219,9 @@ p, li { white-space: pre-wrap; } Erase Band Map and Messages - + - Erase jtms3_rx.log + Erase wsjtx_rx.log @@ -1395,9 +1395,9 @@ p, li { white-space: pre-wrap; } Available suffixes and add-on-prefixes - + - Erase jtms3_tx.log + Erase wsjtx_tx.log diff --git a/wsjtx.iss b/wsjtx.iss new file mode 100644 index 000000000..7d66452d1 --- /dev/null +++ b/wsjtx.iss @@ -0,0 +1,20 @@ +[Setup] +AppName=wsjtx +AppVerName=wsjtx Version 0.1 r2592 +AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT +DefaultDirName=c:\wsjtx +DefaultGroupName=wsjtx + +[Files] +Source: "c:\Users\joe\wsjt\wsjtx_install\wsjtx.exe"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\wsjtx_install\wsjt.ico"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist +Source: "c:\Users\joe\wsjt\wsjtx_install\afmhot.dat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist +Source: "c:\Users\joe\wsjt\wsjtx_install\save\dummy"; DestDir: "{app}\save"; + +[Icons] +Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico +Name: "{userdesktop}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico + diff --git a/jtms3.pro b/wsjtx.pro similarity index 89% rename from jtms3.pro rename to wsjtx.pro index cb211e73d..c88a54c89 100644 --- a/jtms3.pro +++ b/wsjtx.pro @@ -8,13 +8,13 @@ QT += core gui network CONFIG += qwt thread #CONFIG += console -TARGET = jtms3 +TARGET = wsjtx VERSION = 0.2 TEMPLATE = app win32 { DEFINES = WIN32 -DESTDIR = ../jtms3_install +DESTDIR = ../wsjtx_install F90 = g95 g95.output = ${QMAKE_FILE_BASE}.o g95.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME} @@ -24,7 +24,7 @@ QMAKE_EXTRA_COMPILERS += g95 unix { DEFINES = UNIX -DESTDIR = ../jtms3_install +DESTDIR = ../wsjtx_install F90 = gfortran gfortran.output = ${QMAKE_FILE_BASE}.o gfortran.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME} @@ -49,12 +49,12 @@ DEFINES += __cplusplus FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui -RC_FILE = jtms3.rc +RC_FILE = wsjtx.rc unix { INCLUDEPATH += $$quote(/usr/include/qwt-qt4) LIBS += -lfftw3f /usr/lib/libgfortran.so.3 -LIBS += ../jtms3/libm65/libm65.a +LIBS += ../wsjtx/libm65/libm65.a LIBS += /usr/lib/libqwt-qt4.so LIBS += -lportaudio #LIBS +- -lusb @@ -62,8 +62,8 @@ LIBS += -lportaudio win32 { INCLUDEPATH += c:/qwt-6.0.1/include -LIBS += ../jtms3/libm65/libm65.a -LIBS += ../jtms3/libfftw3f_win.a +LIBS += ../wsjtx/libm65/libm65.a +LIBS += ../wsjtx/libfftw3f_win.a LIBS += ../QtSupport/palir-02.dll LIBS += libwsock32 LIBS += C:/MinGW/lib/libf95.a diff --git a/jtms3.rc b/wsjtx.rc similarity index 100% rename from jtms3.rc rename to wsjtx.rc