w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 12:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup of unused variables, etc.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-10 18:44:35 -05:00
parent dc23772f9e
commit 6cc2a50aa0
7 changed files with 15 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
q65w/commons.h
View File

@ -27,7 +27,7 @@ extern struct { //This is "common/datcom/..." in Fortran
int ntimeout; //Max for timeouts in Messages and BandMap
int ntol; //+/- decoding range around fQSO (Hz)
int nxant; //1 ==> add 45 deg to measured pol angle
int map65RxLog; //Flags to control log files
int junk_1;
int nfsample; //Input sample rate
int nxpol; //1 if using xpol antennas, 0 otherwise
int nmode; //nmode = 10*m_modeQ65 + m_modeJT65
@ -66,7 +66,7 @@ extern struct { //This is "common/datcom/..." in Fortran
int ntimeout; //Max for timeouts in Messages and BandMap
int ntol; //+/- decoding range around fQSO (Hz)
int nxant; //1 ==> add 45 deg to measured pol angle
int map65RxLog; //Flags to control log files
int junk_1;
int nfsample; //Input sample rate
int nxpol; //1 if using xpol antennas, 0 otherwise
int nmode; //nmode = 10*m_modeQ65 + m_modeJT65

46
q65w/mainwindow.cpp
View File

@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
m_appDir {QApplication::applicationDirPath ()},
m_settings_filename {m_appDir + "/map65.ini"},
m_settings_filename {m_appDir + "/q65w.ini"},
m_astro_window {new Astro {m_settings_filename}},
m_wide_graph_window {new WideGraph {m_settings_filename}},
m_gui_timer {new QTimer {this}}
@ -79,8 +79,8 @@ MainWindow::MainWindow(QWidget *parent) :
m_restart=false;
m_myCall="K1JT";
m_myGrid="FN20qi";
m_saveDir="/users/joe/map65/install/save";
m_azelDir="/users/joe/map65/install/";
m_saveDir="";
m_azelDir="";
m_loopall=false;
m_startAnother=false;
m_saveAll=false;
@ -88,23 +88,20 @@ MainWindow::MainWindow(QWidget *parent) :
m_sec0=-1;
m_hsym0=-1;
m_palette="CuteSDR";
m_map65RxLog=1; //Write Date and Time to all65.txt
m_nutc0=9999;
m_kb8rq=false;
m_NB=false;
m_mode="JT65B";
m_mode65=2;
m_mode="Q65";
m_fs96000=true;
m_udpPort=50004;
m_nsave=0;
m_modeJT65=0;
m_modeQ65=0;
m_TRperiod=60;
xSignalMeter = new SignalMeter(ui->xMeterFrame);
xSignalMeter->resize(50, 160);
fftwf_import_wisdom_from_filename (QDir {m_appDir}.absoluteFilePath ("map65_wisdom.dat").toLocal8Bit ());
fftwf_import_wisdom_from_filename (QDir {m_appDir}.absoluteFilePath ("q65w_wisdom.dat").toLocal8Bit ());
readSettings(); //Restore user's setup params
@ -195,7 +192,7 @@ MainWindow::~MainWindow()
soundInThread.quit();
soundInThread.wait(3000);
}
fftwf_export_wisdom_to_filename (QDir {m_appDir}.absoluteFilePath ("map65_wisdom.dat").toLocal8Bit ());
fftwf_export_wisdom_to_filename (QDir {m_appDir}.absoluteFilePath ("q65w_wisdom.dat").toLocal8Bit ());
delete ui;
}
@ -224,7 +221,6 @@ void MainWindow::writeSettings()
settings.setValue("Fadd",m_fAdd);
settings.setValue("NetworkInput", m_network);
settings.setValue("FSam96000", m_fs96000);
settings.setValue("SoundInIndex",m_nDevIn);
settings.setValue("paInDevice",m_paInDevice);
settings.setValue("Scale_dB",m_dB);
settings.setValue("UDPport",m_udpPort);
@ -233,7 +229,6 @@ void MainWindow::writeSettings()
settings.setValue("PaletteAFMHot",ui->actionAFMHot->isChecked());
settings.setValue("PaletteBlue",ui->actionBlue->isChecked());
settings.setValue("Mode",m_mode);
settings.setValue("nModeJT65",m_modeJT65);
settings.setValue("nModeQ65",m_modeQ65);
settings.setValue("SaveNone",ui->actionNone->isChecked());
settings.setValue("SaveAll",ui->actionSave_all->isChecked());
@ -275,7 +270,6 @@ void MainWindow::readSettings()
soundInThread.setFadd(m_fAdd);
m_network = settings.value("NetworkInput",true).toBool();
m_fs96000 = settings.value("FSam96000",true).toBool();
m_nDevIn = settings.value("SoundInIndex", 0).toInt();
m_dB = settings.value("Scale_dB",0).toInt();
m_udpPort = settings.value("UDPport",50004).toInt();
soundInThread.setScale(m_dB);
@ -284,15 +278,8 @@ void MainWindow::readSettings()
"PaletteCuteSDR",true).toBool());
ui->actionLinrad->setChecked(settings.value(
"PaletteLinrad",false).toBool());
m_mode=settings.value("Mode","JT65B").toString();
m_modeJT65=settings.value("nModeJT65",2).toInt();
if(m_modeJT65==0) ui->actionNoJT65->setChecked(true);
if(m_modeJT65==1) ui->actionJT65A->setChecked(true);
if(m_modeJT65==2) ui->actionJT65B->setChecked(true);
if(m_modeJT65==3) ui->actionJT65C->setChecked(true);
m_modeQ65=settings.value("nModeQ65",2).toInt();
if(m_modeQ65==0) ui->actionNoQ65->setChecked(true);
if(m_modeQ65==1) ui->actionQ65A->setChecked(true);
if(m_modeQ65==2) ui->actionQ65B->setChecked(true);
if(m_modeQ65==3) ui->actionQ65C->setChecked(true);
@ -669,7 +656,7 @@ void MainWindow::on_actionOpen_triggered() //Open File
soundInThread.setMonitoring(m_monitoring);
QString fname;
fname=QFileDialog::getOpenFileName(this, "Open File", m_path,
"MAP65 Files (*.iq)");
"MAP65/Q65W Files (*.iq)");
if(fname != "") {
m_path=fname;
int i;
@ -732,7 +719,7 @@ void MainWindow::diskDat() //diskDat()
datcom_.fcenter=m_wide_graph_window->m_dForceCenterFreq;
}
hsym=2048.0*96000.0/11025.0; //Samples per JT65 half-symbol
hsym=2048.0*96000.0/11025.0; //Samples per JT65 half-symbol
for(int i=0; i<304; i++) { // Do the half-symbol FFTs
int k = i*hsym + 2048.5;
dataSink(k);
@ -747,7 +734,6 @@ void MainWindow::diskWriteFinished() //diskWriteFinished
void MainWindow::decoderFinished() //diskWriteFinished
{
m_map65RxLog=0;
m_startAnother=m_loopall;
ui->DecodeButton->setStyleSheet("");
decodeBusy(false);
@ -888,13 +874,12 @@ void MainWindow::decode() //decode()
datcom_.ntimeout=m_timeout;
datcom_.ntol=m_tol;
datcom_.nxant=0;
if(datcom_.nutc < m_nutc0) m_map65RxLog |= 1; //Date and Time to map65_rx.log
m_nutc0=datcom_.nutc;
datcom_.map65RxLog=m_map65RxLog;
datcom_.map65RxLog=0;
datcom_.nfsample=96000;
if(!m_fs96000) datcom_.nfsample=95238;
datcom_.nxpol=0;
datcom_.nmode=10*m_modeQ65 + m_modeJT65;
datcom_.nmode=10*m_modeQ65;
datcom_.nsave=m_nsave;
datcom_.max_drift=ui->sbMaxDrift->value();
@ -916,7 +901,6 @@ void MainWindow::decode() //decode()
memcpy(to, from, sizeof(datcom_));
datcom_.nagain=0;
datcom_.ndiskdat=0;
m_map65RxLog=0;
m_call3Modified=false;
decodes_.ndecodes=0;
@ -1174,16 +1158,6 @@ void MainWindow::on_dxGridEntry_textChanged(const QString &t) //dxGrid changed
ui->dxGridEntry->setText(m_hisGrid);
}
void MainWindow::on_actionErase_map65_rx_log_triggered() //Erase Rx log
{
int ret = QMessageBox::warning(this, "Confirm Erase",
"Are you sure you want to erase file map65_rx.log ?",
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if(ret==QMessageBox::Yes) {
m_map65RxLog |= 2; // Rewind map65_rx.log
}
}
void MainWindow::on_actionQ65A_triggered()
{
m_modeQ65=1;

6
q65w/mainwindow.h
View File

@ -78,7 +78,6 @@ private slots:
void on_dxCallEntry_textChanged(const QString &arg1);
void on_dxGridEntry_textChanged(const QString &arg1);
void bumpDF(int n);
void on_actionErase_map65_rx_log_triggered();
void on_actionSettings_triggered();
void on_NBcheckBox_toggled(bool checked);
void on_NBslider_valueChanged(int value);
@ -98,8 +97,6 @@ private:
QScopedPointer<WideGraph> m_wide_graph_window;
QPointer<QTimer> m_gui_timer;
qint64 m_msErase;
qint32 m_nDevIn;
qint32 m_nDevOut;
qint32 m_idInt;
qint32 m_waterfallAvg;
qint32 m_DF;
@ -113,9 +110,7 @@ private:
qint32 m_setftx;
qint32 m_ndepth;
qint32 m_sec0;
qint32 m_map65RxLog;
qint32 m_nutc0;
qint32 m_mode65;
qint32 m_nrx;
qint32 m_hsym0;
qint32 m_paInDevice;
@ -124,7 +119,6 @@ private:
qint32 m_nsum;
qint32 m_nsave;
qint32 m_TRperiod;
qint32 m_modeJT65;
qint32 m_modeQ65;
qint32 m_RxState;
qint32 m_dB;

78
q65w/mainwindow.ui
View File

@ -628,7 +628,6 @@ p, li { white-space: pre-wrap; }
<addaction name="actionDecode_remaining_files_in_directory"/>
<addaction name="separator"/>
<addaction name="actionDelete_all_tf2_files_in_SaveDir"/>
<addaction name="actionErase_map65_rx_log"/>
<addaction name="separator"/>
<addaction name="actionSettings"/>
<addaction name="separator"/>
@ -768,11 +767,6 @@ p, li { white-space: pre-wrap; }
<string>Erase Band Map and Messages</string>
</property>
</action>
<action name="actionErase_map65_rx_log">
<property name="text">
<string>Erase map65_rx.log</string>
</property>
</action>
<action name="actionLinrad">
<property name="checkable">
<bool>true</bool>
@ -944,59 +938,6 @@ p, li { white-space: pre-wrap; }
<string>Available suffixes and add-on-prefixes</string>
</property>
</action>
<action name="actionErase_map65_tx_log">
<property name="text">
<string>Erase map65_tx.log</string>
</property>
</action>
<action name="actionJT65A">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>JT65A</string>
</property>
</action>
<action name="actionJT65B">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>JT65B</string>
</property>
</action>
<action name="actionJT65C">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>JT65C</string>
</property>
</action>
<action name="actionI_Q_Calibration">
<property name="text">
<string>I/Q Calibration</string>
</property>
<property name="shortcut">
<string>F7</string>
</property>
</action>
<action name="actionAdjust_IQ_Calibration">
<property name="text">
<string>Adjust Rx I/Q Calibration</string>
</property>
</action>
<action name="actionApply_IQ_Calibration">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Apply Rx I/Q Calibration</string>
</property>
</action>
<action name="actionAFMHot">
<property name="checkable">
<bool>true</bool>
@ -1058,25 +999,6 @@ p, li { white-space: pre-wrap; }
<string>Q65B</string>
</property>
</action>
<action name="actionNoJT65">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>No JT65</string>
</property>
</action>
<action name="actionNoQ65">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>No Q65</string>
</property>
</action>
<action name="actionQ65C">
<property name="checkable">
<bool>true</bool>

46
q65w/map65b.iss
View File

@ -1,46 +0,0 @@
; For Use With JTSDK v2.0.0
#define MyAppName "MAP65"
#define MyAppVersion "2.7"
#define MyAppPublisher "Joe Taylor, K1JT"
#define MyAppCopyright "Copyright (C) 2001-2017 by Joe Taylor, K1JT"
#define MyAppURL "http://physics.princeton.edu/pulsar/k1jt/map65.html"
#define WsjtGroupURL "https://groups.yahoo.com/neo/groups/wsjtgroup/info"
[Setup]
AppName={#MyAppName}
AppVersion={#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DisableReadyPage=yes
DefaultDirName=C:\WSJT\MAP65
DefaultGroupName=WSJT
DisableProgramGroupPage=yes
LicenseFile=C:\JTSDK\common-licenses\GPL-3
OutputDir=C:\JTSDK\map65\package
OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Win32
SetupIconFile=C:\JTSDK\icons\wsjt.ico
Compression=lzma
SolidCompression=yes
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
[Files]
Source: "c:\JTSDK\map65\install\Release\bin\*"; DestDir: "{app}"; Excludes: CALL3.TXT; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\JTSDK\src\map65\resources\*"; DestDir: "{app}"; Flags: ignoreversion onlyifdoesntexist
[Icons]
Name: "{group}\{#MyAppName}\Documentation\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
Name: "{group}\{#MyAppName}\Resources\{cm:ProgramOnTheWeb,WSJT Group}"; Filename: "{#WsjtGroupURL}"
Name: "{group}\{#MyAppName}\Tools\Wisdom-1"; Filename: "{app}\wisdom1.bat"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
Name: "{group}\{#MyAppName}\Tools\Wisdom-2"; Filename: "{app}\wisdom2.bat"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
Name: "{group}\{#MyAppName}\Uninstall\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"; Comment: "Uninstall MAP65";
Name: "{group}\{#MyAppName}\{#MyAppName}"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
Name: "{userdesktop}\{#MyAppName}"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
[Run]
Filename: "{app}\wisdom1.bat"; Description: "Optimize plans for FFTs (takes a few minutes)"; Flags: postinstall
Filename: "{app}\wisdom2.bat"; Description: "Patiently optimize plans for FFTs (up to one hour)"; Flags: postinstall unchecked
Filename: "{app}\map65.exe"; Description: "Launch MAP65"; Flags: postinstall nowait unchecked

24
q65w/q65w.pro
View File

@ -9,11 +9,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += thread
#CONFIG += console
TARGET = map65
VERSION = 2.5.0
TARGET = q65w
VERSION = 0.1
TEMPLATE = app
DEFINES = QT5
DESTDIR = /MAP65_2.9
F90 = gfortran
gfortran.output = ${QMAKE_FILE_BASE}.o
@ -43,22 +42,3 @@ HEADERS += mainwindow.h plotter.h soundin.h \
FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \
astro.ui txtune.ui
RC_FILE = map65.rc
unix {
LIBS += ../map65/libm65/libm65.a
LIBS += -lfftw3f -lgfortran
}
win32 {
LIBS += ../map65/libm65/libm65.a
LIBS += ../map65/libfftw3f_win.a
LIBS += ../map65/palir-02.dll
LIBS += libwsock32
#LIBS += C:/MinGW/lib/libf95.a
LIBS += -lgfortran
#LIBS += -lusb
LIBS += ../map65/libusb.a
#LIBS += -lQt5Concurrent
#LIBS += c:\JTSDK-QT\Qt5\Tools\mingw48_32\i686-w64-mingw32\lib\libmingwex.a
}

2
q65w/soundin.cpp
View File

@ -35,7 +35,7 @@ extern "C"
int ntimeout; //Max for timeouts in Messages and BandMap
int ntol; //+/- decoding range around fQSO (Hz)
int nxant; //1 ==> add 45 deg to measured pol angle
int map65RxLog; //Flags to control log files
int junk_1; //Flags to control log files
int nfsample; //Input sample rate
int nxpol; //1 if using xpol antennas, 0 otherwise
int mode65; //JT65 sub-mode: A=1, B=2, C=4