From f30311f324701ed44a9e5b3e32d9f3deb57f99ec Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 30 Dec 2016 19:04:51 +0000 Subject: [PATCH] I throw in the towel. Prompt to log QSO when *either* RRR or 73 is sent. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7431 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- .../en/controls-functions-main-window.adoc | 12 +++++++----- mainwindow.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/user_guide/en/controls-functions-main-window.adoc b/doc/user_guide/en/controls-functions-main-window.adoc index 2af20722e..858f932e2 100644 --- a/doc/user_guide/en/controls-functions-main-window.adoc +++ b/doc/user_guide/en/controls-functions-main-window.adoc @@ -9,11 +9,13 @@ image::main-ui-controls.png[align="left",width=650,alt="Main UI Controls"] about a QSO you have nearly completed. You can edit or add to this information before clicking *OK* to log the QSO. If you check *Prompt me to log QSO* on the *Setup* menu, the program will raise the -confirmation screen automatically when you send a message -containing "`73`". *Start Date* and *Start Time* are set when you click -to send the *Tx 2* or *Tx 3* message, and backed up by one or two -minutes, respectively. End date and time are set when the *Log -QSO* screen is invoked. +confirmation screen automatically when you send a message containing ++RRR+ or +73+. *Start Date* and *Start Time* are set when you +click to send the *Tx 2* or *Tx 3* message, and backed up by one or +two sequence lengths, respectively. (Note that the actual start time +may have been earlier if repeats of early transmissions were +required.) End date and time are set when the *Log QSO* screen is +invoked. //.Log QSO Window image::log-qso.png[align="center",alt="Log QSO"] diff --git a/mainwindow.cpp b/mainwindow.cpp index ca6c83ea5..b513e839d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -142,9 +142,11 @@ namespace bool message_is_73 (int type, QStringList const& msg_parts) { + qDebug() << type; return type >= 0 - && (((type < 6 || 7 == type) && msg_parts.contains ("73")) - || (type == 6 && !msg_parts.filter ("73").isEmpty ())); + && (((type < 6 || 7 == type) + && (msg_parts.contains ("73") or msg_parts.contains ("RRR"))) + || (type == 6 && !msg_parts.filter ("73").isEmpty ())); } int ms_minute_error ()