Commit Graph

59 Commits

Author SHA1 Message Date
Joe Taylor
a292b2bb58 Remove my new QHash stuff; adapt the existing logbook code instead.
We now display "new call on current band" as well as "new call on any band".
Something similar should be done for DXCCs and grids.
2018-08-03 16:31:19 -04:00
Bill Somerville
9982cb200c Disable undo/redo for the decoded text windows as we never use it and don't need the overhead
Thanks to Alex, VE3NEA, for this contribution.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8594 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-03-31 17:47:26 +00:00
Bill Somerville
dfe037423f New incoming UDP message to allow external applications to highlight decoded callsigns
UDP  servers can  request that  WSJT-X clients  highlight a  specified
callsign  in  the  Band  Activity  decodes  window.  Either  the  last
occurrence of the  callsign may be highlighted or all  past and future
occurrences can be  highlighted. The latter case  WSJT-X will remember
the  callsign  and  requested  highlighting  options  so  that  future
occurrences can be correctly highlighted.

Either or  both of the text  background color and the  text foreground
color may  be specified. A further  UDP message may be  sent to change
the  persistent color  highlighting  for a  given callsign,  including
reseting persistent highlighting by passing an invalid color value.

Thanks to Alex, VE3NEA, for this contribution.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8589 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-03-28 22:25:46 +00:00
Joe Taylor
da7da823cb Remove the "single-click" patch, it appears to have problems.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-02-06 21:49:57 +00:00
Joe Taylor
ebd7f465fd As a trial: single-click on a decode to select a new DX Call; double-click to also Enable Tx.
Thanks to W9MDB for this patch, which also removes the option *Double-click on
call sets Tx Enable*.  Please test and report any perceived issues!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-02-06 20:27:00 +00:00
Joe Taylor
0831ea800a Define bg colors in a way that works better for dark themes. Thanks to N7AJF!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8431 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2018-01-23 14:54:49 +00:00
Joe Taylor
9bc2586bff As a trial, add a CQ-only checkbox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8335 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-16 14:47:17 +00:00
Joe Taylor
696af427e5 Revert the last commit: it was a mistake!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-08 17:44:14 +00:00
Joe Taylor
bb5c11f6ea Highlight <MyCall> in received Fox message.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8298 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-08 17:20:57 +00:00
Joe Taylor
768974cb1e Code cleanup; more Fox-mode additions.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8294 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-07 17:09:03 +00:00
Joe Taylor
f991f3053a Fix an incorrect index value.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8290 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-04 22:10:36 +00:00
Joe Taylor
053a83dc52 Option to display principal prefix instead of country name.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8287 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-12-04 17:55:24 +00:00
Joe Taylor
c9e9de2ea0 Working on the Fox GUI.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8214 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-11-03 18:27:46 +00:00
Joe Taylor
a72de82a39 Experimenting with a new Fox GUI.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8210 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-11-02 18:45:19 +00:00
Bill Somerville
895ff4dcc0 Generic handling of keyboard modifiers via UDP and double-clicks
This  change opens  up  all  keyboard modifier  options  to UDP  Reply
messages as well as double-clicks of decoded messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8168 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-10-13 22:34:36 +00:00
Joe Taylor
b502bd9a91 Minor change to make shift/ctrl double-click logic more consistent.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8138 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-29 13:27:55 +00:00
Bill Somerville
66feb99630 Tidy up some ugly code
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8112 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-23 18:09:29 +00:00
Bill Somerville
ae5a1b7b1f Better handling of worked before and country name display
Appended text is  added at a fixed column unless  the message overlaps
in which case the appended information floats to thr right.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8109 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-22 22:08:56 +00:00
Bill Somerville
e7be718b8d Add button to the decoded text window context menu to erase the contents
Right-click  either decoded  text window  to erase  its contents.  The
"Erase" button on the main UI  still operates as before although it is
implemented differently now.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8090 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-16 20:27:33 +00:00
Bill Somerville
bda874be89 Many improvements to decode double click and auoto-sequencing behaviour
Double-clicks on 73 messages fixed.  Fixed issue with incorrect decode
being  selected  by  double-click. Refined  auto-sequencing  sign  off
handling, any 73 or rr73 free text  near Rx or Tx frequency taken as a
73 from QSO  partner but if a  standard message then must  be from QSO
partner.

Moved functionality from MainWindow to DecodedText class.

More  efficient  picking of  messages  from  decoded text  windows  by
extracting the text block directly.

Tighten up  use of RR73 and  skipping Tx1, these are  now disabled for
relevant compound calls where they would break the QSO exchange.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8056 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-01 05:11:57 +00:00
Bill Somerville
363c469b55 Fix some signoff issues with auto-sequencing
73 messages from other QSOs on  frequency should now be ignored rather
than being processed.

Also some  long overdue refactoring  and tidying of  non-idiomatic C++
code in the logbook directory.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8047 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-30 02:27:57 +00:00
Bill Somerville
656ba6a6fb Merged from WSJT-X v1.8 branch:
------------------------------------------------------------------------
r8012 | bsomervi | 2017-08-07 15:29:25 +0100 (Mon, 07 Aug 2017) | 1 line

Better fix for KG4 call country lookup and worked before status
------------------------------------------------------------------------



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8013 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-07 14:31:05 +00:00
Bill Somerville
f785f6a654 Fix cursor positioning after displaying a decode line
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8003 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-04 23:56:53 +00:00
Bill Somerville
17bd43017e Optimize decoded text display to limit heap usage
Decoded  text line  now  use  considerably less  heap  memory as  they
accumulate. This change also limits the maximum number of decode lines
saved per session to 5000.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7998 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-04 18:03:54 +00:00
Bill Somerville
cabb7cc453 Add a rule to deal with KG4 calls not in Gitmo
The  AD1C  cty.dat  file  does  not resolve  KG4  2x1  and  2x3  calls
correctly, any  that map to Gitmo  are really mainland U.S.   and this
change does that.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7990 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-02 23:20:35 +00:00
Bill Somerville
faa1d24661 Fix country name display that broke in r7939
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7941 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-07-25 16:51:27 +00:00
Bill Somerville
87ae336443 Add the option to ALT+click a decoded CQ or QRZ message which only
moves the Rx  frequency to theirs, this facilitates  calling a station
who is busy and may have  many callers on their frequency. Updated the
corresponding mouse shortcuts help text.

Allow for times with seconds when parsing fast mode and FT8 decodes.

Exclude the RR73 grid square from  and grid validation or matching, it
is not a grid square any more as  far as WSJT-X is concerned, it is an
RRR substitute.

Add a  simple state  machine for  QSO progress  such that  replies and
auto-sequencing can be better controlled.

Get compound callsign edge cases working again and allow QSOs from and
to compound callsign holders working in as many situations as possible
including  auto-sequencing and  FT8 auto-reply  mode.  This  does mean
that a  "DE W6/K1ABC DM93"  type message close to  a callers Tx  or Rx
frequency will be taken  as a reply to a CQ call  despite it not being
explicitly addressed back to the  CQ caller. Compound callsigns should
work in MSK144 contest  mode also as well as in  short code modes with
some  minor  restrictions   (short  codes  will  not   be  used  where
configuration demands that  a message be used to send  a full compound
callsign).

Auto sequencing  has been made  generic such that  it can be  used for
more than one mode if desired.

Allow the use of free text messages to sign off in auto sequenced QSOs
without the message  being overwritten by the  sequencer. Double click
actions have  been added to the  Tx5 radio and push  buttons to revert
back to the default standard 73 message.

Make DisplayText  class interface  more idiomatic  C++ and  simplify a
bit.

Fixed  some  displayed widget  arrangements  for  different modes  and
sub-modes  so that  they  are  consistent when  starting  up and  when
switching mode or sub-mode.

This is  a big change which  has been extensively tested  but no doubt
there will also be some new defects introduced.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7939 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-07-24 19:27:23 +00:00
Joe Taylor
7e62880e2a More tweaks to GUI for FT8.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7740 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-06-27 13:36:10 +00:00
Joe Taylor
966d774f09 More cleanup of spurious identifications of DXCC entities fron non-callsigns.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7081 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-14 16:19:21 +00:00
Joe Taylor
13ffbb20eb Remove JTMSK mode and all related routines. Beware of possible unintended side effects!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7079 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-13 17:52:45 +00:00
Joe Taylor
696aab8422 Fix the DXCC entity logic so that "CQ CT K1ABC" isn't flagged as "Portugal".
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7068 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-09-09 15:33:21 +00:00
Joe Taylor
c5a36520f6 Highlight decodes with MyCall, even if in <...> brackets.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6920 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-14 18:02:26 +00:00
Bill Somerville
66c390de79 More consistent highlighting and processing of general call messages
Highlight,  in the  CQ  colour, CQDX  ... and  QRZ  ...  messages  and
process correctly for worked before and DXCC entity.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6753 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-09 23:39:48 +00:00
Joe Taylor
9845494276 Install MSK144 as a new mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6721 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-03 15:45:54 +00:00
Bill Somerville
f398495cfc Allow for, and add where necessary, a second character after mode
The decoded message processing relies on fixed column positions so the
extra character used in message  averaging to indicate sync flips must
also be allowed for in other modes.  This is done by inserting a space
character.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6681 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-17 19:35:38 +00:00
Bill Somerville
a45ea3cdff Adjust decodes displays and processing for extra csync indicator after mode
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6674 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-05-05 18:53:00 +00:00
Joe Taylor
a74d000c32 Correct the Tx message length and adjust reported SNR for short JTMSK messages.
Commit some things omitted last time.   


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6420 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-22 17:06:57 +00:00
Joe Taylor
333f8519d3 Attempting to make WSJT-X display messages like "<K1ABC W9XYZ> R26".
[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
2016-01-21 21:12:12 +00:00
Bill Somerville
1a23757b26 Reintegrate merge from wsjtx_exp branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6122 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-18 01:28:12 +00:00
Bill Somerville
28b4c31dee Various WSPR fixes
Make WSPRnet.org spot uploads tolerant  of network issues, spots still
get  discarded for  any period  that  has problems  but now  uploading
resumes on the next period.

Ensure that  decoded text starts  with correct  font by not  using the
base class append method directly.

Fixed a major  memory leak in the WSPRNet class  which was not freeing
processed request reply objects.

Added some helpful debug prints in WSPRnet.org spot processing.

Also  tidied  up a  number  of  class  implementations that  were  not
including he MOC generated code.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5560 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-09 14:30:23 +00:00
Bill Somerville
b6216c713d Band activity & Rx frequency widget enhancements
Ensure that  these windows have  their viewport scrolled fully  to the
left after deocdes and font changes.

Add the band to the separator line but only if we are certain that the
decodes below it are on that band.

Thanks to  Ton PA0TBR for the  implementation and testing of  the core
features of this change.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5207 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-10 20:25:14 +00:00
Bill Somerville
5489920441 Fix regression introduced when fixing fonts
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5183 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-07 17:14:03 +00:00
Bill Somerville
ed2f4ee226 Fix font setting
Several issues  mainly related  to the  rather complex  interaction of
style sheets and widget properties with respect to fonts.

Font setting  on the  astro window  should now  be consistent  and not
overridden by application style sheet driven font settings.

Decoded text font setting should now be consistent and not revert back
to Courier 10 on the next decode after a font change.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5179 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-07 12:08:55 +00:00
Bill Somerville
868ce60f7e Sort out decoded text font and font changes
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5159 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-05 12:22:01 +00:00
Bill Somerville
2b781d1685 Improved automatic message handling
More consistent and accurate processing of compund callsigns including
recognizing the  user's call  in both base  and fully  qualified form,
extracting reports  from special type  one and type two  compound call
messages.  Ensure that  "CQ DX"  message prefixes  are recognized  and
processd correctly.

The  cycle of  double  clicking through  a QSO  has  been enhanced  to
recognoize the  standard messages correctly  and use the  correct next
message. The automatic  transmission button "Enable Tx"  now does what
it says and does not double as a stop transmit button. This allows the
current transmission  to complete  even if the  automatic transmission
feature is  disabled. In line with  this the "stop sending  after a 73
message is sent"  feature turns off the  automatic transmission enable
at the start of the sending of  a 73 message and also the next message
is now set up as the CQ  message automatically in this scenario.  A 73
message is now  either a standard message containing the  word "73" or
any free text  message containing "73" (not necessarily  as a distinct
word").

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5055 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-14 19:13:18 +00:00
Bill Somerville
21bf2b6b31 Better handling of compound callsigns
Option  to control  standard message  generation for  type 2  compound
callsign holders.

Process decoded  messages based  on either base  or full  callsign for
both DE and DX callsigns.

Change CW id when callsign changed in settings.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5000 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-04 12:22:33 +00:00
Bill Somerville
7fd12effae Make some obvious abbreviations in DXXCC country names
To keep the decoded text lines to a minimum length suitable for screen
display  some obvious  abbreviations have  been applied.  Also as  the
lines  may now  extend  to  the right  with  a  horizontal scroll  bar
appearing when necessary the country names are not truncated any more.

Users still have the option to provide their own tailored cty.dat file
if they wish.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4970 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-17 18:42:00 +00:00
Bill Somerville
7172533282 Make cursor an arrow pointer in activity widgets
The change  to use  QTextEdit in  read only mode  cause the  cursor to
become an I-beam type, this changes  it to the arrow pointer type that
the previous QTextBrowser used by default.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4959 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 15:38:46 +00:00
Bill Somerville
127c633a97 Bring colour settings into line with general configuration strategy
Colours behave  like other  configuration items  and changes  are only
applied when the Settings UI is dismissed via the "OK" button.

Simplified font settings and use  style sheets consistently to set the
application and decoded  text fonts. This is necessary  because any UI
widget that  has a style  sheet applied does not  honor a font  set by
QWidget::setFont()  even if  there is  no  font setting  in the  style
sheet, this is broken behaviour IMHO  but that is the way Qt currently
works.

Use a  style sheet to style  the frequency display and  clock. This is
necessary to  allow fonts to  be cascaded through parent  style sheets
and still be overridden on these widgets.

Simplify  the decoded  text  widgets,  there is  no  need  to use  the
QTextBrowser  as a  super class  since  the simpler  QTextEdit set  as
read-only is sufficient. Also removed  colour setting via a background
brush  as it  doesn't  work  and the  HTML  'bgcolor' attribute  works
correctly.

Change  to  UI  properties  of  the  decoded  text  widgets  to  allow
horizontal scrolling if required, this  allows larger fonts to be used
without truncating decoded messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4957 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 08:53:02 +00:00
Joe Taylor
a93e55fef0 Improved, simplified sort routine; faster and better "flatten"
procedure; better window functions for some FFTs, resulting in
better decoder performance; User-selectable colors for backgrounds
of decoded messages.  NB: more testing is desirable!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4951 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 00:50:35 +00:00