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

Added QSO query for finding a remote station

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-29 12:08:22 -04:00
parent 084765f271
commit 712580d08c
3 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
mainwindow.cpp
View File

@ -5883,7 +5883,7 @@ bool MainWindow::isMessageQueuedForTransmit(){
return m_transmitting || m_txFrameCount > 0; return m_transmitting || m_txFrameCount > 0;
} }
void MainWindow::addMessageText(QString text, bool clear){ void MainWindow::addMessageText(QString text, bool clear, bool selectFirstPlaceholder){
// don't add message text if we already have a transmission queued... // don't add message text if we already have a transmission queued...
if(isMessageQueuedForTransmit()){ if(isMessageQueuedForTransmit()){
return; return;
@ -5912,6 +5912,16 @@ void MainWindow::addMessageText(QString text, bool clear){
} }
c.insertText(text); c.insertText(text);
if(selectFirstPlaceholder){
auto match = QRegularExpression("(\\[.+\\])").match(ui->extFreeTextMsgEdit->toPlainText());
if(match.hasMatch()){
c.setPosition(match.capturedStart());
c.setPosition(match.capturedEnd(), QTextCursor::KeepAnchor);
ui->extFreeTextMsgEdit->setTextCursor(c);
}
}
ui->extFreeTextMsgEdit->setFocus(); ui->extFreeTextMsgEdit->setFocus();
} }
@ -7326,21 +7336,18 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
if(m_config.transmit_directed()) toggleTx(true); if(m_config.transmit_directed()) toggleTx(true);
}); });
menu->addSeparator(); auto qsoQueryAction = menu->addAction(QString("%1 QSO [CALLSIGN]? - Query if selected callsign can communicate with [CALLSIGN]?").arg(call).trimmed());
connect(qsoQueryAction, &QAction::triggered, this, [this](){
/*
auto ackQueryAction = menu->addAction(QString("%1^ - Are you hearing me?").arg(call));
connect(ackQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
return; return;
} }
addMessageText(QString("%1?").arg(selectedCall), true); addMessageText(QString("%1 QSO [CALLSIGN]?").arg(selectedCall), true, true);
toggleTx(true);
}); });
*/
menu->addSeparator();
auto snrQueryAction = menu->addAction(QString("%1? - What is my signal report?").arg(call)); auto snrQueryAction = menu->addAction(QString("%1? - What is my signal report?").arg(call));
connect(snrQueryAction, &QAction::triggered, this, [this](){ connect(snrQueryAction, &QAction::triggered, this, [this](){
@ -7425,7 +7432,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
if(m_config.transmit_directed()) toggleTx(true); if(m_config.transmit_directed()) toggleTx(true);
}); });
auto hashAction = menu->addAction(QString("%1#message - Please ACK if you receive this message in its entirety").arg(call).trimmed()); auto hashAction = menu->addAction(QString("%1#[MESSAGE] - Please ACK if you receive this message in its entirety").arg(call).trimmed());
hashAction->setDisabled(isAllCall); hashAction->setDisabled(isAllCall);
connect(hashAction, &QAction::triggered, this, [this](){ connect(hashAction, &QAction::triggered, this, [this](){
@ -7434,10 +7441,10 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
return; return;
} }
addMessageText(QString("%1#").arg(selectedCall), true); addMessageText(QString("%1#[MESSAGE]").arg(selectedCall), true, true);
}); });
auto retransmitAction = menu->addAction(QString("%1|message - Please ACK and retransmit the following message").arg(call).trimmed()); auto retransmitAction = menu->addAction(QString("%1|[MESSAGE] - Please ACK and retransmit the following message").arg(call).trimmed());
retransmitAction->setDisabled(isAllCall); retransmitAction->setDisabled(isAllCall);
connect(retransmitAction, &QAction::triggered, this, [this](){ connect(retransmitAction, &QAction::triggered, this, [this](){
@ -7446,10 +7453,10 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
return; return;
} }
addMessageText(QString("%1|").arg(selectedCall), true); addMessageText(QString("%1|[MESSAGE]").arg(selectedCall), true, true);
}); });
auto alertAction = menu->addAction(QString("%1!message - Please display this message in an alert dialog and ACK if acknowledged").arg(call).trimmed()); auto alertAction = menu->addAction(QString("%1![MESSAGE] - Please display this message in an alert dialog and ACK if acknowledged").arg(call).trimmed());
alertAction->setDisabled(isAllCall); alertAction->setDisabled(isAllCall);
connect(alertAction, &QAction::triggered, this, [this](){ connect(alertAction, &QAction::triggered, this, [this](){
@ -7458,7 +7465,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
return; return;
} }
addMessageText(QString("%1!").arg(selectedCall), true); addMessageText(QString("%1![MESSAGE]").arg(selectedCall), true, true);
}); });
menu->addSeparator(); menu->addSeparator();
@ -7466,7 +7473,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
bool emptyQTC = m_config.my_station().isEmpty(); bool emptyQTC = m_config.my_station().isEmpty();
bool emptyQTH = m_config.my_qth().isEmpty() && m_config.my_grid().isEmpty(); bool emptyQTH = m_config.my_qth().isEmpty() && m_config.my_grid().isEmpty();
auto qtcAction = menu->addAction(QString("%1 QTC message - Send my station message").arg(call).trimmed()); auto qtcAction = menu->addAction(QString("%1 QTC - Send my station message").arg(call).trimmed());
qtcAction->setDisabled(emptyQTC); qtcAction->setDisabled(emptyQTC);
connect(qtcAction, &QAction::triggered, this, [this](){ connect(qtcAction, &QAction::triggered, this, [this](){
@ -7480,7 +7487,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
if(m_config.transmit_directed()) toggleTx(true); if(m_config.transmit_directed()) toggleTx(true);
}); });
auto qthAction = menu->addAction(QString("%1 QTH message - Send my station location message").arg(call).trimmed()); auto qthAction = menu->addAction(QString("%1 QTH - Send my station location message").arg(call).trimmed());
qthAction->setDisabled(emptyQTH); qthAction->setDisabled(emptyQTH);
connect(qthAction, &QAction::triggered, this, [this](){ connect(qthAction, &QAction::triggered, this, [this](){
@ -9208,7 +9215,24 @@ void MainWindow::processCommandActivity() {
} }
// PROCESS AGN // PROCESS AGN
else if (d.cmd == " AGN?" && !isAllCall && !m_lastTxMessage.isEmpty()) { else if (d.cmd == " AGN?" && !isAllCall && !m_lastTxMessage.isEmpty()) {
reply = m_lastTxMessage; reply = m_lastTxMessage;
}
// PROCESS BUFFERED QSO QUERY
else if (d.cmd == " QSO"){
auto who = d.text;
if(who.isEmpty()){
continue;
}
auto callsigns = Varicode::parseCallsigns(who);
if(callsigns.isEmpty()){
continue;
}
if(m_callActivity.contains(callsigns.first())){
auto cd = m_callActivity[callsigns.first()];
reply = QString("%1 ACK %2 %3 (%4)").arg(d.from).arg(cd.call).arg(Varicode::formatSNR(cd.snr)).arg(since(cd.utcTimestamp));
}
} }
// PROCESS BUFFERED QTH // PROCESS BUFFERED QTH
else if (d.cmd == " GRID"){ else if (d.cmd == " GRID"){

2
mainwindow.h
View File

@ -140,7 +140,7 @@ public slots:
void writeNoticeTextToUI(QDateTime date, QString text); void writeNoticeTextToUI(QDateTime date, QString text);
int writeMessageTextToUI(QDateTime date, QString text, int freq, bool bold, int block=-1); int writeMessageTextToUI(QDateTime date, QString text, int freq, bool bold, int block=-1);
bool isMessageQueuedForTransmit(); bool isMessageQueuedForTransmit();
void addMessageText(QString text, bool clear=false); void addMessageText(QString text, bool clear=false, bool selectFirstPlaceholder=false);
void enqueueMessage(int priority, QString message, int freq, Callback c); void enqueueMessage(int priority, QString message, int freq, Callback c);
void resetMessage(); void resetMessage();
void resetMessageUI(); void resetMessageUI();

8
varicode.cpp
View File

@ -57,6 +57,7 @@ QMap<QString, int> directed_cmds = {
// {"/", 13 }, // unused // {"/", 13 }, // unused
// directed responses // directed responses
{" QSO", 13 }, // can you communicate with? i can communicate with
{" APRS:", 14 }, // send an aprs packet {" APRS:", 14 }, // send an aprs packet
{" GRID", 15 }, // this is my current grid locator {" GRID", 15 }, // this is my current grid locator
{" QTC", 16 }, // this is my qtc message {" QTC", 16 }, // this is my qtc message
@ -77,20 +78,21 @@ QMap<QString, int> directed_cmds = {
{" ", 31 }, // send freetext {" ", 31 }, // send freetext
}; };
QSet<int> allowed_cmds = {0, 1, 2, 3, 4, 5, 6, 7, 8, /*...*/ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; QSet<int> allowed_cmds = {0, 1, 2, 3, 4, 5, 6, 7, 8, /*...*/ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
QSet<int> buffered_cmds = {6, 7, 8, 14, 15}; QSet<int> buffered_cmds = {6, 7, 8, 13, 14, 15};
QMap<int, int> checksum_cmds = { QMap<int, int> checksum_cmds = {
{ 6, 16 }, { 6, 16 },
{ 7, 16 }, { 7, 16 },
{ 8, 32 }, { 8, 32 },
{ 13, 16 },
{ 14, 16 }, { 14, 16 },
{ 15, 0 } { 15, 0 }
}; };
QString callsign_pattern = QString("(?<callsign>[A-Z0-9/]+)"); QString callsign_pattern = QString("(?<callsign>[A-Z0-9/]+)");
QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|ACK|73|YES|NO|SNR|PWR|QSL[?]?|RR|HEARING|HW CPY[?]|FB|QTH|QTC|GRID|APRS[:]|[?@&$%|!#^ ]))?"); QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|ACK|73|YES|NO|SNR|PWR|QSL[?]?|RR|HEARING|HW CPY[?]|FB|QTH|QTC|GRID|APRS[:]|QSO|[?@&$%|!#^ ]))?");
QString optional_grid_pattern = QString("(?<grid>\\s?[A-R]{2}[0-9]{2})?"); QString optional_grid_pattern = QString("(?<grid>\\s?[A-R]{2}[0-9]{2})?");
QString optional_extended_grid_pattern = QString("^(?<grid>\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?"); QString optional_extended_grid_pattern = QString("^(?<grid>\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?");
QString optional_pwr_pattern = QString("(?<pwr>(?<=PWR)\\s?\\d+\\s?[KM]?W)?"); QString optional_pwr_pattern = QString("(?<pwr>(?<=PWR)\\s?\\d+\\s?[KM]?W)?");