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

Add widgets for input of contest exchanges.

This commit is contained in:
Joe Taylor 2018-07-06 14:29:36 -04:00
parent 3fc2209d86
commit b6cd4fba41
5 changed files with 157 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Configuration.cpp
View File

@ -529,6 +529,8 @@ private:
// configuration fields that we publish
QString my_callsign_;
QString my_grid_;
QString FD_exchange_;
QString RTTY_exchange_;
QColor color_CQ_;
QColor next_color_CQ_;
QColor color_MyCall_;
@ -821,6 +823,16 @@ QString Configuration::my_grid() const
return the_grid;
}
QString Configuration::FieldDayExchange() const
{
return m_->FD_exchange_;
}
QString Configuration::RTTYExchange() const
{
return m_->RTTY_exchange_;
}
void Configuration::set_location (QString const& grid_descriptor)
{
// change the dynamic grid
@ -1260,6 +1272,10 @@ void Configuration::impl::read_settings ()
my_callsign_ = settings_->value ("MyCall", QString {}).toString ();
my_grid_ = settings_->value ("MyGrid", QString {}).toString ();
FD_exchange_ = settings_->value ("FieldDayExchange",QString {}).toString ();
RTTY_exchange_ = settings_->value ("RTTYExchange",QString {}).toString ();
ui_->FieldDay_Exchange->setText(FD_exchange_);
ui_->RTTY_Exchange->setText(RTTY_exchange_);
next_color_CQ_ = color_CQ_ = settings_->value("colorCQ","#66ff66").toString();
next_color_MyCall_ = color_MyCall_ = settings_->value("colorMyCall","#ff6666").toString();
next_color_TxMsg_ = color_TxMsg_ = settings_->value("colorTxMsg","#ffff00").toString();
@ -1450,6 +1466,8 @@ void Configuration::impl::write_settings ()
settings_->setValue ("MyCall", my_callsign_);
settings_->setValue ("MyGrid", my_grid_);
settings_->setValue ("FieldDayExchange", FD_exchange_);
settings_->setValue ("RTTYExchange", RTTY_exchange_);
settings_->setValue("colorCQ",color_CQ_);
settings_->setValue("colorMyCall",color_MyCall_);
settings_->setValue("colorTxMsg",color_TxMsg_);
@ -1907,6 +1925,8 @@ void Configuration::impl::accept ()
my_callsign_ = ui_->callsign_line_edit->text ();
my_grid_ = ui_->grid_line_edit->text ();
FD_exchange_= ui_->FieldDay_Exchange->text ();
RTTY_exchange_= ui_->RTTY_Exchange->text ();
spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked ();
id_interval_ = ui_->CW_id_interval_spin_box->value ();
ntrials_ = ui_->sbNtrials->value ();

2
Configuration.hpp
View File

@ -96,6 +96,8 @@ public:
QString my_callsign () const;
QString my_grid () const;
QString FieldDayExchange() const;
QString RTTYExchange() const;
QFont text_font () const;
QFont decoded_text_font () const;
qint32 id_interval () const;

137
Configuration.ui
View File

@ -2703,11 +2703,25 @@ Right click for insert and delete options.</string>
<rect>
<x>10</x>
<y>20</y>
<width>341</width>
<height>71</height>
<width>451</width>
<height>78</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="2">
<widget class="QRadioButton" name="rbNA_VHF_Contest">
<property name="text">
<string>NA VHF Contest</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QRadioButton" name="rbEU_VHF_Contest">
<property name="text">
<string>EU VHF Contest</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="rbNone">
<property name="text">
@ -2719,32 +2733,111 @@ Right click for insert and delete options.</string>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="rbFieldDay">
<property name="text">
<string>ARRL Field Day</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_17">
<item>
<widget class="QRadioButton" name="rbFieldDay">
<property name="text">
<string>ARRL Field Day</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<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="QLabel" name="label_14">
<property name="text">
<string>Exch:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="FieldDay_Exchange">
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>6A SNJ</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="rbRTTYroundup">
<property name="text">
<string>ARRL RTTY Roundup</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="QRadioButton" name="rbRTTYroundup">
<property name="text">
<string>ARRL RTTY Roundup</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_15">
<property name="text">
<string>Exch:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="RTTY_Exchange">
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>NJ</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="rbNA_VHF_Contest">
<property name="text">
<string>NA VHF Contest</string>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="rbEU_VHF_Contest">
<property name="text">
<string>EU VHF Contest</string>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</widget>

5
mainwindow.cpp
View File

@ -3677,7 +3677,8 @@ void MainWindow::guiUpdate()
//Once per second:
if(nsec != m_sec0) {
// qDebug() << "OneSec:" << m_config.bGenerate77() << m_config.bDecode77();
// qDebug() << "OneSec:" << m_config.bGenerate77() << m_config.bDecode77()
// << m_config.FieldDayExchange() << m_config.RTTYExchange();
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning();
} else {
@ -5042,6 +5043,8 @@ void MainWindow::displayWidgets(qint64 n)
if(i==32) ui->cbCQonly->setVisible(b);
j=j>>1;
}
b=m_config.bEU_VHF_Contest() or (m_config.bRTTYroundup() and m_config.RTTYExchange()=="DX");
ui->sbSerialNumber->setVisible(b);
m_lastCallsign.clear (); // ensures Tx5 is updated for new modes
genStdMsgs (m_rpt, true);
}

16
mainwindow.ui
View File

@ -1013,6 +1013,22 @@ QLabel[oob=&quot;true&quot;] {
</property>
</spacer>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="sbSerialNumber">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="suffix">
<string> </string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>4095</number>
</property>
</widget>
</item>
</layout>
</item>
<item>