diff --git a/about.cpp b/about.cpp
index d128e10b7..88b63e149 100644
--- a/about.cpp
+++ b/about.cpp
@@ -9,9 +9,8 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
ui->setupUi(this);
ui->labelTxt->clear();
m_Str = "
" + m_Revision + "
\n\n";
- m_Str += "MAP65 implements a wideband polarization-matching receiver
";
- m_Str += "for the JT65 protocol, with a matching transmitting facility.
";
- m_Str += "It is primarily intended for amateur radio EME communication.
";
+ m_Str += "JTMS3 implements an experimental mode for Amateur Radio
";
+ m_Str += "communication by Meteor Scatter.
";
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/devsetup.cpp b/devsetup.cpp
index ec00f6243..3c39b562d 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -31,7 +31,7 @@ void DevSetup::initDlg()
getDev(&numDevices,hostAPI_DeviceName,minChan,maxChan,minSpeed,maxSpeed);
k=0;
for(id=0; id= minSpeed[id] && 96000 <= maxSpeed[id]) {
+ if(48000 >= minSpeed[id] && 48000 <= maxSpeed[id]) {
m_inDevList[k]=id;
k++;
sprintf(s,"%2d %d %-49s",id,maxChan[id],hostAPI_DeviceName[id]);
@@ -81,26 +81,13 @@ void DevSetup::initDlg()
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.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);
- ui.soundCardRadioButton->setChecked(!m_network);
- ui.rb96000->setChecked(m_fs96000);
- ui.rb95238->setChecked(!m_fs96000);
- ui.comboBoxSndIn->setEnabled(!m_network);
ui.comboBoxSndIn->setCurrentIndex(m_nDevIn);
ui.comboBoxSndOut->setCurrentIndex(m_nDevOut);
- ui.sbPort->setValue(m_udpPort);
- ui.cbIQswap->setChecked(m_IQswap);
- ui.cb10db->setChecked(m_10db);
ui.cbInitIQplus->setChecked(m_initIQplus);
ui.mult570SpinBox->setValue(m_mult570);
ui.cal570SpinBox->setValue(m_cal570);
@@ -135,11 +122,8 @@ void DevSetup::accept()
// Check to see whether SoundInThread must be restarted,
// and save user parameters.
- 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;
+ if(m_nDevIn!=ui.comboBoxSndIn->currentIndex() or
+ m_paInDevice!=m_inDevList[m_nDevIn]) m_restartSoundIn=true;
if(m_nDevOut!=ui.comboBoxSndOut->currentIndex() or
m_paOutDevice!=m_outDevList[m_nDevOut]) m_restartSoundOut=true;
@@ -148,25 +132,15 @@ void DevSetup::accept()
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_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();
- m_fs96000=ui.rb96000->isChecked();
m_nDevIn=ui.comboBoxSndIn->currentIndex();
m_paInDevice=m_inDevList[m_nDevIn];
m_nDevOut=ui.comboBoxSndOut->currentIndex();
m_paOutDevice=m_outDevList[m_nDevOut];
- m_udpPort=ui.sbPort->value();
- m_IQswap=ui.cbIQswap->isChecked();
- m_10db=ui.cb10db->isChecked();
m_initIQplus=ui.cbInitIQplus->isChecked();
m_mult570=ui.mult570SpinBox->value();
m_cal570=ui.cal570SpinBox->value();
@@ -174,27 +148,6 @@ void DevSetup::accept()
QDialog::accept();
}
-void DevSetup::on_soundCardRadioButton_toggled(bool checked)
-{
- ui.comboBoxSndIn->setEnabled(ui.soundCardRadioButton->isChecked());
- ui.rb96000->setChecked(checked);
- ui.rb95238->setEnabled(!checked);
- ui.label_InputDev->setEnabled(checked);
- ui.label_Port->setEnabled(!checked);
- ui.sbPort->setEnabled(!checked);
- ui.cbIQswap->setEnabled(checked);
- ui.cb10db->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/devsetup.h b/devsetup.h
index 1fc34331f..f45c4ae66 100644
--- a/devsetup.h
+++ b/devsetup.h
@@ -53,8 +53,6 @@ public slots:
void accept();
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/devsetup.ui b/devsetup.ui
index 5a28f8655..d413252cb 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -89,13 +89,6 @@
- -
-
-
- Astro Font Size:
-
-
-
-
@@ -219,19 +212,6 @@
- -
-
-
- 12
-
-
- 32
-
-
- 20
-
-
-
-
@@ -381,154 +361,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
-
-
-
-
-
-
-
-
-
-
@@ -553,30 +385,6 @@
- -
-
-
-
-
-
-
- 75
- 20
-
-
-
- AzEl Directory:
-
-
-
- -
-
-
- C:\Users\joe\wsjt\map65
-
-
-
-
-
@@ -597,7 +405,7 @@
-
- Input Source (Rx, Baseband)
+ Input Device (Rx Audio)
@@ -609,133 +417,6 @@
-
-
-
-
-
-
-
- true
-
-
- SoundCard
-
-
- false
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Network
-
-
- true
-
-
-
-
-
- -
-
-
-
-
-
- false
-
-
-
- 0
- 20
-
-
-
- Swap I/Q
-
-
-
- -
-
-
- false
-
-
- +10 dB
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 57
- 0
-
-
-
- 20000
-
-
- 51000
-
-
- 50004
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 26
- 0
-
-
-
-
- 16777215
- 20
-
-
-
- Port
-
-
-
-
-
-
@@ -757,7 +438,7 @@
-
- false
+ true
@@ -795,93 +476,6 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 60
-
-
-
- Sample Rate
-
-
-
-
- 30
- 20
- 282
- 22
-
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- 96000 Hz
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- 95238 Hz
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7ca51c7f6..ffcdd3182 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -944,12 +944,12 @@ void MainWindow::diskWriteFinished() //diskWriteFinished
// qDebug() << "diskWriteFinished";
}
//Delete ../save/*.tf2
-void MainWindow::on_actionDelete_all_tf2_files_in_SaveDir_triggered()
+void MainWindow::on_actionDelete_all_wav_files_in_SaveDir_triggered()
{
int i;
QString fname;
int ret = QMessageBox::warning(this, "Confirm Delete",
- "Are you sure you want to delete all *.tf2 and *.iq files in\n" +
+ "Are you sure you want to delete all *.wav files in\n" +
QDir::toNativeSeparators(m_saveDir) + " ?",
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if(ret==QMessageBox::Yes) {
diff --git a/mainwindow.h b/mainwindow.h
index 888072a7a..dea576588 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -68,7 +68,7 @@ private slots:
void on_actionOpen_triggered();
void on_actionOpen_next_in_directory_triggered();
void on_actionDecode_remaining_files_in_directory_triggered();
- void on_actionDelete_all_tf2_files_in_SaveDir_triggered();
+ void on_actionDelete_all_wav_files_in_SaveDir_triggered();
void on_actionFind_Delta_Phi_triggered();
void on_actionF4_sets_Tx6_triggered();
void on_actionOnly_EME_calls_triggered();
diff --git a/mainwindow.ui b/mainwindow.ui
index 0a3b6c481..87c71e42d 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1149,10 +1149,9 @@ p, li { white-space: pre-wrap; }
-
-
-
-
+
+
+
@@ -1162,13 +1161,8 @@ p, li { white-space: pre-wrap; }
-
-
-
-
-
-
-
-
@@ -1194,12 +1185,8 @@ p, li { white-space: pre-wrap; }
Decode
-
-
-
-
@@ -1258,7 +1242,7 @@ p, li { white-space: pre-wrap; }
- About MAP65
+ About JTMS3
Ctrl+F1
@@ -1308,9 +1292,9 @@ p, li { white-space: pre-wrap; }
Shift+F6
-
+
- Delete all *.tf2 and *.iq files in SaveDir
+ Delete all *.wav files in SaveDir
@@ -1318,9 +1302,9 @@ p, li { white-space: pre-wrap; }
Erase Band Map and Messages
-
+
- Erase map65_rx.log
+ Erase jtms3_rx.log
@@ -1494,9 +1478,9 @@ p, li { white-space: pre-wrap; }
Available suffixes and add-on-prefixes
-
+
- Erase map65_tx.log
+ Erase jtms3_tx.log