Cleaning up the "devsetup" screen. NB: List of audio input devices is not

being populated.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2476 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-07-02 16:13:21 +00:00
parent 1bc6935e93
commit c20b08d8f6
7 changed files with 20 additions and 492 deletions

View File

@ -9,9 +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 += "MAP65 implements a wideband polarization-matching receiver <br>";
m_Str += "for the JT65 protocol, with a matching transmitting facility. <br>";
m_Str += "It is primarily intended for amateur radio EME communication. <br><br>";
m_Str += "JTMS3 implements an experimental mode for Amateur Radio <br>";
m_Str += "communication by Meteor Scatter. <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);

View File

@ -31,7 +31,7 @@ void DevSetup::initDlg()
getDev(&numDevices,hostAPI_DeviceName,minChan,maxChan,minSpeed,maxSpeed);
k=0;
for(id=0; id<numDevices; id++) {
if(96000 >= 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;

View File

@ -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);

View File

@ -89,13 +89,6 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Astro Font Size:</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -219,19 +212,6 @@
</item>
</widget>
</item>
<item>
<widget class="QSpinBox" name="astroFont">
<property name="minimum">
<number>12</number>
</property>
<property name="maximum">
<number>32</number>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -381,154 +361,6 @@
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="antennaGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>55</height>
</size>
</property>
<property name="title">
<string>Antennas:</string>
</property>
<widget class="QWidget" name="layoutWidget_1">
<property name="geometry">
<rect>
<x>10</x>
<y>23</y>
<width>321</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="cbXpol">
<property name="text">
<string>Xpol</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="rbAntenna">
<property name="text">
<string>+</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rbAntennaX">
<property name="text">
<string>x</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelDphi">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Dphi:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="dPhiSpinBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="minimum">
<number>-180</number>
</property>
<property name="maximum">
<number>180</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
@ -553,30 +385,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_6">
<property name="minimumSize">
<size>
<width>75</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>AzEl Directory:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="azelDirEntry">
<property name="text">
<string>C:\Users\joe\wsjt\map65</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
@ -597,7 +405,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Input Source (Rx, Baseband)</string>
<string>Input Device (Rx Audio)</string>
</property>
<widget class="QWidget" name="layoutWidget_3">
<property name="geometry">
@ -609,133 +417,6 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="soundCardRadioButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>SoundCard</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="networkRadioButton">
<property name="text">
<string>Network</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QCheckBox" name="cbIQswap">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Swap I/Q</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb10db">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>+10 dB</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="sbPort">
<property name="minimumSize">
<size>
<width>57</width>
<height>0</height>
</size>
</property>
<property name="minimum">
<number>20000</number>
</property>
<property name="maximum">
<number>51000</number>
</property>
<property name="value">
<number>50004</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_Port">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>26</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_InputDev">
<property name="enabled">
@ -757,7 +438,7 @@
<item>
<widget class="QComboBox" name="comboBoxSndIn">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
</item>
@ -795,93 +476,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>60</height>
</size>
</property>
<property name="title">
<string>Sample Rate</string>
</property>
<widget class="QWidget" name="layoutWidget_4">
<property name="geometry">
<rect>
<x>30</x>
<y>20</y>
<width>282</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="rb96000">
<property name="text">
<string>96000 Hz</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="rb95238">
<property name="text">
<string>95238 Hz</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>

View File

@ -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) {

View File

@ -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();

View File

@ -1149,10 +1149,9 @@ p, li { white-space: pre-wrap; }
<addaction name="actionOpen_next_in_directory"/>
<addaction name="actionDecode_remaining_files_in_directory"/>
<addaction name="separator"/>
<addaction name="actionDelete_all_tf2_files_in_SaveDir"/>
<addaction name="actionErase_Band_Map_and_Messages"/>
<addaction name="actionErase_map65_rx_log"/>
<addaction name="actionErase_map65_tx_log"/>
<addaction name="actionDelete_all_wav_files_in_SaveDir"/>
<addaction name="actionErase_jtms3_rx_log"/>
<addaction name="actionErase_jtms3_tx_log"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
@ -1162,13 +1161,8 @@ p, li { white-space: pre-wrap; }
</property>
<addaction name="actionDeviceSetup"/>
<addaction name="separator"/>
<addaction name="actionAdjust_IQ_Calibration"/>
<addaction name="actionApply_IQ_Calibration"/>
<addaction name="actionFind_Delta_Phi"/>
<addaction name="separator"/>
<addaction name="actionF4_sets_Tx6"/>
<addaction name="separator"/>
<addaction name="actionFUNcube_Dongle"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
@ -1183,9 +1177,6 @@ p, li { white-space: pre-wrap; }
<addaction name="actionAFMHot"/>
<addaction name="actionBlue"/>
</widget>
<addaction name="actionAstro_Data"/>
<addaction name="actionBand_Map"/>
<addaction name="actionMessages"/>
<addaction name="actionWide_Waterfall"/>
<addaction name="separator"/>
<addaction name="menuWaterfall_palette"/>
@ -1194,12 +1185,8 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>Decode</string>
</property>
<addaction name="actionOnly_EME_calls"/>
<addaction name="actionNo_shorthands_if_Tx1"/>
<addaction name="separator"/>
<addaction name="actionNo_Deep_Search"/>
<addaction name="actionNormal_Deep_Search"/>
<addaction name="actionAggressive_Deep_Search"/>
</widget>
<widget class="QMenu" name="menuSave">
<property name="title">
@ -1222,9 +1209,6 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>Mode</string>
</property>
<addaction name="actionJT65A"/>
<addaction name="actionJT65B"/>
<addaction name="actionJT65C"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuSetup"/>
@ -1258,7 +1242,7 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionAbout">
<property name="text">
<string> About MAP65</string>
<string> About JTMS3</string>
</property>
<property name="shortcut">
<string>Ctrl+F1</string>
@ -1308,9 +1292,9 @@ p, li { white-space: pre-wrap; }
<string>Shift+F6</string>
</property>
</action>
<action name="actionDelete_all_tf2_files_in_SaveDir">
<action name="actionDelete_all_wav_files_in_SaveDir">
<property name="text">
<string>Delete all *.tf2 and *.iq files in SaveDir</string>
<string>Delete all *.wav files in SaveDir</string>
</property>
</action>
<action name="actionErase_Band_Map_and_Messages">
@ -1318,9 +1302,9 @@ p, li { white-space: pre-wrap; }
<string>Erase Band Map and Messages</string>
</property>
</action>
<action name="actionErase_map65_rx_log">
<action name="actionErase_jtms3_rx_log">
<property name="text">
<string>Erase map65_rx.log</string>
<string>Erase jtms3_rx.log</string>
</property>
</action>
<action name="actionLinrad">
@ -1494,9 +1478,9 @@ p, li { white-space: pre-wrap; }
<string>Available suffixes and add-on-prefixes</string>
</property>
</action>
<action name="actionErase_map65_tx_log">
<action name="actionErase_jtms3_tx_log">
<property name="text">
<string>Erase map65_tx.log</string>
<string>Erase jtms3_tx.log</string>
</property>
</action>
<action name="actionJT65A">