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
2012-09-24 15:20:48 +00:00 · 2012-09-24 15:20:48 +00:00 · 0ae89c922f
parent 357f467ef0
commit 0ae89c922f
9 changed files with 55 additions and 55 deletions
--- a/about.cpp
+++ b/about.cpp
@ -9,8 +9,8 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
  ui->setupUi(this);
  ui->labelTxt->clear();
  m_Str  = "<html><h2>" + m_Revision + "</h2>\n\n";
-  m_Str += "JTMS3 implements an experimental mode for Amateur Radio <br>";
-  m_Str += "communication by Meteor Scatter.  <br><br>";
+  m_Str += "WSJT-X implements experimental mode JT8 for <br>";
+  m_Str += "Amateur Radio communication at MF and LF.  <br><br>";
  m_Str += "Copyright 2001-2012 by Joe Taylor, K1JT.   Additional <br>";
  m_Str += "acknowledgments are contained in the source code. <br>";
  ui->labelTxt->setText(m_Str);
--- a/jtms3.iss
+++ b/jtms3.iss
@ -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
-
--- a/libm65/specjtmsk.f90
+++ b/libm65/specjtmsk.f90
--- 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();
  }
 }
--- 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;
--- a/mainwindow.ui
+++ b/mainwindow.ui
@ -1068,8 +1068,8 @@ p, li { white-space: pre-wrap; }
    <addaction name="actionDecode_remaining_files_in_directory"/>
    <addaction name="separator"/>
    <addaction name="actionDelete_all_wav_files_in_SaveDir"/>
-    <addaction name="actionErase_jtms3_rx_log"/>
-    <addaction name="actionErase_jtms3_tx_log"/>
+    <addaction name="actionErase_wsjtx_rx_log"/>
+    <addaction name="actionErase_wsjtx_tx_log"/>
    <addaction name="separator"/>
    <addaction name="actionExit"/>
   </widget>
@ -1159,7 +1159,7 @@ p, li { white-space: pre-wrap; }
  </action>
  <action name="actionAbout">
   <property name="text">
-    <string> About JTMS3</string>
+    <string> About WSJTX</string>
   </property>
   <property name="shortcut">
    <string>Ctrl+F1</string>
@ -1219,9 +1219,9 @@ p, li { white-space: pre-wrap; }
    <string>Erase Band Map and Messages</string>
   </property>
  </action>
-  <action name="actionErase_jtms3_rx_log">
+  <action name="actionErase_wsjtx_rx_log">
   <property name="text">
-    <string>Erase jtms3_rx.log</string>
+    <string>Erase wsjtx_rx.log</string>
   </property>
  </action>
  <action name="actionLinrad">
@ -1395,9 +1395,9 @@ p, li { white-space: pre-wrap; }
    <string>Available suffixes and add-on-prefixes</string>
   </property>
  </action>
-  <action name="actionErase_jtms3_tx_log">
+  <action name="actionErase_wsjtx_tx_log">
   <property name="text">
-    <string>Erase jtms3_tx.log</string>
+    <string>Erase wsjtx_tx.log</string>
   </property>
  </action>
  <action name="actionJT65A">
--- a/wsjtx.iss
+++ 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
+
--- a/wsjtx.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
--- a/wsjtx.rc
+++ b/wsjtx.rc