diff --git a/q65w/devsetup.cpp b/q65w/devsetup.cpp
index d895a7b86..6b67ff9cb 100644
--- a/q65w/devsetup.cpp
+++ b/q65w/devsetup.cpp
@@ -80,17 +80,9 @@ void DevSetup::initDlg()
ui.myCallEntry->setText(m_myCall);
ui.myGridEntry->setText(m_myGrid);
- ui.idIntSpinBox->setValue(m_idInt);
- ui.pttComboBox->setCurrentIndex(m_pttPort);
ui.astroFont->setValue(m_astroFont);
- ui.cbXpol->setChecked(m_xpol);
- ui.rbAntennaX->setChecked(m_xpolx);
ui.saveDirEntry->setText(m_saveDir);
ui.azelDirEntry->setText(m_azelDir);
- ui.editorEntry->setText(m_editorCommand);
- ui.dxccEntry->setText(m_dxccPfx);
- ui.timeoutSpinBox->setValue(m_timeout);
- ui.dPhiSpinBox->setValue(m_dPhi);
ui.fCalSpinBox->setValue(m_fCal);
ui.faddEntry->setText(QString::number(m_fAdd,'f',3));
ui.networkRadioButton->setChecked(m_network);
@@ -145,22 +137,13 @@ void DevSetup::accept()
if(m_network!=ui.networkRadioButton->isChecked() or
m_nDevIn!=ui.comboBoxSndIn->currentIndex() or
m_paInDevice!=m_inDevList[m_nDevIn] or
- m_xpol!=ui.cbXpol->isChecked() or
m_udpPort!=ui.sbPort->value()) m_restartSoundIn=true;
m_myCall=ui.myCallEntry->text();
m_myGrid=ui.myGridEntry->text();
- m_idInt=ui.idIntSpinBox->value();
- m_pttPort=ui.pttComboBox->currentIndex();
m_astroFont=ui.astroFont->value();
- m_xpol=ui.cbXpol->isChecked();
- m_xpolx=ui.rbAntennaX->isChecked();
m_saveDir=ui.saveDirEntry->text();
m_azelDir=ui.azelDirEntry->text();
- m_editorCommand=ui.editorEntry->text();
- m_dxccPfx=ui.dxccEntry->text();
- m_timeout=ui.timeoutSpinBox->value();
- m_dPhi=ui.dPhiSpinBox->value();
m_fCal=ui.fCalSpinBox->value();
m_fAdd=ui.faddEntry->text().toDouble();
m_network=ui.networkRadioButton->isChecked();
@@ -194,15 +177,6 @@ void DevSetup::on_soundCardRadioButton_toggled(bool checked)
ui.sb_dB->setEnabled(checked);
}
-void DevSetup::on_cbXpol_stateChanged(int n)
-{
- m_xpol = (n!=0);
- ui.rbAntenna->setEnabled(m_xpol);
- ui.rbAntennaX->setEnabled(m_xpol);
- ui.dPhiSpinBox->setEnabled(m_xpol);
- ui.labelDphi->setEnabled(m_xpol);
-}
-
void DevSetup::on_cal570SpinBox_valueChanged(double ppm)
{
m_cal570=ppm;
diff --git a/q65w/devsetup.h b/q65w/devsetup.h
index ce697388c..71dad4027 100644
--- a/q65w/devsetup.h
+++ b/q65w/devsetup.h
@@ -33,10 +33,8 @@ public:
double m_cal570;
double m_TxOffset;
- bool m_xpolx;
bool m_network;
bool m_fs96000;
- bool m_xpol;
bool m_IQswap;
bool m_restartSoundIn;
bool m_initIQplus;
@@ -57,7 +55,6 @@ public slots:
private slots:
void on_soundCardRadioButton_toggled(bool checked);
- void on_cbXpol_stateChanged(int arg1);
void on_cal570SpinBox_valueChanged(double ppm);
void on_mult570SpinBox_valueChanged(int mult);
void on_sbBackgroundRed_valueChanged(int arg1);
diff --git a/q65w/devsetup.ui b/q65w/devsetup.ui
index 48f2a0b2c..ffd4a7fba 100644
--- a/q65w/devsetup.ui
+++ b/q65w/devsetup.ui
@@ -63,32 +63,6 @@
- -
-
-
-
- 0
- 20
-
-
-
- ID Interval (min):
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
- PTT Port:
-
-
-
-
@@ -126,99 +100,6 @@
- -
-
-
- -20
-
-
- 10
-
-
-
- -
-
-
-
- 60
- 16777215
-
-
-
- false
-
-
-
-
- None
-
-
- -
-
- COM1
-
-
- -
-
- COM2
-
-
- -
-
- COM3
-
-
- -
-
- COM4
-
-
- -
-
- COM5
-
-
- -
-
- COM6
-
-
- -
-
- COM7
-
-
- -
-
- COM8
-
-
- -
-
- COM9
-
-
- -
-
- COM10
-
-
- -
-
- COM11
-
-
- -
-
- COM12
-
-
- -
-
- COM13
-
-
-
-
-
@@ -252,32 +133,6 @@
-
-
-
-
-
-
- 0
- 20
-
-
-
- DXCC:
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
- Timeout (min):
-
-
-
-
@@ -324,26 +179,6 @@
-
-
-
-
-
-
- 16777215
- 16777215
-
-
-
- PJ9
-
-
-
- -
-
-
- 40
-
-
-
-
@@ -381,154 +216,6 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 55
-
-
-
- Antennas:
-
-
-
-
- 10
- 23
- 321
- 22
-
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Xpol
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- +
-
-
- true
-
-
-
- -
-
-
- x
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
- Dphi:
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
- -180
-
-
- 180
-
-
- 10
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
-
@@ -577,36 +264,6 @@
- -
-
-
-
-
-
-
- 80
- 20
-
-
-
- Editor command:
-
-
-
- -
-
-
-
- 328
- 16777215
-
-
-
- notepad
-
-
-
-
-
diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp
index 682dccecd..f4e6abe68 100644
--- a/q65w/mainwindow.cpp
+++ b/q65w/mainwindow.cpp
@@ -211,8 +211,6 @@ MainWindow::MainWindow(QWidget *parent) :
soundInThread.setBufSize(10*7056);
soundInThread.setNetwork(m_network);
soundInThread.setPort(m_udpPort);
- if(!m_xpol) soundInThread.setNrx(1);
- if(m_xpol) soundInThread.setNrx(2);
soundInThread.start(QThread::HighestPriority);
m_monitoring=true; // Start with Monitoring ON
@@ -292,8 +290,6 @@ void MainWindow::writeSettings()
settings.setValue("MyGrid",m_myGrid);
settings.setValue("IDint",m_idInt);
settings.setValue("AstroFont",m_astroFont);
- settings.setValue("Xpol",m_xpol);
- settings.setValue("XpolX",m_xpolx);
settings.setValue("SaveDir",m_saveDir);
settings.setValue("AzElDir",m_azelDir);
settings.setValue("Editor",m_editorCommand);
@@ -356,9 +352,6 @@ void MainWindow::readSettings()
m_myGrid=settings.value("MyGrid","").toString();
m_idInt=settings.value("IDint",0).toInt();
m_astroFont=settings.value("AstroFont",20).toInt();
- m_xpol=settings.value("Xpol",false).toBool();
- ui->actionFind_Delta_Phi->setEnabled(m_xpol);
- m_xpolx=settings.value("XpolX",false).toBool();
m_saveDir=settings.value("SaveDir",m_appDir + "/save").toString();
m_azelDir=settings.value("AzElDir",m_appDir).toString();
m_editorCommand=settings.value("Editor","notepad").toString();
@@ -444,13 +437,13 @@ void MainWindow::dataSink(int k)
static int ntrz=0;
static int nkhz;
static int nfsample=96000;
- static int nxpol=0;
static int nsec0=0;
static int nsum=0;
static float fgreen;
static int ndiskdat;
static int nb;
static int nadj=0;
+ static int nxpol=0;
static float px=0.0,py=0.0;
static uchar lstrong[1024];
static float rejectx;
@@ -470,8 +463,6 @@ void MainWindow::dataSink(int k)
if(m_NB) nb=1;
nfsample=96000;
if(!m_fs96000) nfsample=95238;
- nxpol=0;
- if(m_xpol) nxpol=1;
fgreen=m_wide_graph_window->fGreen();
nadj++;
if(m_adjustIQ==0) nadj=0;
@@ -494,21 +485,14 @@ void MainWindow::dataSink(int k)
QString t;
m_pctZap=nzap/178.3;
- ui->yMeterFrame->setVisible(m_xpol);
- if(m_xpol) {
- lab4->setText (
- QString {" Rx noise: %1 %2 %3 %% "}
- .arg (px, 5, 'f', 1)
- .arg (py, 5, 'f', 1)
- .arg (m_pctZap, 5, 'f', 1)
- );
- } else {
- lab4->setText (
- QString {" Rx noise: %1 %2 %% "}
- .arg (px, 5, 'f', 1)
- .arg (m_pctZap, 5, 'f', 1)
- );
- }
+ ui->yMeterFrame->setVisible(false);
+
+ lab4->setText (
+ QString {" Rx noise: %1 %2 %% "}
+ .arg (px, 5, 'f', 1)
+ .arg (m_pctZap, 5, 'f', 1)
+ );
+
xSignalMeter->setValue(px); // Update the signal meters
ySignalMeter->setValue(py);
if(m_monitoring || m_diskData) {
@@ -516,20 +500,11 @@ void MainWindow::dataSink(int k)
}
if(nadj == 10) {
- if(m_xpol) {
- ui->decodedTextBrowser->append (
- QString {"Amp: %1 %2 Phase: %3 %4"}
- .arg (m_gainx, 6, 'f', 4).arg (m_gainy, 6, 'f', 4)
- .arg (m_phasex, 6, 'f', 4)
- .arg (m_phasey, 6, 'f', 4)
- );
- } else {
- ui->decodedTextBrowser->append(
- QString {"Amp: %1 Phase: %1"}
- .arg (m_gainx, 6, 'f', 4)
- .arg (m_phasex, 6, 'f', 4)
- );
- }
+ ui->decodedTextBrowser->append(
+ QString {"Amp: %1 Phase: %1"}
+ .arg (m_gainx, 6, 'f', 4)
+ .arg (m_phasex, 6, 'f', 4)
+ );
ui->decodedTextBrowser->append(t);
m_adjustIQ=0;
}
@@ -572,9 +547,8 @@ void MainWindow::dataSink(int k)
if(m_saveAll and !m_diskData) {
QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" +
t.time().toString("hhmm");
- if(m_xpol) fname += ".tf2";
- if(!m_xpol) fname += ".iq";
- *future2 = QtConcurrent::run(savetf2, fname, m_xpol);
+ fname += ".iq";
+ *future2 = QtConcurrent::run(savetf2, fname, false);
watcher2->setFuture(*future2);
}
}
@@ -595,8 +569,6 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
dlg.m_myGrid=m_myGrid;
dlg.m_idInt=m_idInt;
dlg.m_astroFont=m_astroFont;
- dlg.m_xpol=m_xpol;
- dlg.m_xpolx=m_xpolx;
dlg.m_saveDir=m_saveDir;
dlg.m_azelDir=m_azelDir;
dlg.m_editorCommand=m_editorCommand;
@@ -625,9 +597,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
m_idInt=dlg.m_idInt;
m_astroFont=dlg.m_astroFont;
if(m_astro_window && m_astro_window->isVisible()) m_astro_window->setFontSize(m_astroFont);
- m_xpol=dlg.m_xpol;
- ui->actionFind_Delta_Phi->setEnabled(m_xpol);
- m_xpolx=dlg.m_xpolx;
+ ui->actionFind_Delta_Phi->setEnabled(false);
m_saveDir=dlg.m_saveDir;
m_azelDir=dlg.m_azelDir;
m_editorCommand=dlg.m_editorCommand;
@@ -662,8 +632,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
if(m_fs96000) soundInThread.setRate(96000.0);
if(!m_fs96000) soundInThread.setRate(95238.1);
soundInThread.setFadd(m_fAdd);
- if(!m_xpol) soundInThread.setNrx(1);
- if(m_xpol) soundInThread.setNrx(2);
+ soundInThread.setNrx(1);
soundInThread.setInputDevice(m_paInDevice);
soundInThread.start(QThread::HighestPriority);
}
@@ -883,18 +852,12 @@ void MainWindow::on_actionOpen_triggered() //Open File
m_monitoring=false;
soundInThread.setMonitoring(m_monitoring);
QString fname;
- if(m_xpol) {
- fname=QFileDialog::getOpenFileName(this, "Open File", m_path,
- "MAP65 Files (*.tf2)");
- } else {
- fname=QFileDialog::getOpenFileName(this, "Open File", m_path,
- "MAP65 Files (*.iq)");
- }
+ fname=QFileDialog::getOpenFileName(this, "Open File", m_path,
+ "MAP65 Files (*.iq)");
if(fname != "") {
m_path=fname;
int i;
i=fname.indexOf(".iq") - 11;
- if(m_xpol) i=fname.indexOf(".tf2") - 11;
if(i>=0) {
lab1->setStyleSheet("QLabel{background-color: #66ff66}");
lab1->setText(" " + fname.mid(i,15) + " ");
@@ -903,7 +866,7 @@ void MainWindow::on_actionOpen_triggered() //Open File
m_diskData=true;
int dbDgrd=0;
if(m_myCall=="K1JT" and m_idInt<0) dbDgrd=m_idInt;
- *future1 = QtConcurrent::run(getfile, fname, m_xpol, dbDgrd);
+ *future1 = QtConcurrent::run(getfile, fname, false, dbDgrd);
watcher1->setFuture(*future1);
}
}
@@ -913,11 +876,7 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
int i,len;
QFileInfo fi(m_path);
QStringList list;
- if(m_xpol) {
- list= fi.dir().entryList().filter(".tf2");
- } else {
- list= fi.dir().entryList().filter(".iq");
- }
+ list= fi.dir().entryList().filter(".iq");
for (i = 0; i < list.size()-1; ++i) {
if(i==list.size()-2) m_loopall=false;
len=list.at(i).length();
@@ -927,7 +886,6 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
m_path=fname;
int i;
i=fname.indexOf(".iq") - 11;
- if(m_xpol) i=fname.indexOf(".tf2") - 11;
if(i>=0) {
lab1->setStyleSheet("QLabel{background-color: #66ff66}");
lab1->setText(" " + fname.mid(i,len) + " ");
@@ -935,7 +893,7 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
m_diskData=true;
int dbDgrd=0;
if(m_myCall=="K1JT" and m_idInt<0) dbDgrd=m_idInt;
- *future1 = QtConcurrent::run(getfile, fname, m_xpol, dbDgrd);
+ *future1 = QtConcurrent::run(getfile, fname, false, dbDgrd);
watcher1->setFuture(*future1);
return;
}
@@ -1106,14 +1064,12 @@ void MainWindow::decode() //decode()
datcom_.ntimeout=m_timeout;
datcom_.ntol=m_tol;
datcom_.nxant=0;
- if(m_xpolx) datcom_.nxant=1;
if(datcom_.nutc < m_nutc0) m_map65RxLog |= 1; //Date and Time to map65_rx.log
m_nutc0=datcom_.nutc;
datcom_.map65RxLog=m_map65RxLog;
datcom_.nfsample=96000;
if(!m_fs96000) datcom_.nfsample=95238;
datcom_.nxpol=0;
- if(m_xpol) datcom_.nxpol=1;
datcom_.nmode=10*m_modeQ65 + m_modeJT65;
// datcom_.nfast=1; //No longer used
datcom_.nsave=m_nsave;
@@ -1346,8 +1302,8 @@ void MainWindow::guiUpdate()
if(m_nrx==1) t="S1";
if(m_nrx==2) t="S2";
}
- if((abs(m_nrx)==1 and m_xpol) or (abs(m_nrx)==2 and !m_xpol))
- lab1->setStyleSheet("QLabel{background-color: #ff1493}");
+// if((abs(m_nrx)==1 and m_xpol) or (abs(m_nrx)==2 and !m_xpol))
+// lab1->setStyleSheet("QLabel{background-color: #ff1493}");
if(khsym==m_hsym0) {
t="Nil";
lab1->setStyleSheet("QLabel{background-color: #ffc0cb}");