Hmmm...that expression doesn't seem work for <...> -- was the regex you're
showing before the addition for this? I don't see the period or less than or
greater than signs in it.
https://regexr.com/
Mike
On Friday, September 6, 2019, 02:51:25 PM CDT, Bill Somerville
<[email protected]> wrote:
Hi Mike,
yes and also that there are other as yet unpublished changes in that regexp.
It ended up like this:
QRegularExpression words_re
{R"(^(?:(?<word1>(?:CQ|DE|QRZ)(?:\s?DX|\s(?:[A-Z]{1,4}|\d{3}))|[A-Z0-9/]+|\.{3})\s)(?:(?<word2>[A-Z0-9/]+)(?:\s(?<word3>[-+A-Z0-9]+)(?:\s(?<word4>(?:OOO|(?!RR73)[A-R]{2}[0-9]{2})))?)?)?)"};
73
Bill
G4WJS.
On 06/09/2019 20:38, Black Michael via wsjt-devel wrote:
Yeah..I guess you mean it should have been an OR clause?
Mike
On Friday, September 6, 2019, 02:34:37 PM CDT, Bill Somerville
<[email protected]> wrote:
On 06/09/2019 18:24, Black Michael via wsjt-devel wrote:
Here's the patch to fix the double-click on <...>
de Mike W9MDB
*** "..\\wsjtx-2.1.0\\src\\wsjtx\\decodedtext.cpp" 2019-02-24
21:48:37.000000000 -0600 --- decodedtext.cpp 2019-09-06 11:59:42.921762600
-0500 *************** *** 10,16 ****
namespace { ! QRegularExpression
words_re{R"(^(?:(?<word1>(?:CQ|DE|QRZ)(?:\s?DX|\s(?:[A-Z]{2}|\d{3}))|[A-Z0-9/]+)\s)(?:(?<word2>[A-Z0-9/]+)(?:\s(?<word3>[-+A-Z0-9]+)(?:\s(?<word4>(?:OOO|(?!RR73)[A-R]{2}[0-9]{2})))?)?)?)"};
}
DecodedText::DecodedText (QString const& the_string) --- 10,16 ----
namespace { ! QRegularExpression
words_re{R"(^(?:(?<word1>(?:CQ|DE|QRZ)(?:\s?DX|\s(?:[A-Z]{2}|\d{3}))|[\<\.\<A-Z0-9/]+)\s)(?:(?<word2>[A-Z0-9/]+)(?:\s(?<word3>[-+A-Z0-9]+)(?:\s(?<word4>(?:OOO|(?!RR73)[A-R]{2}[0-9]{2})))?)?)?)"};
}
DecodedText::DecodedText (QString const& the_string)
Thanks Mike,
that patch isn't quite right but I have added a change that is for the next
release.
73
Bill
G4WJS.
_______________________________________________
wsjt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
_______________________________________________
wsjt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
