w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure Plus 2kHz Check Box is disabled in Transmit when required.

Browse Source 
The Plus 2 kHz check box should  not be enabled during transmit if the
"Allow Tx Frequency Changes While Transmitting" is not checked.

Also fixed a  defect that caused the disabled during  Tx state of some
widgets to not clear due to transmit or tune period being shorter than
a poll interval.   Fixed by ensuring PTT changes  are always signalled
rather than waiting for the next poll.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4352 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-09-24 17:25:55 +00:00
parent fd8da26ff4
commit 758921d65e
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration.cpp
View File

@ -426,7 +426,7 @@ QString Configuration::my_grid () const {return m_->my_grid_;}
QFont Configuration::decoded_text_font () const {return m_->decoded_text_font_;} QFont Configuration::decoded_text_font () const {return m_->decoded_text_font_;}
qint32 Configuration::id_interval () const {return m_->id_interval_;} qint32 Configuration::id_interval () const {return m_->id_interval_;}
bool Configuration::id_after_73 () const {return m_->id_after_73_;} bool Configuration::id_after_73 () const {return m_->id_after_73_;}
bool Configuration::tx_QSY_allowed () const {return m_->tx_QSY_allowed_ || !split_mode ();} bool Configuration::tx_QSY_allowed () const {return m_->tx_QSY_allowed_;}
bool Configuration::spot_to_psk_reporter () const {return m_->spot_to_psk_reporter_;} bool Configuration::spot_to_psk_reporter () const {return m_->spot_to_psk_reporter_;}
bool Configuration::monitor_off_at_startup () const {return m_->monitor_off_at_startup_;} bool Configuration::monitor_off_at_startup () const {return m_->monitor_off_at_startup_;}
bool Configuration::log_as_RTTY () const {return m_->log_as_RTTY_;} bool Configuration::log_as_RTTY () const {return m_->log_as_RTTY_;}

4
OmniRigTransceiver.cpp
View File

@ -631,7 +631,9 @@ void OmniRigTransceiver::do_ptt (bool on)
if (state ().ptt () != on) if (state ().ptt () != on)
{ {
update_PTT (on); update_PTT (on);
update_complete ();
// no need for this as currently update_PTT() does it for us
// update_complete ();
} }
} }
} }

7
TransceiverBase.cpp
View File

@ -248,7 +248,14 @@ void TransceiverBase::update_mode (MODE m)
void TransceiverBase::update_PTT (bool state) void TransceiverBase::update_PTT (bool state)
{ {
auto prior = m_->state_.ptt ();
m_->state_.ptt (state); m_->state_.ptt (state);
if (state != prior)
{
// always signal PTT changes because some MainWindow logic
// depends on it
update_complete ();
}
} }
void TransceiverBase::update_complete () void TransceiverBase::update_complete ()

6
mainwindow.cpp
View File

@ -2987,7 +2987,7 @@ void MainWindow::transmitDisplay (bool transmitting)
m_btxok=true; m_btxok=true;
} }
auto QSY_allowed = !transmitting || m_config.tx_QSY_allowed (); auto QSY_allowed = !transmitting || m_config.tx_QSY_allowed () || !m_config.split_mode ();
if (ui->cbTxLock->isChecked ()) if (ui->cbTxLock->isChecked ())
{ {
ui->RxFreqSpinBox->setEnabled (QSY_allowed); ui->RxFreqSpinBox->setEnabled (QSY_allowed);
@ -2996,7 +2996,9 @@ void MainWindow::transmitDisplay (bool transmitting)
ui->TxFreqSpinBox->setEnabled (QSY_allowed); ui->TxFreqSpinBox->setEnabled (QSY_allowed);
ui->pbR2T->setEnabled (QSY_allowed); ui->pbR2T->setEnabled (QSY_allowed);
ui->cbTxLock->setEnabled (QSY_allowed); ui->cbTxLock->setEnabled (QSY_allowed);
ui->cbPlus2kHz->setEnabled (QSY_allowed);
// only allow +2kHz when not transmitting or if TX QSYs are allowed
ui->cbPlus2kHz->setEnabled (!transmitting || m_config.tx_QSY_allowed ());
// the following are always disallowed in transmit // the following are always disallowed in transmit
ui->menuMode->setEnabled (!transmitting); ui->menuMode->setEnabled (!transmitting);