mirror of https://github.com/saitohirga/WSJT-X.git
First cut at removing from GUI anything to do with legacy FT8 mode.
Note that calls to Fortran routines have not been changed.
This commit is contained in:
Joe Taylor
parent
096a459ae8
commit
60d6942cbe
|
|
@ -414,7 +414,6 @@ private:
|
|||
|
||||
void delete_stations ();
|
||||
void insert_station ();
|
||||
void chk77();
|
||||
|
||||
Q_SLOT void on_font_push_button_clicked ();
|
||||
Q_SLOT void on_decoded_text_font_push_button_clicked ();
|
||||
|
|
@ -451,7 +450,6 @@ private:
|
|||
Q_SLOT void on_cbHound_clicked (bool);
|
||||
Q_SLOT void on_cbx2ToneSpacing_clicked(bool);
|
||||
Q_SLOT void on_cbx4ToneSpacing_clicked(bool);
|
||||
Q_SLOT void on_rbNone_toggled(bool);
|
||||
Q_SLOT void on_rbFieldDay_toggled();
|
||||
Q_SLOT void on_rbRTTYroundup_toggled();
|
||||
Q_SLOT void on_FieldDay_Exchange_textChanged();
|
||||
|
|
@ -579,8 +577,6 @@ private:
|
|||
bool twoPass_;
|
||||
bool bFox_;
|
||||
bool bHound_;
|
||||
bool bGenerate77_;
|
||||
bool bDecode77_;
|
||||
bool bNoSpecial_;
|
||||
bool bFieldDay_;
|
||||
bool bRTTYroundup_;
|
||||
|
|
@ -679,8 +675,6 @@ bool Configuration::single_decode () const {return m_->single_decode_;}
|
|||
bool Configuration::twoPass() const {return m_->twoPass_;}
|
||||
bool Configuration::bFox() const {return m_->bFox_;}
|
||||
bool Configuration::bHound() const {return m_->bHound_;}
|
||||
bool Configuration::bGenerate77() const {return m_->bGenerate77_;}
|
||||
bool Configuration::bDecode77() const {return m_->bDecode77_;}
|
||||
bool Configuration::bNoSpecial() const {return m_->bNoSpecial_;}
|
||||
bool Configuration::bFieldDay() const {return m_->bFieldDay_;}
|
||||
bool Configuration::bRTTYroundup() const {return m_->bRTTYroundup_;}
|
||||
|
|
@ -835,7 +829,6 @@ void Configuration::setEU_VHF_Contest()
|
|||
{
|
||||
m_->bEU_VHF_Contest_ = true;
|
||||
m_->ui_->rbEU_VHF_Contest->setChecked(m_->bEU_VHF_Contest_);
|
||||
m_->ui_->cbGenerate77->setChecked(true);
|
||||
m_->write_settings();
|
||||
}
|
||||
|
||||
|
|
@ -925,7 +918,6 @@ Configuration::impl::impl (Configuration * self, QNetworkAccessManager * network
|
|||
, default_audio_output_device_selected_ {false}
|
||||
{
|
||||
ui_->setupUi (this);
|
||||
// ui_->groupBox_6->setVisible(false); //### Temporary ??? ###
|
||||
|
||||
{
|
||||
// Find a suitable data file location
|
||||
|
|
@ -1208,8 +1200,6 @@ void Configuration::impl::initialize_models ()
|
|||
ui_->cbTwoPass->setChecked(twoPass_);
|
||||
ui_->cbFox->setChecked(bFox_);
|
||||
ui_->cbHound->setChecked(bHound_);
|
||||
ui_->cbGenerate77->setChecked(bGenerate77_);
|
||||
ui_->cbDecode77->setChecked(bDecode77_);
|
||||
ui_->rbNone->setChecked(bNoSpecial_);
|
||||
ui_->rbFieldDay->setChecked(bFieldDay_);
|
||||
ui_->rbRTTYroundup->setChecked(bRTTYroundup_);
|
||||
|
|
@ -1256,7 +1246,6 @@ void Configuration::impl::initialize_models ()
|
|||
ui_->udpWindowRestore->setChecked(udpWindowRestore_);
|
||||
ui_->calibration_intercept_spin_box->setValue (calibration_.intercept);
|
||||
ui_->calibration_slope_ppm_spin_box->setValue (calibration_.slope_ppm);
|
||||
chk77();
|
||||
|
||||
if (rig_params_.ptt_port.isEmpty ())
|
||||
{
|
||||
|
|
@ -1461,8 +1450,6 @@ void Configuration::impl::read_settings ()
|
|||
twoPass_ = settings_->value("TwoPass",true).toBool ();
|
||||
bFox_ = settings_->value("Fox",false).toBool ();
|
||||
bHound_ = settings_->value("Hound",false).toBool ();
|
||||
bGenerate77_ = settings_->value("Generate77",false).toBool ();
|
||||
bDecode77_ = settings_->value("Decode77",false).toBool ();
|
||||
bNoSpecial_ = settings_->value("NoSpecial",false).toBool ();
|
||||
bFieldDay_ = settings_->value("FieldDay",false).toBool ();
|
||||
bRTTYroundup_ = settings_->value("RTTYroundup",false).toBool ();
|
||||
|
|
@ -1573,8 +1560,6 @@ void Configuration::impl::write_settings ()
|
|||
settings_->setValue ("TwoPass", twoPass_);
|
||||
settings_->setValue ("Fox", bFox_);
|
||||
settings_->setValue ("Hound", bHound_);
|
||||
settings_->setValue ("Generate77", bGenerate77_);
|
||||
settings_->setValue ("Decode77", bDecode77_);
|
||||
settings_->setValue ("NoSpecial", bNoSpecial_);
|
||||
settings_->setValue ("FieldDay", bFieldDay_);
|
||||
settings_->setValue ("RTTYroundup", bRTTYroundup_);
|
||||
|
|
@ -1983,8 +1968,6 @@ void Configuration::impl::accept ()
|
|||
bFox_ = ui_->cbFox->isChecked ();
|
||||
bHound_ = ui_->cbHound->isChecked ();
|
||||
if(bFox_ or bHound_) ui_->rbNone->setChecked(true); //###
|
||||
bGenerate77_ = ui_->cbGenerate77->isChecked();
|
||||
bDecode77_ = ui_->cbDecode77->isChecked();
|
||||
bNoSpecial_ = ui_->rbNone->isChecked ();
|
||||
bFieldDay_ = ui_->rbFieldDay->isChecked ();
|
||||
bRTTYroundup_ = ui_->rbRTTYroundup->isChecked ();
|
||||
|
|
@ -2474,7 +2457,6 @@ void Configuration::impl::on_cbFox_clicked (bool checked)
|
|||
ui_->cbHound->setChecked (false);
|
||||
ui_->rbNone->setChecked(true);
|
||||
}
|
||||
chk77();
|
||||
}
|
||||
|
||||
void Configuration::impl::on_cbHound_clicked (bool checked)
|
||||
|
|
@ -2483,22 +2465,6 @@ void Configuration::impl::on_cbHound_clicked (bool checked)
|
|||
ui_->cbFox->setChecked (false);
|
||||
ui_->rbNone->setChecked(true);
|
||||
}
|
||||
chk77();
|
||||
}
|
||||
|
||||
void Configuration::impl::chk77()
|
||||
{
|
||||
bool b77OK = !ui_->cbFox->isChecked() and !ui_->cbHound->isChecked();
|
||||
ui_->groupBox_9->setEnabled(b77OK);
|
||||
if(!b77OK) {
|
||||
ui_->cbGenerate77->setChecked(true);
|
||||
ui_->cbDecode77->setChecked(true);
|
||||
}
|
||||
}
|
||||
|
||||
void Configuration::impl::on_rbNone_toggled(bool b)
|
||||
{
|
||||
if(!b) ui_->cbGenerate77->setChecked(true);
|
||||
}
|
||||
|
||||
void Configuration::impl::on_rbFieldDay_toggled()
|
||||
|
|
|
|||
333
Configuration.ui
333
Configuration.ui
|
|
@ -2414,35 +2414,6 @@ Right click for insert and delete options.</string>
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_8">
|
||||
<property name="title">
|
||||
<string>FT8 message types</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbGenerate77">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>By default, early candidate releases of WSJT-X 2.0 generate 75-bit messages if the message content allows it.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Always generate 77-bit messages</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbDecode77">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Check this box to ignore FT8 transmissions using the older 75-bit protocol.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Decode only 77-bit messages</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="groupBox_7">
|
||||
<property name="title">
|
||||
|
|
@ -2472,154 +2443,7 @@ Right click for insert and delete options.</string>
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QGroupBox" name="groupBox_5">
|
||||
<property name="title">
|
||||
<string>Miscellaneous</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout_10">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Degrade S/N of .wav file: </string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>sbDegrade</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QDoubleSpinBox" name="sbDegrade">
|
||||
<property name="toolTip">
|
||||
<string>For offline sensitivity tests</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> dB</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="text">
|
||||
<string>Receiver bandwidth:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>sbBandwidth</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="sbBandwidth">
|
||||
<property name="toolTip">
|
||||
<string>For offline sensitivity tests</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> Hz</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>6000</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<number>100</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>2500</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_11">
|
||||
<property name="text">
|
||||
<string>Tx delay:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>sbTxDelay</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QDoubleSpinBox" name="sbTxDelay">
|
||||
<property name="toolTip">
|
||||
<string>Minimum delay between assertion of PTT and start of Tx audio.</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> s</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>0.500000000000000</double>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<double>0.100000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_10">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Tone spacing</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_19">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbx2ToneSpacing">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>x 2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbx4ToneSpacing">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Generate Tx audio with four times the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-4 before generating RF.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>x 4 </string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" colspan="2">
|
||||
<spacer name="verticalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_9">
|
||||
<property name="title">
|
||||
<string>Special operating activity: Generation of FT8 and MSK144 messages</string>
|
||||
|
|
@ -2819,6 +2643,153 @@ Right click for insert and delete options.</string>
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QGroupBox" name="groupBox_5">
|
||||
<property name="title">
|
||||
<string>Miscellaneous</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout_10">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Degrade S/N of .wav file: </string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>sbDegrade</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QDoubleSpinBox" name="sbDegrade">
|
||||
<property name="toolTip">
|
||||
<string>For offline sensitivity tests</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> dB</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="text">
|
||||
<string>Receiver bandwidth:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>sbBandwidth</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="sbBandwidth">
|
||||
<property name="toolTip">
|
||||
<string>For offline sensitivity tests</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> Hz</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>6000</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<number>100</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>2500</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_11">
|
||||
<property name="text">
|
||||
<string>Tx delay:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>sbTxDelay</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QDoubleSpinBox" name="sbTxDelay">
|
||||
<property name="toolTip">
|
||||
<string>Minimum delay between assertion of PTT and start of Tx audio.</string>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> s</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>0.500000000000000</double>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<double>0.100000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_10">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Tone spacing</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_19">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbx2ToneSpacing">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>x 2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbx4ToneSpacing">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Generate Tx audio with four times the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-4 before generating RF.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>x 4 </string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<spacer name="verticalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
|
|
@ -2947,8 +2918,6 @@ Right click for insert and delete options.</string>
|
|||
<tabstop>cbx4ToneSpacing</tabstop>
|
||||
<tabstop>cbFox</tabstop>
|
||||
<tabstop>cbHound</tabstop>
|
||||
<tabstop>cbGenerate77</tabstop>
|
||||
<tabstop>cbDecode77</tabstop>
|
||||
<tabstop>rbNone</tabstop>
|
||||
<tabstop>rbNA_VHF_Contest</tabstop>
|
||||
<tabstop>rbEU_VHF_Contest</tabstop>
|
||||
|
|
@ -3025,12 +2994,12 @@ Right click for insert and delete options.</string>
|
|||
</connection>
|
||||
</connections>
|
||||
<buttongroups>
|
||||
<buttongroup name="CAT_handshake_button_group"/>
|
||||
<buttongroup name="split_mode_button_group"/>
|
||||
<buttongroup name="TX_mode_button_group"/>
|
||||
<buttongroup name="CAT_data_bits_button_group"/>
|
||||
<buttongroup name="PTT_method_button_group"/>
|
||||
<buttongroup name="CAT_stop_bits_button_group"/>
|
||||
<buttongroup name="CAT_handshake_button_group"/>
|
||||
<buttongroup name="TX_audio_source_button_group"/>
|
||||
<buttongroup name="split_mode_button_group"/>
|
||||
<buttongroup name="CAT_stop_bits_button_group"/>
|
||||
</buttongroups>
|
||||
</ui>
|
||||
|
|
|
|||
|
|
@ -2745,7 +2745,7 @@ void MainWindow::decode() //decode()
|
|||
dec_data.params.nexp_decode=m_nContest;
|
||||
if(m_config.single_decode()) dec_data.params.nexp_decode += 32;
|
||||
if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64;
|
||||
dec_data.params.ldecode77 = m_config.bDecode77();
|
||||
dec_data.params.ldecode77 = true;
|
||||
|
||||
strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20);
|
||||
strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12);
|
||||
|
|
@ -3549,10 +3549,8 @@ void MainWindow::guiUpdate()
|
|||
* 7 Hashed calls (MSK144 short format)
|
||||
*/
|
||||
|
||||
m_isync=1;
|
||||
if(!m_config.bGenerate77() and itype == 6 and (m_i3>0 or m_n3>0)) m_isync=2;
|
||||
if(m_config.bGenerate77()) m_isync=2;
|
||||
if(m_isync==1) m_i3=0;
|
||||
m_isync=2;
|
||||
m_i3=0;
|
||||
char ft8msgbits[77];
|
||||
genft8_(message, &m_i3, &m_n3, &m_isync, msgsent,
|
||||
const_cast<char *> (ft8msgbits), const_cast<int *> (itone), 37, 37);
|
||||
|
|
@ -4742,22 +4740,18 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
|
|||
|
||||
bool bMyCall=stdCall(my_callsign);
|
||||
bool bHisCall=stdCall(hisCall);
|
||||
bool b77=(m_mode=="MSK144" or m_mode=="FT8") and
|
||||
(!bMyCall or !bHisCall or m_config.bGenerate77());
|
||||
|
||||
QString t0=hisBase + " " + m_baseCall + " ";
|
||||
QString t0s=hisCall + " " + my_callsign + " ";
|
||||
QString t0a,t0b;
|
||||
if(b77) {
|
||||
if(bHisCall and bMyCall) t0=hisCall + " " + my_callsign + " ";
|
||||
t0a="<"+hisCall + "> " + my_callsign + " ";
|
||||
t0b=hisCall + " <" + my_callsign + "> ";
|
||||
}
|
||||
|
||||
if(bHisCall and bMyCall) t0=hisCall + " " + my_callsign + " ";
|
||||
t0a="<"+hisCall + "> " + my_callsign + " ";
|
||||
t0b=hisCall + " <" + my_callsign + "> ";
|
||||
|
||||
QString t00=t0;
|
||||
QString t {t0 + my_grid};
|
||||
// if(b77 and (!bMyCall or !bHisCall)) t=t0a;
|
||||
if(b77 and (!bMyCall)) t=t0a;
|
||||
if(!bMyCall) t=t0a;
|
||||
msgtype(t, ui->tx1);
|
||||
if (eme_short_codes) {
|
||||
t=t+" OOO";
|
||||
|
|
@ -4779,11 +4773,11 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
|
|||
rst.sprintf("5%1d9 ",nn);
|
||||
rs=rst.mid(0,2);
|
||||
t=t0;
|
||||
if(b77 and !bMyCall) {
|
||||
if(!bMyCall) {
|
||||
t=t0b;
|
||||
msgtype(t0a, ui->tx1);
|
||||
}
|
||||
if(b77 and !bHisCall) {
|
||||
if(!bHisCall) {
|
||||
t=t0a;
|
||||
msgtype(t0a, ui->tx1);
|
||||
}
|
||||
|
|
@ -4860,7 +4854,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
|
|||
}
|
||||
}
|
||||
|
||||
if(m_config.bGenerate77() or "MSK144" == m_mode) return;
|
||||
if(m_mode=="FT8" or m_mode=="MSK144") return;
|
||||
|
||||
if (is_compound) {
|
||||
if (is_type_one) {
|
||||
|
|
@ -5117,7 +5111,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
|
|||
int i0=t.trimmed().length()-7;
|
||||
if(t.mid(i0,3)==" R ") text=false;
|
||||
}
|
||||
if(m_config.bGenerate77()) text=false;
|
||||
text=false;
|
||||
//### ... to here ...
|
||||
|
||||
|
||||
|
|
@ -5471,7 +5465,7 @@ void MainWindow::on_actionFT8_triggered()
|
|||
|
||||
if(!m_config.bFox() and !m_config.bHound()) {
|
||||
QString t0="";
|
||||
if(m_config.bGenerate77()) t0=" Tx2.0 ";
|
||||
t0=" Tx2.0 ";
|
||||
if(m_config.bNA_VHF_Contest()) t0+="NA VHF";
|
||||
if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
|
||||
if(m_config.bFieldDay()) t0+="Field Day";
|
||||
|
|
|
|||
Loading…
Reference in New Issue