w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove code associated with the unimplemented JT9W mode. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6061 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-11-09 17:19:48 +00:00
parent fd47942a4d
commit c838673bbd
8 changed files with 37 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Configuration.cpp
View File

@ -458,10 +458,6 @@ private:
bool restart_sound_input_device_;
bool restart_sound_output_device_;
unsigned jt9w_bw_mult_;
float jt9w_min_dt_;
float jt9w_max_dt_;
Type2MsgGen type_2_msg_gen_;
QStringListModel macros_;
@ -583,9 +579,6 @@ QAudioDeviceInfo const& Configuration::audio_output_device () const {return m_->
AudioDevice::Channel Configuration::audio_output_channel () const {return m_->audio_output_channel_;}
bool Configuration::restart_audio_input () const {return m_->restart_sound_input_device_;}
bool Configuration::restart_audio_output () const {return m_->restart_sound_output_device_;}
unsigned Configuration::jt9w_bw_mult () const {return m_->jt9w_bw_mult_;}
float Configuration::jt9w_min_dt () const {return m_->jt9w_min_dt_;}
float Configuration::jt9w_max_dt () const {return m_->jt9w_max_dt_;}
auto Configuration::type_2_msg_gen () const -> Type2MsgGen {return m_->type_2_msg_gen_;}
QString Configuration::my_callsign () const {return m_->my_callsign_;}
QString Configuration::my_grid () const {return m_->my_grid_;}
@ -976,10 +969,6 @@ Configuration::impl::impl (Configuration * self, QSettings * settings, QWidget *
initialize_models ();
transceiver_thread_.start ();
#if !WSJT_ENABLE_EXPERIMENTAL_FEATURES
ui_->jt9w_group_box->setEnabled (false);
#endif
}
Configuration::impl::~impl ()
@ -1036,9 +1025,6 @@ void Configuration::impl::initialize_models ()
ui_->TX_messages_check_box->setChecked (TX_messages_);
ui_->enable_VHF_features_check_box->setChecked(enable_VHF_features_);
ui_->decode_at_52s_check_box->setChecked(decode_at_52s_);
ui_->jt9w_bandwidth_mult_combo_box->setCurrentText (QString::number (jt9w_bw_mult_));
ui_->jt9w_min_dt_double_spin_box->setValue (jt9w_min_dt_);
ui_->jt9w_max_dt_double_spin_box->setValue (jt9w_max_dt_);
ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_);
ui_->rig_combo_box->setCurrentText (rig_params_.rig_name);
ui_->TX_mode_button_group->button (data_mode_)->setChecked (true);
@ -1199,19 +1185,12 @@ void Configuration::impl::read_settings ()
// retrieve audio channel info
audio_input_channel_ = AudioDevice::fromString (settings_->value ("AudioInputChannel", "Mono").toString ());
audio_output_channel_ = AudioDevice::fromString (settings_->value ("AudioOutputChannel", "Mono").toString ());
jt9w_bw_mult_ = settings_->value ("ToneMult", 1).toUInt ();
jt9w_min_dt_ = settings_->value ("DTmin", -2.5).toFloat ();
jt9w_max_dt_ = settings_->value ("DTmax", 5.).toFloat ();
type_2_msg_gen_ = settings_->value ("Type2MsgGen", QVariant::fromValue (Configuration::type_2_msg_3_full)).value<Configuration::Type2MsgGen> ();
monitor_off_at_startup_ = settings_->value ("MonitorOFF", false).toBool ();
monitor_last_used_ = settings_->value ("MonitorLastUsed", false).toBool ();
spot_to_psk_reporter_ = settings_->value ("PSKReporter", false).toBool ();
id_after_73_ = settings_->value ("After73", false).toBool ();
tx_QSY_allowed_ = settings_->value ("TxQSYAllowed", false).toBool ();
macros_.setStringList (settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList ());
if (settings_->contains ("FrequenciesForModes"))
@ -1312,9 +1291,6 @@ void Configuration::impl::write_settings ()
settings_->setValue ("AudioInputChannel", AudioDevice::toString (audio_input_channel_));
settings_->setValue ("AudioOutputChannel", AudioDevice::toString (audio_output_channel_));
settings_->setValue ("ToneMult", jt9w_bw_mult_);
settings_->setValue ("DTmin", jt9w_min_dt_);
settings_->setValue ("DTmax", jt9w_max_dt_);
settings_->setValue ("Type2MsgGen", QVariant::fromValue (type_2_msg_gen_));
settings_->setValue ("MonitorOFF", monitor_off_at_startup_);
settings_->setValue ("MonitorLastUsed", monitor_last_used_);
@ -1693,9 +1669,6 @@ void Configuration::impl::accept ()
tx_QSY_allowed_ = ui_->tx_QSY_check_box->isChecked ();
monitor_off_at_startup_ = ui_->monitor_off_check_box->isChecked ();
monitor_last_used_ = ui_->monitor_last_used_check_box->isChecked ();
jt9w_bw_mult_ = ui_->jt9w_bandwidth_mult_combo_box->currentText ().toUInt ();
jt9w_min_dt_ = static_cast<float> (ui_->jt9w_min_dt_double_spin_box->value ());
jt9w_max_dt_ = static_cast<float> (ui_->jt9w_max_dt_double_spin_box->value ());
type_2_msg_gen_ = static_cast<Type2MsgGen> (ui_->type_2_msg_gen_combo_box->currentIndex ());
log_as_RTTY_ = ui_->log_as_RTTY_check_box->isChecked ();
report_in_comments_ = ui_->report_in_comments_check_box->isChecked ();

3
Configuration.hpp
View File

@ -127,9 +127,6 @@ public:
QDir save_directory () const;
QDir azel_directory () const;
QString rig_name () const;
unsigned jt9w_bw_mult () const;
float jt9w_min_dt () const;
float jt9w_max_dt () const;
Type2MsgGen type_2_msg_gen () const;
QColor color_CQ () const;
QColor color_MyCall () const;

203
Configuration.ui
View File

@ -20,7 +20,7 @@
<string>Select tab to change configuration parameters.</string>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="general_tab">
<attribute name="title">
@ -1180,26 +1180,6 @@ radio interface behave as expected.</string>
<string>Audio interface settings</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="6" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="save_path_group_box">
<property name="title">
@ -1367,160 +1347,6 @@ both here.</string>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="jt9w_group_box">
<property name="title">
<string>JT9W Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="jt9w_bandwidth_mult_combo_box">
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>16</string>
</property>
</item>
<item>
<property name="text">
<string>32</string>
</property>
</item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
<item>
<property name="text">
<string>128</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Bandwidth Multiplier:</string>
</property>
<property name="buddy">
<cstring>jt9w_bandwidth_mult_combo_box</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
<layout class="QFormLayout" name="formLayout_3">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>DT Max:</string>
</property>
<property name="buddy">
<cstring>jt9w_max_dt_double_spin_box</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>DT Min:</string>
</property>
<property name="buddy">
<cstring>jt9w_min_dt_double_spin_box</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="jt9w_min_dt_double_spin_box">
<property name="suffix">
<string> s</string>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-2.500000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>-2.500000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="jt9w_max_dt_double_spin_box">
<property name="suffix">
<string> s</string>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-2.500000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>5.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<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>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="azel_path_group_box">
<property name="minimumSize">
@ -1566,6 +1392,26 @@ both here.</string>
</layout>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tx_macros_tab">
@ -2344,9 +2190,6 @@ soundcard changes</string>
<tabstop>sound_output_channel_combo_box</tabstop>
<tabstop>save_path_select_push_button</tabstop>
<tabstop>azel_path_select_push_button</tabstop>
<tabstop>jt9w_bandwidth_mult_combo_box</tabstop>
<tabstop>jt9w_min_dt_double_spin_box</tabstop>
<tabstop>jt9w_max_dt_double_spin_box</tabstop>
<tabstop>add_macro_line_edit</tabstop>
<tabstop>add_macro_push_button</tabstop>
<tabstop>delete_macro_push_button</tabstop>
@ -2440,12 +2283,12 @@ soundcard changes</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
</buttongroups>
</ui>

1
Modes.cpp
View File

@ -12,7 +12,6 @@ namespace
"",
"JT65",
"JT9",
"JT9W-1",
"JT4",
"WSPR",
"Echo",

1
Modes.hpp
View File

@ -17,7 +17,6 @@ public:
NULL_MODE,
JT65,
JT9,
JT9W_1,
JT4,
WSPR,
Echo,

71
mainwindow.cpp
View File

@ -240,7 +240,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
QActionGroup* modeGroup = new QActionGroup(this);
ui->actionJT9_1->setActionGroup(modeGroup);
ui->actionJT9W_1->setActionGroup(modeGroup);
ui->actionJT65->setActionGroup(modeGroup);
ui->actionJT9_JT65->setActionGroup(modeGroup);
ui->actionJT4->setActionGroup(modeGroup);
@ -509,7 +508,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
genStdMsgs(m_rpt);
m_ntx=6;
ui->txrb6->setChecked(true);
if(m_mode!="JT9" and m_mode!="JT9W-1" and m_mode!="JT65" and m_mode!="JT9+JT65"
if(m_mode!="JT9" and m_mode!="JT65" and m_mode!="JT9+JT65"
and m_mode!="JT4" and m_mode!="WSPR-2" and m_mode!="WSPR-15" and
m_mode!="Echo") m_mode="JT9";
on_actionWide_Waterfall_triggered(); //###
@ -519,7 +518,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
if(m_mode=="JT4") on_actionJT4_triggered();
if(m_mode=="JT9") on_actionJT9_1_triggered();
if(m_mode=="JT9W-1") on_actionJT9W_1_triggered();
if(m_mode=="JT65") on_actionJT65_triggered();
if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered();
if(m_mode=="WSPR-2") on_actionWSPR_2_triggered();
@ -576,11 +574,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_dialFreqRxWSPR=0;
wsprNet = new WSPRNet(this);
connect( wsprNet, SIGNAL(uploadStatus(QString)), this, SLOT(uploadResponse(QString)));
//### Remove this stuff!
#if !WSJT_ENABLE_EXPERIMENTAL_FEATURES
ui->actionJT9W_1->setEnabled (false);
#endif
}
//--------------------------------------------------- MainWindow destructor
@ -911,8 +904,6 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
pskSetLocal ();
}
if(m_mode=="JT9W-1") m_toneSpacing=pow(2,m_config.jt9w_bw_mult ())*12000.0/6912.0;
if(m_config.restart_audio_input ()) {
Q_EMIT startAudioInputStream (m_config.audio_input_device (), m_framesAudioInputBuffered, m_detector, m_downSampleFactor, m_config.audio_input_channel ());
}
@ -1518,7 +1509,6 @@ void MainWindow::decode() //decode()
jt9com_.ntxmode=9;
if(m_modeTx=="JT65") jt9com_.ntxmode=65;
jt9com_.nmode=9;
if(m_mode=="JT9W-1") jt9com_.nmode=91;
if(m_mode=="JT65") jt9com_.nmode=65;
if(m_mode=="JT9+JT65") jt9com_.nmode=9+65; // = 74
if(m_mode=="JT4") {
@ -1737,24 +1727,19 @@ void MainWindow::decodeBusy(bool b) //decodeBusy()
if ("JT9+JT65" == m_mode) m_firstDecode = 65 + 9;
showProgress = true;
}
if (b && m_firstDecode != 9 && m_firstDecode != 65 + 9 &&
("JT9" == m_mode || "JT9W-1" == m_mode))
{
m_firstDecode += 9;
showProgress = true;
}
if (showProgress)
{
// this sequence is needed to create an indeterminate progress
// bar
m_optimizingProgress.setRange (0, 1);
m_optimizingProgress.setValue (0);
m_optimizingProgress.setRange (0, 0);
}
if (!b)
{
m_optimizingProgress.reset ();
}
if (b && m_firstDecode != 9 && m_firstDecode != 65 + 9 && ("JT9" == m_mode)) {
m_firstDecode += 9;
showProgress = true;
}
if (showProgress) {
// this sequence is needed to create an indeterminate progress bar
m_optimizingProgress.setRange (0, 1);
m_optimizingProgress.setValue (0);
m_optimizingProgress.setRange (0, 0);
}
if (!b) {
m_optimizingProgress.reset ();
}
m_decoderBusy=b;
ui->DecodeButton->setEnabled(!b);
@ -2944,34 +2929,6 @@ void MainWindow::on_actionJT9_1_triggered()
ui->label_7->setText("Rx Frequency");
}
void MainWindow::on_actionJT9W_1_triggered()
{
m_mode="JT9W-1";
switch_mode (Modes::JT9W_1);
if(m_modeTx!="JT9") on_pbTxMode_clicked();
statusChanged();
m_TRperiod=60;
m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe
m_detector->setPeriod(m_TRperiod); // TODO - not thread safe
m_nsps=6912;
m_hsymStop=173;
if(m_config.decode_at_52s()) m_hsymStop=181;
m_toneSpacing=pow(2,m_config.jt9w_bw_mult ())*12000.0/6912.0;
mode_label->setStyleSheet("QLabel{background-color: #ff6ec7}");
mode_label->setText(m_mode);
ui->ClrAvgButton->setVisible(false);
ui->actionJT9W_1->setChecked(true);
VHF_features_enabled(false);
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
m_wideGraph->setMode(m_mode);
m_wideGraph->setModeTx(m_modeTx);
ui->pbTxMode->setEnabled(false);
VHF_controls_visible(false);
WSPR_config(false);
ui->label_6->setText("Band Activity");
ui->label_7->setText("Rx Frequency");
}
void MainWindow::on_actionJT65_triggered()
{
if(m_mode=="JT4" or m_mode.mid(0,4)=="WSPR") {

1
mainwindow.h
View File

@ -194,7 +194,6 @@ private slots:
void on_actionAstronomical_data_triggered();
void on_actionShort_list_of_add_on_prefixes_and_suffixes_triggered();
void getpfx();
void on_actionJT9W_1_triggered();
void band_changed (Frequency);
void monitor (bool);
void stop_tuning ();

9
mainwindow.ui
View File

@ -2329,7 +2329,6 @@ QPushButton[state=&quot;ok&quot;] {
<addaction name="actionJT9_1"/>
<addaction name="actionJT65"/>
<addaction name="actionJT9_JT65"/>
<addaction name="actionJT9W_1"/>
<addaction name="actionJT4"/>
<addaction name="actionWSPR_2"/>
<addaction name="actionWSPR_15"/>
@ -2656,14 +2655,6 @@ QPushButton[state=&quot;ok&quot;] {
<string>Astronomical data</string>
</property>
</action>
<action name="actionJT9W_1">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>JT9W-1</string>
</property>
</action>
<action name="actionShort_list_of_add_on_prefixes_and_suffixes">
<property name="text">
<string>Short list of add-on prefixes and suffixes</string>