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

Fix some logic errors in CAT serial port control line settings

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6588 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-04-06 17:11:41 +00:00
parent dae625e6ce
commit d63230729b
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Configuration.cpp
View File

@ -1457,14 +1457,21 @@ void Configuration::impl::set_rig_invariants ()
ui_->PTT_port_combo_box->setEnabled (enable_ptt_port); ui_->PTT_port_combo_box->setEnabled (enable_ptt_port);
ui_->PTT_port_label->setEnabled (enable_ptt_port); ui_->PTT_port_label->setEnabled (enable_ptt_port);
if (CAT_indirect_serial_PTT)
{
ui_->PTT_port_combo_box->setItemData (ui_->PTT_port_combo_box->findText ("CAT") ui_->PTT_port_combo_box->setItemData (ui_->PTT_port_combo_box->findText ("CAT")
, CAT_indirect_serial_PTT ? combo_box_item_enabled : combo_box_item_disabled , combo_box_item_enabled, Qt::UserRole - 1);
, Qt::UserRole - 1); }
else
ui_->PTT_DTR_radio_button->setEnabled (!("CAT" == ptt_port && !CAT_indirect_serial_PTT)); {
ui_->PTT_port_combo_box->setItemData (ui_->PTT_port_combo_box->findText ("CAT")
ui_->PTT_RTS_radio_button->setEnabled (!((is_serial_CAT && ptt_port == cat_port && is_hw_handshake) , combo_box_item_disabled, Qt::UserRole - 1);
|| ("CAT" == ptt_port && !CAT_indirect_serial_PTT))); if ("CAT" == ui_->PTT_port_combo_box->currentText () && ui_->PTT_port_combo_box->currentIndex () > 0)
{
ui_->PTT_port_combo_box->setCurrentIndex (ui_->PTT_port_combo_box->currentIndex () - 1);
}
}
ui_->PTT_RTS_radio_button->setEnabled (!(is_serial_CAT && ptt_port == cat_port && is_hw_handshake));
if (TransceiverFactory::basic_transceiver_name_ == rig) if (TransceiverFactory::basic_transceiver_name_ == rig)
{ {
@ -1631,9 +1638,9 @@ TransceiverFactory::ParameterPack Configuration::impl::gather_rig_data ()
result.stop_bits = static_cast<TransceiverFactory::StopBits> (ui_->CAT_stop_bits_button_group->checkedId ()); result.stop_bits = static_cast<TransceiverFactory::StopBits> (ui_->CAT_stop_bits_button_group->checkedId ());
result.handshake = static_cast<TransceiverFactory::Handshake> (ui_->CAT_handshake_button_group->checkedId ()); result.handshake = static_cast<TransceiverFactory::Handshake> (ui_->CAT_handshake_button_group->checkedId ());
result.force_dtr = ui_->force_DTR_combo_box->isEnabled () && ui_->force_DTR_combo_box->currentIndex () > 0; result.force_dtr = ui_->force_DTR_combo_box->isEnabled () && ui_->force_DTR_combo_box->currentIndex () > 0;
result.dtr_high = 1 == ui_->force_DTR_combo_box->currentIndex (); result.dtr_high = ui_->force_DTR_combo_box->isEnabled () && 1 == ui_->force_DTR_combo_box->currentIndex ();
result.force_rts = ui_->force_RTS_combo_box->isEnabled () && ui_->force_RTS_combo_box->currentIndex () > 0; result.force_rts = ui_->force_RTS_combo_box->isEnabled () && ui_->force_RTS_combo_box->currentIndex () > 0;
result.rts_high = 1 == ui_->force_RTS_combo_box->currentIndex (); result.rts_high = ui_->force_RTS_combo_box->isEnabled () && 1 == ui_->force_RTS_combo_box->currentIndex ();
result.poll_interval = ui_->CAT_poll_interval_spin_box->value (); result.poll_interval = ui_->CAT_poll_interval_spin_box->value ();
result.ptt_type = static_cast<TransceiverFactory::PTTMethod> (ui_->PTT_method_button_group->checkedId ()); result.ptt_type = static_cast<TransceiverFactory::PTTMethod> (ui_->PTT_method_button_group->checkedId ());
result.ptt_port = ui_->PTT_port_combo_box->currentText (); result.ptt_port = ui_->PTT_port_combo_box->currentText ();

35
Configuration.ui
View File

@ -2,14 +2,6 @@
<ui version="4.0"> <ui version="4.0">
<class>configuration_dialog</class> <class>configuration_dialog</class>
<widget class="QDialog" name="configuration_dialog"> <widget class="QDialog" name="configuration_dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>614</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
@ -807,7 +799,7 @@ a few, particularly some Kenwood rigs, require it).</string>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QRadioButton" name="PTT_DTR_radio_button"> <widget class="QRadioButton" name="PTT_DTR_radio_button">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the RS-232 DTR control line to toggle your radio's PTT,&lt;/p&gt;&lt;p&gt;requires hardware to inteface the line.&lt;/p&gt;&lt;p&gt;Some commercial interface units also use this method.&lt;/p&gt;&lt;p&gt;The DTR control line of the CAT serial port may be used for this or&lt;/p&gt;&lt;p&gt;a DTR control line on a different serial port may be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the RS-232 DTR control line to toggle your radio's PTT, requires hardware to inteface the line.&lt;/p&gt;&lt;p&gt;Some commercial interface units also use this method.&lt;/p&gt;&lt;p&gt;The DTR control line of the CAT serial port may be used for this or a DTR control line on a different serial port may be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;DTR</string> <string>&amp;DTR</string>
@ -838,7 +830,7 @@ other hardware interface for PTT.</string>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QRadioButton" name="PTT_RTS_radio_button"> <widget class="QRadioButton" name="PTT_RTS_radio_button">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the RS-232 RTS control line to toggle your radio's PTT,&lt;/p&gt;&lt;p&gt;requires hardware to inteface the line.&lt;/p&gt;&lt;p&gt;Some commercial interface units also use this method.&lt;/p&gt;&lt;p&gt;The RTS control line of the CAT serial port may be used for this or&lt;/p&gt;&lt;p&gt;a RTS control line on a different serial port may be used.&lt;/p&gt;&lt;p&gt;Note that this options is not available on the CAT serial port&lt;/p&gt;&lt;p&gt;when hardware flow control is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the RS-232 RTS control line to toggle your radio's PTT, requires hardware to inteface the line.&lt;/p&gt;&lt;p&gt;Some commercial interface units also use this method.&lt;/p&gt;&lt;p&gt;The RTS control line of the CAT serial port may be used for this or a RTS control line on a different serial port may be used. Note that this option is not available on the CAT serial port when hardware flow control is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>R&amp;TS</string> <string>R&amp;TS</string>
@ -872,7 +864,7 @@ other hardware interface for PTT.</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the RS-232 serial port utilised for PTT control,&lt;/p&gt;&lt;p&gt;this option is available when DTR or RTS is selected above&lt;/p&gt;&lt;p&gt;as a transmit method.&lt;/p&gt;&lt;p&gt;This port can be the same one as the one used for CAT control.&lt;/p&gt;&lt;p&gt;For some interface types the special value CAT may be chosen,&lt;/p&gt;&lt;p&gt;this is used for non-serial CAT interfaces that can control&lt;/p&gt;&lt;p&gt;serial port control lines remotely (OmniRig for example).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the RS-232 serial port utilised for PTT control, this option is available when DTR or RTS is selected above as a transmit method.&lt;/p&gt;&lt;p&gt;This port can be the same one as the one used for CAT control.&lt;/p&gt;&lt;p&gt;For some interface types the special value CAT may be chosen, this is used for non-serial CAT interfaces that can control serial port control lines remotely (OmniRig for example).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
@ -2403,6 +2395,7 @@ soundcard changes</string>
<tabstop>disable_TX_on_73_check_box</tabstop> <tabstop>disable_TX_on_73_check_box</tabstop>
<tabstop>watchdog_check_box</tabstop> <tabstop>watchdog_check_box</tabstop>
<tabstop>decode_at_52s_check_box</tabstop> <tabstop>decode_at_52s_check_box</tabstop>
<tabstop>offset_Rx_freq_check_box</tabstop>
<tabstop>CW_id_after_73_check_box</tabstop> <tabstop>CW_id_after_73_check_box</tabstop>
<tabstop>CW_id_interval_spin_box</tabstop> <tabstop>CW_id_interval_spin_box</tabstop>
<tabstop>rig_combo_box</tabstop> <tabstop>rig_combo_box</tabstop>
@ -2419,8 +2412,8 @@ soundcard changes</string>
<tabstop>force_DTR_combo_box</tabstop> <tabstop>force_DTR_combo_box</tabstop>
<tabstop>force_RTS_combo_box</tabstop> <tabstop>force_RTS_combo_box</tabstop>
<tabstop>PTT_VOX_radio_button</tabstop> <tabstop>PTT_VOX_radio_button</tabstop>
<tabstop>PTT_DTR_radio_button</tabstop>
<tabstop>PTT_CAT_radio_button</tabstop> <tabstop>PTT_CAT_radio_button</tabstop>
<tabstop>PTT_DTR_radio_button</tabstop>
<tabstop>PTT_RTS_radio_button</tabstop> <tabstop>PTT_RTS_radio_button</tabstop>
<tabstop>PTT_port_combo_box</tabstop> <tabstop>PTT_port_combo_box</tabstop>
<tabstop>TX_source_data_radio_button</tabstop> <tabstop>TX_source_data_radio_button</tabstop>
@ -2463,6 +2456,16 @@ soundcard changes</string>
<tabstop>pbTxMsg</tabstop> <tabstop>pbTxMsg</tabstop>
<tabstop>pbNewDXCC</tabstop> <tabstop>pbNewDXCC</tabstop>
<tabstop>pbNewCall</tabstop> <tabstop>pbNewCall</tabstop>
<tabstop>sbNtrials</tabstop>
<tabstop>cbSync1Bit</tabstop>
<tabstop>cbTwoPass</tabstop>
<tabstop>cbMyDx</tabstop>
<tabstop>cbCQMyN</tabstop>
<tabstop>cbNDxG</tabstop>
<tabstop>cbNN</tabstop>
<tabstop>cbEMEonly</tabstop>
<tabstop>sbAggressive</tabstop>
<tabstop>sbDegrade</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
@ -2525,19 +2528,19 @@ soundcard changes</string>
<y>60</y> <y>60</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>566</x> <x>404</x>
<y>62</y> <y>62</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>