chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with grid length. Fixed back-to-back CQs

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-11 10:31:28 -04:00
parent c042a72d0d
commit 8c8ddb533c
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration.cpp
View File

@ -873,7 +873,7 @@ int Configuration::activity_aging() const
void Configuration::set_location (QString const& grid_descriptor) void Configuration::set_location (QString const& grid_descriptor)
{ {
// change the dynamic grid // change the dynamic grid
qDebug () << "Configuration::set_location - location:" << grid_descriptor; // qDebug () << "Configuration::set_location - location:" << grid_descriptor;
m_->dynamic_grid_ = grid_descriptor.trimmed (); m_->dynamic_grid_ = grid_descriptor.trimmed ();
} }

39
Configuration.ui
View File

@ -77,21 +77,10 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="grid_line_edit"> <widget class="QLineEdit" name="grid_line_edit">
<property name="toolTip"> <property name="toolTip">
<string>Maidenhead locator (only the first four characters are required).</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;4-digit Maidenhead Locator&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> <property name="maxLength">
</item> <number>4</number>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout_21">
<item row="0" column="0">
<widget class="QCheckBox" name="use_dynamic_grid">
<property name="toolTip">
<string>Check to allow grid changes from external programs</string>
</property>
<property name="text">
<string>AutoGrid</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -2091,6 +2080,20 @@ for assessing propagation and system performance.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<layout class="QFormLayout" name="formLayout_21">
<item row="0" column="0">
<widget class="QCheckBox" name="use_dynamic_grid">
<property name="toolTip">
<string>Check to allow grid changes from external programs</string>
</property>
<property name="text">
<string>Accept Dynamic Grid Requests</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="QCheckBox" name="udpWindowToFront"> <widget class="QCheckBox" name="udpWindowToFront">
<property name="visible"> <property name="visible">
@ -3161,12 +3164,12 @@ soundcard changes</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="PTT_method_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

15
mainwindow.cpp
View File

@ -6231,15 +6231,15 @@ void MainWindow::checkBacon(){
void MainWindow::prepareBacon(){ void MainWindow::prepareBacon(){
QStringList lines; QStringList lines;
QString call = m_config.my_callsign(); QString mycall = m_config.my_callsign();
QString grid = m_config.my_grid().left(4); QString mygrid = m_config.my_grid().left(4);
// FT8Call Style // FT8Call Style
lines.append(QString("%1: BEACON %2").arg(call).arg(grid)); lines.append(QString("%1: BEACON %2").arg(mycall).arg(mygrid));
bool shouldTransmitTwoBeacons = false; bool shouldTransmitTwoBeacons = true;
if(shouldTransmitTwoBeacons){ if(shouldTransmitTwoBeacons){
lines.append(QString("%1: BEACON %2").arg(call).arg(grid)); lines.append(QString("%1: BEACON %2").arg(mycall).arg(mygrid));
} }
// Queue the beacon // Queue the beacon
@ -6957,9 +6957,8 @@ void MainWindow::on_clearAction_triggered(QObject * sender){
} }
void MainWindow::on_cqMacroButton_clicked(){ void MainWindow::on_cqMacroButton_clicked(){
QString call = m_config.my_callsign(); QString mygrid = m_config.my_grid().left(4);
QString grid = m_config.my_grid().left(4); QString text = QString("CQCQCQ %1").arg(mygrid).trimmed();
QString text = QString("%1: CQCQCQ %2").arg(call).arg(grid).trimmed();
addMessageText(text); addMessageText(text);
} }

4
varicode.cpp
View File

@ -85,9 +85,9 @@ QRegularExpression directed_re("^" +
optional_pwr_pattern + optional_pwr_pattern +
optional_num_pattern); optional_num_pattern);
QRegularExpression beacon_re(R"(^(?<type>CQCQCQ|BEACON)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)"); QRegularExpression beacon_re(R"(^\s*(?<type>CQCQCQ|BEACON)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
QRegularExpression compound_re("^[<]" + QRegularExpression compound_re("^\\s*[<]" +
callsign_pattern + callsign_pattern +
"(?<extra>" + "(?<extra>" +
optional_grid_pattern + optional_grid_pattern +