From ac0055b303e691aa97335a767d9fb2f47858f795 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 1 Jan 2024 13:02:39 -0500
Subject: [PATCH] Remove more unused stuff.
---
qmap/commons.h | 4 ++--
qmap/getfile.cpp | 3 +--
qmap/getfile.h | 2 +-
qmap/mainwindow.cpp | 5 ++---
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/qmap/commons.h b/qmap/commons.h
index 561f588a9..9b904dcb0 100644
--- a/qmap/commons.h
+++ b/qmap/commons.h
@@ -29,7 +29,7 @@ extern struct { //This is "common/datcom/..." in Fortran
int nxant; //1 ==> add 45 deg to measured pol angle
int nCFOM; //1 ==> CFOM already done, 0 otherwise
int nfsample; //Input sample rate
- int nxpol; //1 if using xpol antennas, 0 otherwise
+ int junk3; //
int nBaseSubmode; //Base submode for Q65-60x (aka m_modeQ65)
int ndop00; //EME Self Doppler
int nsave; //no longer used
@@ -70,7 +70,7 @@ extern struct { //This is "common/datcom/..." in Fortran
int nxant; //1 ==> add 45 deg to measured pol angle
int nCFOM; //1 ==> CFOM already done, 0 otherwise
int nfsample; //Input sample rate
- int nxpol; //1 if using xpol antennas, 0 otherwise
+ int junk3; //
int nBaseSubmode; //Base submode for Q65-60x (aka m_modeQ65)
int ndop00; //EME Self Doppler
int nsave; //Number of s3(64,63) spectra saved
diff --git a/qmap/getfile.cpp b/qmap/getfile.cpp
index e2afc6451..8c7ef7b9c 100644
--- a/qmap/getfile.cpp
+++ b/qmap/getfile.cpp
@@ -6,11 +6,10 @@
extern qint16 id[2*60*96000];
-void getfile(QString fname, bool xpol, int dbDgrd)
+void getfile(QString fname, int dbDgrd)
{
// int npts=2*56*96000;
int npts=2*60*96000;
- if(xpol) npts=2*npts;
// Degrade S/N by dbDgrd dB -- for tests only!!
float dgrd=0.0;
diff --git a/qmap/getfile.h b/qmap/getfile.h
index a2bf85667..2cab76963 100644
--- a/qmap/getfile.h
+++ b/qmap/getfile.h
@@ -5,7 +5,7 @@
#include <QDebug>
#include "commons.h"
-void getfile(QString fname, bool xpol, int dbDgrd);
+void getfile(QString fname, int dbDgrd);
void save_iq(QString fname, bool bCFOM);
float gran();
diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp
index 85e26878b..e1b05789b 100644
--- a/qmap/mainwindow.cpp
+++ b/qmap/mainwindow.cpp
@@ -643,7 +643,7 @@ void MainWindow::on_actionOpen_triggered() //Open File
if(m_monitoring) on_monitorButton_clicked();
m_diskData=true;
int dbDgrd=0;
- *future1 = QtConcurrent::run(getfile, fname, false, dbDgrd);
+ *future1 = QtConcurrent::run(getfile, fname, dbDgrd);
watcher1->setFuture(*future1);
}
}
@@ -669,7 +669,7 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
}
m_diskData=true;
int dbDgrd=0;
- *future1 = QtConcurrent::run(getfile, fname, false, dbDgrd);
+ *future1 = QtConcurrent::run(getfile, fname, dbDgrd);
watcher1->setFuture(*future1);
return;
}
@@ -839,7 +839,6 @@ void MainWindow::decode() //decode()
datcom_.nxant=0;
m_nutc0=datcom_.nutc;
datcom_.nfsample=96000;
- datcom_.nxpol=0;
datcom_.nBaseSubmode=m_modeQ65;
datcom_.max_drift=ui->sbMaxDrift->value();
datcom_.offset=ui->sbOffset->value();