w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

1. We did the experiment: users clearly prefer a "Prompt to log QSO"

Browse Source 
only when 73 is sent.  Revert to that well-established behavior.
2. Correct the logic that detects short-form RO, RRR, and 73 messages in
JT65 VHF modes and color-highlights the Tx message box.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7442 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-02 14:22:29 +00:00
parent 9582ccd5d5
commit a65ebafd48
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/user_guide/en/controls-functions-main-window.adoc
View File

@ -8,14 +8,13 @@ image::main-ui-controls.png[align="left",width=650,alt="Main UI Controls"]
* *Log QSO* raises a dialog window pre-filled with known information * *Log QSO* raises a dialog window pre-filled with known information
about a QSO you have nearly completed. You can edit or add to this 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 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 me to log QSO* on the *Settings -> Reporting* tab, the program will
confirmation screen automatically when you send a message containing raise the confirmation screen automatically when you send a message
+RRR+ or +73+. *Start Date* and *Start Time* are set when you containing +73+. *Start Date* and *Start Time* are set when you click
click to send the *Tx 2* or *Tx 3* message, and backed up by one or to send the *Tx 2* or *Tx 3* message, and backed up by one or two
two sequence lengths, respectively. (Note that the actual start time sequence lengths, respectively. (Note that the actual start time may
may have been earlier if repeats of early transmissions were have been earlier if repeats of early transmissions were required.)
required.) End date and time are set when the *Log QSO* screen is End date and time are set when the *Log QSO* screen is invoked.
invoked.
//.Log QSO Window //.Log QSO Window
image::log-qso.png[align="center",alt="Log QSO"] image::log-qso.png[align="center",alt="Log QSO"]

6
lib/chkmsg.f90
View File

@ -23,9 +23,9 @@ subroutine chkmsg(message,cok,nspecial,flip)
endif endif
endif endif
if(message(1:3).eq.'RO ') nspecial=2 if(message.eq.'RO ') nspecial=2
if(message(1:4).eq.'RRR ') nspecial=3 if(message.eq.'RRR ') nspecial=3
if(message(1:3).eq.'73 ') nspecial=4 if(message.eq.'73 ') nspecial=4
return return
end subroutine chkmsg end subroutine chkmsg

9
mainwindow.cpp
View File

@ -143,8 +143,7 @@ namespace
bool message_is_73 (int type, QStringList const& msg_parts) bool message_is_73 (int type, QStringList const& msg_parts)
{ {
return type >= 0 return type >= 0
&& (((type < 6 || 7 == type) && (((type < 6 || 7 == type) && msg_parts.contains ("73"))
&& (msg_parts.contains ("73") or msg_parts.contains ("RRR")))
|| (type == 6 && !msg_parts.filter ("73").isEmpty ())); || (type == 6 && !msg_parts.filter ("73").isEmpty ()));
} }
@ -3939,10 +3938,10 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
gen65_(message,&ichk,msgsent,itone0,&itype,len1,len1); gen65_(message,&ichk,msgsent,itone0,&itype,len1,len1);
msgsent[22]=0; msgsent[22]=0;
bool text=false; bool text=false;
bool short65=false; bool shortMsg=false;
if(itype==6) text=true; if(itype==6) text=true;
if(itype==7 and m_config.enable_VHF_features() and if(itype==7 and m_config.enable_VHF_features() and
(m_mode=="JT65" or m_mode=="MSK144")) short65=true; m_mode=="JT65") shortMsg=true;
if(m_mode=="MSK144" and t.mid(0,1)=="<") text=false; if(m_mode=="MSK144" and t.mid(0,1)=="<") text=false;
if(m_mode=="MSK144" and m_config.contestMode()) { if(m_mode=="MSK144" and m_config.contestMode()) {
int i0=t.trimmed().length()-7; int i0=t.trimmed().length()-7;
@ -3952,7 +3951,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
if(text) { if(text) {
p.setColor(QPalette::Base,"#ffccff"); p.setColor(QPalette::Base,"#ffccff");
} else { } else {
if(short65) { if(shortMsg) {
p.setColor(QPalette::Base,"#66ffff"); p.setColor(QPalette::Base,"#66ffff");
} else { } else {
p.setColor(QPalette::Base,Qt::white); p.setColor(QPalette::Base,Qt::white);