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

2018-08-11 10:31:28 -04:00
parent c042a72d0d
commit 8c8ddb533c
4 changed files with 31 additions and 29 deletions
@@ -85,9 +85,9 @@ QRegularExpression directed_re("^"                    +
                               optional_pwr_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        +
                               "(?<extra>"             +
                                 optional_grid_pattern +