From fc43c7fbb481c7f6582f50f990185182d31c3ea9 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Tue, 9 Oct 2018 09:31:33 -0400 Subject: [PATCH] Fixed issue with directed commands splitting up words that appear in the command. E.g., 'NO' 'T' --- varicode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varicode.cpp b/varicode.cpp index 2ac1220..f83031c 100644 --- a/varicode.cpp +++ b/varicode.cpp @@ -96,7 +96,7 @@ QMap checksum_cmds = { }; QString callsign_pattern = QString("(?[A-Z0-9/]+)"); -QString optional_cmd_pattern = QString("(?\\s?(?:AGN[?]|ACK|73|YES|NO|SNR|QSL[?]?|RR|HEARING|HW CPY[?]|FB|QTH|QTC|GRID|APRS[:]|BEACON (ACK|REQ)|QRZ[?]|[?@&$%#^> ]))?"); +QString optional_cmd_pattern = QString("(?\\s?(?:BEACON (ACK|REQ)|AGN[?]|ACK\\b|73\\b|YES\\b|NO\\b|SNR\\b|QSL[?]|QSL\\b|RR\\b|HEARING\\b|HW CPY[?]|FB\\b|QTH\\b|QTC\\b|GRID\\b|APRS[:]|QRZ[?]|[?@&$%#^> ]))?"); QString optional_grid_pattern = QString("(?\\s?[A-R]{2}[0-9]{2})?"); QString optional_extended_grid_pattern = QString("^(?\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?"); QString optional_num_pattern = QString("(?(?<=SNR|HEARING|BEACON ACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");