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

Attempting to make WSJT-X display messages like "<K1ABC W9XYZ> R26".

Browse Source 
[For now, I'll make do with () in place of <>.]


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6418 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-01-21 21:12:12 +00:00
parent 42d32c7fc0
commit 333f8519d3
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration.cpp
View File

@ -190,7 +190,9 @@ namespace
int const combo_box_item_enabled (32 | 1); int const combo_box_item_enabled (32 | 1);
int const combo_box_item_disabled (0); int const combo_box_item_disabled (0);
QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"}; // QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"};
QRegExp message_alphabet {"[- @A-Za-z0-9+./?#<>]*"};
} }

3
MessageAggregator.cpp
View File

@ -52,7 +52,8 @@
using port_type = MessageServer::port_type; using port_type = MessageServer::port_type;
using Frequency = MessageServer::Frequency; using Frequency = MessageServer::Frequency;
QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"}; //QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"};
QRegExp message_alphabet {"[- @A-Za-z0-9+./?#<>]*"};
// //
// Decodes Model - simple data model for all decodes // Decodes Model - simple data model for all decodes

6
displaytext.cpp
View File

@ -52,8 +52,10 @@ void DisplayText::insertLineSpacer(QString const& line)
void DisplayText::appendText(QString const& text, QString const& bg) void DisplayText::appendText(QString const& text, QString const& bg)
{ {
QString t=text.trimmed().replace('<','(');
t=t.replace('>',')');
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" + QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
bg + "\">" + text.trimmed ().replace (' ', "&nbsp;") + "</td></tr></table>"; bg + "\">" + t.trimmed ().replace (' ', "&nbsp;") + "</td></tr></table>";
auto cursor = textCursor (); auto cursor = textCursor ();
cursor.movePosition (QTextCursor::End); cursor.movePosition (QTextCursor::End);
auto pos = cursor.position (); auto pos = cursor.position ();
@ -66,7 +68,6 @@ void DisplayText::appendText(QString const& text, QString const& bg)
// position so viewport scrolled to left // position so viewport scrolled to left
cursor.movePosition (QTextCursor::Up); cursor.movePosition (QTextCursor::Up);
cursor.movePosition (QTextCursor::StartOfLine); cursor.movePosition (QTextCursor::StartOfLine);
setTextCursor (cursor); setTextCursor (cursor);
ensureCursorVisible (); ensureCursorVisible ();
} }
@ -163,7 +164,6 @@ void DisplayText::displayDecodedText(DecodedText decodedText, QString myCall,
if (displayDXCCEntity && CQcall) if (displayDXCCEntity && CQcall)
_appendDXCCWorkedB4(/*mod*/decodedText,bg,logBook,color_CQ, _appendDXCCWorkedB4(/*mod*/decodedText,bg,logBook,color_CQ,
color_DXCC,color_NewCall); color_DXCC,color_NewCall);
appendText(decodedText.string(),bg); appendText(decodedText.string(),bg);
} }

2
lib/jtmsk_decode.f90
View File

@ -59,7 +59,6 @@ subroutine jtmsk_decode(id2,narg,line)
call jtmsk_short(c,npts,msg1,msg) call jtmsk_short(c,npts,msg1,msg)
!### Needs work! !### Needs work!
print*,'b ',msg
nsnr=1 nsnr=1
if(msg.ne.' ') then if(msg.ne.' ') then
if(msg.ne.msg0) then if(msg.ne.msg0) then
@ -126,7 +125,6 @@ subroutine jtmsk_decode(id2,narg,line)
enddo enddo
900 if(line(1)(1:6).eq.' ') line(1)(1:1)=char(0) 900 if(line(1)(1:6).eq.' ') line(1)(1:1)=char(0)
print*,'z ',line(1)
return return
end subroutine jtmsk_decode end subroutine jtmsk_decode

1
lib/jtmsk_short.f90
View File

@ -128,7 +128,6 @@ subroutine jtmsk_short(cdat,npts,msg,decoded)
n=1 n=1
decoded=msg(1:14)//rpt(irpt) decoded=msg(1:14)//rpt(irpt)
endif endif
print*,'a ', decoded
go to 900 go to 900
! if(n.eq.0) nbad=nbad+1 ! if(n.eq.0) nbad=nbad+1

3
wsjtx.pro
View File

@ -64,7 +64,8 @@ SOURCES += \
getfile.cpp soundout.cpp soundin.cpp meterwidget.cpp signalmeter.cpp \ getfile.cpp soundout.cpp soundin.cpp meterwidget.cpp signalmeter.cpp \
WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \ WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \
main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \ main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \
echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp WSPRBandHopping.cpp echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
WSPRBandHopping.cpp MessageAggregator.cpp
HEADERS += qt_helpers.hpp \ HEADERS += qt_helpers.hpp \
pimpl_h.hpp pimpl_impl.hpp \ pimpl_h.hpp pimpl_impl.hpp \