Commit Graph

715 Commits

Author SHA1 Message Date
Steven Franke
384a2240cf ftdata-1000.dat is tbd.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6269 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-14 02:14:15 +00:00
Steven Franke
d258279703 Add hard-won word-error-rate data.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6268 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-14 02:11:47 +00:00
Steven Franke
01b65be2f1 Revised figures for ftrsd paper.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6267 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-14 02:09:44 +00:00
Steven Franke
66f0ec05b4 Updated FER values.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6258 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-10 17:17:15 +00:00
Joe Taylor
56a58fe6ab Implement "matched filter on s3(64,63)" as the criterion for hinted
(aka experience-based) decoding.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6256 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-09 21:02:37 +00:00
Steven Franke
eef31e186b Add a few more points to FT-100000 data and fig_psuccess.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6247 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-08 19:28:58 +00:00
Joe Taylor
edbbc669d8 Replace the pdf file.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6243 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-07 14:17:27 +00:00
Joe Taylor
e50571135b Remove pdf file.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6242 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-07 13:49:22 +00:00
Joe Taylor
12d5ec8902 Morphing sfrsd toward ftrsd...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6241 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-07 13:44:00 +00:00
Steven Franke
c1de6ed05d Fill in more points on the Rayleigh fading plot.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6240 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-07 03:52:42 +00:00
Steven Franke
449a631bd8 Add FT Rayleigh fading WER to fig_wer2.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6239 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-07 00:33:22 +00:00
Steven Franke
a57ba0e28d Add BM Rayleigh fading Fig.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6237 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 23:21:01 +00:00
Steven Franke
b33f91f967 Small tweaks to sfrsd.lyx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6235 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 22:34:38 +00:00
Steven Franke
ed03956d72 Updated bmdata.dat and tweaks to sfrsd.lyx
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6234 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 20:38:01 +00:00
Steven Franke
0930a149e8 Include mfsk.f90 in the Makefile.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6233 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 16:22:11 +00:00
Steven Franke
f6381577e4 mfsk.f90 calculates prob of symbol error vs Es/No.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6232 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 16:21:47 +00:00
Steven Franke
5db0f3aca7 Add gnuplot scripts for figs.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6231 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 14:31:12 +00:00
Steven Franke
04e9cc704c Add figures, refine notation.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6230 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 14:26:15 +00:00
Steven Franke
3472accbdb Comment out call to sgrand.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6229 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 13:06:14 +00:00
Steven Franke
adc8d092f9 Frame-error-rate script.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6228 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 04:43:39 +00:00
Steven Franke
cca493e28c Mods to jt65sim to use new seed for each invocation - for use in a script that estimates high-snr FER.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6227 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 04:37:14 +00:00
Steven Franke
7697fbe072 Fix defect in sfrsd2 acceptance criteria.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6226 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 01:57:05 +00:00
Steven Franke
16ef3264eb Add script and data for ntrials vs nhard figure.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-06 01:56:17 +00:00
Joe Taylor
057750714e Remove a stray minus sign in jt65sim.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6220 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-04 15:02:03 +00:00
Joe Taylor
f0c01470bb Use ULLONG_MAX instead of U_LONG_LONG_MAX.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6219 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-02 16:43:03 +00:00
Joe Taylor
0ca7c9797e Fix several more typos; round 0.0266 to 0.027.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6218 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-02 16:31:52 +00:00
Joe Taylor
036d408908 Make binomial_subs.c OK on 32-bit machines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6217 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-02 16:13:44 +00:00
Joe Taylor
5606d8a3aa Simple tools to compute cumulative probabilities for the examples in FT paper.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6216 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-02 16:00:19 +00:00
Steven Franke
27a6e3ac60 Minor change to sfrsd2 to cause nhard to be calculated even when decode is done by BM. Fix ntrials off-by-one issue.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6215 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-02 00:22:13 +00:00
Joe Taylor
a5b5321335 Add simple program to evaluate binomial coefficient and hypergeometric pdf.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6212 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 19:29:05 +00:00
Joe Taylor
66946ca3dd Correct the numerical value for P(x>=37) = 1.9e-6. Fix a typo.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6211 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 19:17:50 +00:00
Joe Taylor
13de66750a Oops! Fix a typo.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6209 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 14:43:06 +00:00
Joe Taylor
5436682239 A few more minor tweaks to the text.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 14:30:21 +00:00
Steven Franke
5c126f0a54 Add Psuccess figure to the document and commit gnuplot script and data files that produced it.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6207 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 02:48:48 +00:00
Joe Taylor
8603532acc A few more tweaks of the draft paper.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6206 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 02:03:35 +00:00
Joe Taylor
b8f772d0b9 More massaging of draft paper on the FT dedoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6205 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-01 00:28:58 +00:00
Joe Taylor
546da13f9e More work on the paper on soft-decision RS decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6204 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-30 21:53:58 +00:00
Steven Franke
125e8d8e12 Additions to sfrsd document.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6200 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-28 23:31:01 +00:00
Steven Franke
5b83e4f870 Small tweaks to sfrsd document.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-28 17:08:03 +00:00
Steven Franke
a5e6dd2063 Some more progress on the sfrsd document. IEEE Layout won't work with enumerate style, so switched to a different style for now.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6197 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-28 05:38:16 +00:00
Steven Franke
864a1f24a6 Enable jt65sim to accept real-valued snr and generate unique callsigns when nsig>1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6195 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-27 16:55:55 +00:00
Steven Franke
c2ed418262 Fix half-symbol offset in jt65sim.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6187 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-26 13:41:07 +00:00
Steven Franke
7f9024bf62 Remove redundant file.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6186 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-26 03:57:42 +00:00
Steven Franke
331fb62e23 Add separate folder sfrsd_paper to hold the whole project.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6185 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-26 03:55:56 +00:00
Steven Franke
167b21ce7f Make changes to jt65a arguments.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6184 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-26 02:51:46 +00:00
Steven Franke
d344f18891 Add beginnings of rough draft of sfrsd reference document.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6183 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-26 01:59:56 +00:00
Joe Taylor
b557035d0c Send parameters for experience-based decoding to jt9[.exe].
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6181 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-25 20:09:57 +00:00
Joe Taylor
56e3638bc5 Increase the JT65 range of acceptable DT: now -2 to +5 s. Note that
displayed DT values appear to be to low by 0.2 s -- they range from
-2.2 s to +4.8 s, according to files generated by jt65sim.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6179 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-25 16:40:22 +00:00
Joe Taylor
edf086c718 Code cleanup: don't modify the msg argument passed to packmsg().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6178 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-25 14:57:10 +00:00
Steven Franke
65d4d6324c Add command line option -f to set nfqso in jt65 test program.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6177 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-25 03:27:42 +00:00
Joe Taylor
33b50da632 Remove vestiges of LU 22 for kvasd.dat.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6175 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 20:16:57 +00:00
Joe Taylor
13c9938607 Implement (still in very basic form) experience-based decoding for JT65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6174 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 19:49:04 +00:00
Bill Somerville
eb1004ec76 Remove more KVASD remnants
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6173 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 19:46:59 +00:00
Joe Taylor
1a08ce3383 Correct the S/N scale in jt65sim; set some params for command-line use of jt9.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6172 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 18:20:45 +00:00
Joe Taylor
4680817a93 Separate variables for the decoding parameters that had been packed into ndepth.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6170 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-24 15:05:45 +00:00
Joe Taylor
29616b0f96 Add degrade_snr.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6167 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-23 18:20:55 +00:00
Joe Taylor
475118428e Add facility to degrade S/N of data from .wav files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6165 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-23 18:05:36 +00:00
Joe Taylor
07080f7ef3 Decode JT65 first at QSO frequency.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6164 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-23 15:57:33 +00:00
Steven Franke
16a5a6c56f Simplify sync logic and restore fallback to robust sync when ncand>50, even when box is un-checked.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6152 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-22 15:52:34 +00:00
Steven Franke
c9ad0c3038 Add robust sync checkbox to Advanced setup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6151 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-22 15:27:14 +00:00
Steven Franke
18c46b7467 Fix up OS X makefile for jt65 utility programs.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6148 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-21 22:05:57 +00:00
Bill Somerville
5e2fec1fe4 Squash some compiler warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6145 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-21 20:23:39 +00:00
Joe Taylor
15d4618725 Correct a few comments.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6133 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-19 20:51:54 +00:00
Joe Taylor
70a5fbd34c Add optional Rayleigh fading to jt65sim.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6132 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-19 20:49:55 +00:00
Joe Taylor
8e0f970149 Minor tweaks to jt65sim.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6126 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-18 20:04:47 +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
4279c78be9 Fix incorrect drift field in on screen WSPR decodes
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6098 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-14 19:24:15 +00:00
Joe Taylor
08235033cc Correct a bug in jt65code.f90. (The "sent" array of symbols was
clobbered by the decode test, before being displayed.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6000 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-10-24 18:09:50 +00:00
Steven Franke
a9ed7a04d9 Make fano.c decode 31 tail zeros instead of just 30. This decreases the probability of bad decodes somewhat.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5746 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-08-02 23:18:51 +00:00
Joe Taylor
50b307f905 Update Makefile.win32 for building wsprd_exp.exe.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5739 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-30 12:30:05 +00:00
Steven Franke
1c41850d3d Remove redundant comparison.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5724 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-27 00:46:32 +00:00
Steven Franke
4be15b71f4 Decrease memory footprint of stack and improve stack decoder efficiency.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5723 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-26 14:09:25 +00:00
Steven Franke
8ca565516e Add stack decoder files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5722 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-25 23:50:29 +00:00
Steven Franke
6951499db3 Move hashtab onto the heap. Add new wsprd_exp with stack decoder option (jelinek.c)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5721 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-25 23:48:53 +00:00
Joe Taylor
4f64ed80a8 Fix bug in JT4 decodes with MinW=G.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5690 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-06 17:26:40 +00:00
Steven Franke
ac822b3ed7 Add drift estimate refinement and other minor tweaks.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5685 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-04 19:52:57 +00:00
Steven Franke
99442421de Add -d deep search option.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5669 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-03 15:05:09 +00:00
Steven Franke
03b3b1a47d Fine tuned sync-search and iifac. No more quickmode on second pass.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5668 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-03 02:39:38 +00:00
Steven Franke
6296a1b42b Signficant decrease of time spent in sync_and_demod(0) and 1.5% more spots
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5660 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-02 01:17:52 +00:00
Steven Franke
15618e4b16 Move some arrays to heap storage.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5656 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-01 19:33:40 +00:00
Joe Taylor
5250e0765a Only one text window in WSPR and Echo modes, even if "Show DXCC" is enabled.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5651 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-07-01 17:38:18 +00:00
Steven Franke
de84b28e8e Move wsprd_exp.c to wsprd.c, making two-pass decoding the default for wspr mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5644 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-30 22:03:07 +00:00
Steven Franke
77b488c075 Store decodes in a struct and sort by frequency before printing.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5636 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-28 14:01:23 +00:00
Steven Franke
2bd580d970 Temporarily commented out timf2 in wspr_downsample.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5635 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-28 01:35:33 +00:00
Joe Taylor
87c0c7b540 Add Makefilw.win32 for test builds of wsprd-exp.exe on Windows.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5631 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-26 15:42:11 +00:00
Steven Franke
61f76d6b46 Compensate for LPF filter step response at beginning and end of transmission.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5629 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-24 02:08:59 +00:00
Steven Franke
9bc4d03823 /lib/wsprd/Makefile now creates wsprd_exp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5628 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-22 19:42:28 +00:00
Steven Franke
40cfb61462 Two-pass decoding is now the default in wsprd_exp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5627 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-22 19:39:43 +00:00
Steven Franke
8d3f23788c Replace some hardwired parameters with variables in wsprd_exp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5625 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-21 22:32:22 +00:00
Steven Franke
31322b579b Refinements to wsprd_exp signal subtraction function.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5624 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-21 01:48:48 +00:00
Steven Franke
f511da3c53 Bug fixes for wsprd and wsprsim utilities. Implemented fully-coherent signal subtraction in wsprd_exp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5621 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-18 02:24:06 +00:00
Steven Franke
f256984d13 Remove debuggin code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5620 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-16 03:02:01 +00:00
Steven Franke
c29d4908e2 Fix some bugs uncovered by the signal subtraction project.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5619 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-16 02:47:51 +00:00
Steven Franke
5003c4c839 Further work on signal subtraction. wsprd_exp now has subtraction and two-pass options.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-15 22:24:02 +00:00
Steven Franke
865d52d514 More progress on signal subtraction.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-15 01:34:32 +00:00
Steven Franke
57ef481004 First steps toward 2-pass decoder that attempts to subtract strong signals.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5611 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-14 20:24:52 +00:00
Steven Franke
d10a46d147 Modifications to allow get_wspr_channel_symbols to be called repeatedly.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5610 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-14 20:02:03 +00:00
Steven Franke
9231696718 Fix problem that affected Type 1 callsigns with 6 chars.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5609 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-14 18:13:38 +00:00
Steven Franke
d17c48183d Actually add the new wsprsim files this time.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5608 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-14 15:21:50 +00:00
Steven Franke
eff7a1f733 unpk.c moved to unpk.c.obsolete. This function lives in wsprd_utils.c
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5607 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-14 15:06:46 +00:00
Steven Franke
2c8613fa52 Added c functions necessary for packing/coding and demonstration/simulation program wsprsim.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5606 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-14 15:05:07 +00:00
Joe Taylor
ec9855fd6b Working on message averaging for JT4 mode. Far from finished! ... but
it's much better than it was.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5589 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-11 18:49:42 +00:00
Joe Taylor
289b4c70f8 Correct the bounds error test in avecho. Ensure proper GUI controls
visible in Echo mode. Reset nsum=0 when Tx Enable is toggled ON in Echo mode.
Don't restart Monitor after finishing a sequence of Echo transmissions.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5584 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-11 15:32:55 +00:00
Joe Taylor
cddc9b20e9 Fix bad value of Dgrd. Fix bounds error in avecho. Don't display
astronomical data not relevant below VHF.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5582 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-11 14:38:31 +00:00
Steven Franke
314751b518 Add #include <stddef.h> in nhash.h.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5578 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-10 20:25:34 +00:00
Joe Taylor
0707f25e83 Must include nhash.h *after* the system includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5577 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-10 20:23:18 +00:00
Bill Somerville
934e6e696b Correct Fortran - C interop in wsprd code
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5571 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-10 14:48:26 +00:00
Joe Taylor
7137098869 Results of Echo mode to text window. (Not yet calibrated!)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5567 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-09 19:04:21 +00:00
Joe Taylor
9d1a534aa0 Finish implementing bins/Pixel on EchoGraph.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5563 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-09 16:15:35 +00:00
Joe Taylor
4b1c3c319f Echo spectrum appears OK; must test Doppler corrections in both modes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5559 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-09 00:43:07 +00:00
Joe Taylor
fa96482008 Basic functionality of Echo spectrum is in place.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5557 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-08 19:42:20 +00:00
Bill Somerville
c46778f4a9 Increased maximum length for JPLEPH path from 80 to 256 characters
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5555 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-08 17:45:11 +00:00
Joe Taylor
01dfb567f5 Don't allow a partial transmission in Echo mode. Fix RA, Dec, and Tsky
returned by astro().  



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-06 18:02:39 +00:00
Bill Somerville
5a8fa2f379 Remove redundant Fortran function
lib/hopping.f90 has been superceded by  C/C++ code except for the call
to grayline() which is now called directly.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5545 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-06 13:05:04 +00:00
Steven Franke
4f6904943b Remove scheduler debug writes to stdout, clean up hopping.f90, add next_hopping_band() function.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5541 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-05 23:03:32 +00:00
Steven Franke
7e3c93553f Enable new TX scheduler for WSPR mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5533 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-04 22:25:27 +00:00
Joe Taylor
0f38903e9d Reconnect "Dgrd" (EME degradation) for user display.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5498 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-02 17:09:44 +00:00
Joe Taylor
639b9f8dcf Reconnect computed EME delay, for display to user.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5497 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-02 16:59:22 +00:00
Joe Taylor
e837b9209e EME Doppler calculations now use JPL Planetary Ephemeris.
Also new, simplified routines for Doppler spread.
Beware! Not yet fully tested ...



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-02 16:43:40 +00:00
Joe Taylor
adebd2420a Pass absolute file path for JPLEPH to astrosub_().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5494 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-06-02 15:59:52 +00:00
Steven Franke
01d60d448a Try to ensure that the hopping table satisfies runlength and number of transmissions-per-hour constraints.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5482 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-31 19:12:51 +00:00
Steven Franke
be3f84da2f Try letting hopping.f90 determine TX intervals
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5472 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-30 23:45:22 +00:00
Joe Taylor
94d26c18b8 Simple program to analyze ALL.TXT files for JT4 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5466 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-29 19:25:12 +00:00
Joe Taylor
dd28533d79 New program jt4sim: generates simulated JT4 files for testing decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5459 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-29 17:19:25 +00:00
Bill Somerville
34f8924cfc Reintegrate the wsjtx_exp branch into the trunk
This  merge brings  the WSPR  feature development  into the  main line
ready for release in a future v1.6 release.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5424 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-27 13:08:28 +00:00
Bill Somerville
6a33cbd43b Fix typo in options documentation
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5363 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-05-12 15:49:35 +00:00
Bill Somerville
a51c5c4251 Reintegrate Joe's experimental VHF & up features
As at ^/branches/wsjtx_exp@5271



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00
Joe Taylor
14c96e8232 Update jt9sim with a standard *.wav header.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5088 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-21 00:34:21 +00:00
Joe Taylor
bd9e4e2997 Bring jt9sim.f90 up to date.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5078 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-19 13:48:26 +00:00
Joe Taylor
80ece75da6 Remove calls to timer() around the "flatten" loop in filbig.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5017 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-06 19:44:46 +00:00
Joe Taylor
6abec2102c Zero out the wrapped-around end points after cshift from c3a to c3.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5007 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-05 17:13:00 +00:00
Joe Taylor
196020ff3c Reformat last few lines of timer.out.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5006 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-05 15:27:13 +00:00
Joe Taylor
c75c4aefda Further improvements to JT9 decoder.
Better AFC (wider range of possible drifts; more accurate DT alignment).
Better definition of metric tables used by Fano decoder.
Zero-centeres soft symbols, instead of offset +128.
Tuned several empirical parameters.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5004 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-04 17:07:15 +00:00
Joe Taylor
f424080883 Another minor adjustment to the JT9 decoder, conditionally changing
limits on sync and schk.  (Probably still more to come...)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4998 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-28 14:24:57 +00:00
Joe Taylor
476c0683a8 Further improvements to JT9 decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4993 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-27 15:38:24 +00:00
Joe Taylor
2aa42f0414 Minor tweaks in JT9 decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4989 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-24 20:19:04 +00:00
Bill Somerville
13afca4488 Stop accumulating baseline samples when there are too many
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4966 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-15 19:20:11 +00:00
Joe Taylor
efeb157d94 Minor tweaks to how decoder statistics are compiled and displayed.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4964 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 20:25:49 +00:00
Bill Somerville
701911ac9c Minor timer clean up
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4961 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 16:55:57 +00:00
Joe Taylor
93f918a451 Add decoder statistics to timer.out.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4958 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 14:22:54 +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
Bill Somerville
f58656984c Add more decoding parameters to jt9 command line program
Options have been added to control frequency cut off values, mode and, Tx mode.

The comand line parser now has optional long option names and usage help.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4949 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-10 14:04:54 +00:00
Bill Somerville
f59dc6d089 Ensure prompt output of decoded messages
Outputo buffer flush commands have been added after each decoded message output
to ensure that other processes get timely updates of newly decoded messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4948 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-10 14:04:47 +00:00
Joe Taylor
3fdde76420 The "big FFTs" should be computed only once for each new set of Rx data.
This requires setting newdat=0 after the big FFT is computed.  In the OMP
code this must be done separately for each mode; so new variables newdat9 
and newdat65 have been defined.  Both are set to "newdat", the value
forwarded from the GUI, each time jt9[_omp][.exe] goes into action. 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4946 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 15:07:31 +00:00
Bill Somerville
004a604cde Fix defect in timer call chain maintenance
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4945 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 11:56:22 +00:00
Bill Somerville
90940a4eac Use correct type for FFTW3 argument
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4944 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 11:10:28 +00:00
Bill Somerville
f68e6f289f Correct compile error
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4943 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 10:53:48 +00:00
Bill Somerville
127f72f3ad Remove redundant copy of large array in JT9 decoder
Also moved  the same large array  from stack to heap  which along with
other prior  changes now allows  the Windows jt9 OpenMP  executable to
run with a default stack size again.

This also removes a crash on the Mac version which was probably due to
excessive stack usage.

Net result is an even faster JT9 decoder.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4942 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 09:53:20 +00:00
Joe Taylor
c86f37cade Another instance of variables needing to be saved explicitly between
calls to a subroutine.  I believe this fixes the known outstanding decode
issue.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4941 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 18:44:45 +00:00
Bill Somerville
d1a1510fc8 Make output arguments of decoders shared between threads
This is only a temporary fix  becuase if both decoders were to produce
results  that need  accumulating  e.g. number  of  decodes, then  more
complex code to merge the results would be needed.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4940 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 16:34:26 +00:00
Joe Taylor
b01fb32aea Some variables now need to be saved explicitly to maintain value
betweek subsoutine calls.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4939 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 15:18:38 +00:00
Bill Somerville
1271243952 Thread safe lib/timer.f90
Accounts for each traced call per thread and accumulates by rolling up
calls with an identical call chain before printing the statistics. The
print now accounts for function calls  in their call chain so the same
function will be reported more than  once if it is called in different
places.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4937 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-05 22:07:19 +00:00
Joe Taylor
6582f5410c Increase JT65 decoding depth at QSO frequency.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4936 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-05 17:43:43 +00:00
Joe Taylor
5de52a2516 Better to set nflatten=0 here, for command-line speed tests.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4935 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 21:42:49 +00:00
Joe Taylor
06c83c580d Make array sizes in downsam9 consistent with the new big FFT length.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4934 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 21:26:58 +00:00
Bill Somerville
01626eeaa3 Only use >1 thread for the biggest FFTs
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4933 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 20:52:42 +00:00
Joe Taylor
73a69499e4 Make the symspec() call in jt9.for consistent with that from mainwindow.cpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4932 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 19:52:37 +00:00
Bill Somerville
36ad50735b Fix typo that disabled JT65 decoding in dual mode.
Disable timer.out generation in OpenMP builds as it is broken.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4931 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 16:33:45 +00:00
Bill Somerville
a7c4d1001f Adjust the jt9 decoder to do the right decodes in parallel
Also limit the required threads for parallel decoding to 2.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4930 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 15:34:46 +00:00
Joe Taylor
c7faf40d34 Need space for more calls to timer().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 15:05:39 +00:00
Bill Somerville
91b909b581 Thread safety enhancements to jt9
Serialize thread unsafe FFTW3 calls

Serialize FFTW3 plan initializations in four2a

Serialize decoder results output to file/console

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4928 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 01:41:26 +00:00
Joe Taylor
16452ae32f Add rfilt and df to the "save" list in filbig.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4927 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 00:37:33 +00:00
Joe Taylor
010f85ec70 Further algorithmic tweaks in the JT9 decoder.
More detailed message to come, with comparative timing statistics.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4926 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-02 18:29:00 +00:00
Bill Somerville
e791efb5b8 First attempt at a thread safe lib/timer.f90
This  tries  to  account  for  function  calls  in  different  threads
separately by decorating  the function name with the  thread number it
is  running in.  This may  not be  the best  strategy for  performance
timing but it is  the easiest way of making it thread  safe that I can
see.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4924 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-02 14:08:17 +00:00
Bill Somerville
ffdeafe3bb Build an OpenMP version of jt9 where possible
This change  introduces the program jt9_omp  which is a testbed  for a
multi-threaded version of the jt9 decoder program. The program jt9_omp
should be  a directly substitutable for  jt9 except that JT65  and JT9
decodes are computed in parallel.

Also enable  the OpenMP directives in  decoder.f90 - note this  is not
yet a working multi-threaded decoder and the existing jt9 is still the
correct decoder to be used in WSJT-X.

Increased the available  stack size for jt9_omp.exe as this  is a hard
limit on  Windows and  the default  is not big  enough for  the OpenMP
version of jt9.

Also  Fortran  array  bounds  checking is  now  disabled  for  Release
configuration builds so as to improve performance a little.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4922 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-02 11:24:20 +00:00
Joe Taylor
3d112ab26c Change some calls to timer().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4921 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-01 20:11:10 +00:00
Joe Taylor
630ec94aaa Forgot to commit decjt9.f90.
Also note: something's wrong when trying to decode a file read 
by the GUI from disk.  Will fix it soon...



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4920 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-01 17:40:14 +00:00
Joe Taylor
94472ac31c Many changes in program jt9[.exe] aimed at speeding up the decoders.
The long FFTs can now use the multi-threaded FFTW routines.
Subroutine decode9.f90 was renamed jt9fano.f90.
The JT9 decoder's top-level functions were removed from decoder.f90
and put into a separate subroutine decjt90.f90.
Subroutine decoder.f90 is now configured for possible use of OpenMP 
SECTIONS, with the JT9 and JT65 decoders running concurrently on
a multi-core machine.  Note, however, that this concurrent processing 
is not yet fully implemented.  Probably calls to timer need to be removed; 
some variables used in calls to jt65a and decjt9 may need to be 
declared PRIVATE in decoder; some sections probably need to be declared 
CRITICAL; probably some SAVE statements in downstream routines have
made them not thread-safe; etc., etc.  

I'm a neophyte at using OpenMP.  Comments, suggestions, and/or tests by
others will be welcome!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4919 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-01 16:23:36 +00:00
Joe Taylor
3a8232b113 Made a start at implementing an option to use multi-threaded FFTs.
New command-line option for jt9: [-m nthreads].  Default is nthreads=1.
Also refactored a loop in filbig.f90 that was taking far too much
time.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4916 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-30 21:28:10 +00:00
Joe Taylor
72305cf10f Allow use on nonthreading model by setting nthreads=0.
Require at least 10 iterations.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4915 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-30 01:45:37 +00:00
Joe Taylor
d8f8c0c809 More minor cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4914 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 20:50:05 +00:00
Joe Taylor
647ae961fa Set compiler flags.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4913 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 19:17:56 +00:00
Joe Taylor
00e8a7a0c8 Clean up compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4912 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 19:16:37 +00:00
Joe Taylor
776c78544d Another tweak.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4911 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:49:40 +00:00
Joe Taylor
d10194bb54 Remove diagnostic print.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4910 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:46:46 +00:00
Joe Taylor
9a9c814e13 Minor tweaks.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4909 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:38:51 +00:00
Joe Taylor
104f001590 More testing of FFTW performance...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4908 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:29:41 +00:00
Joe Taylor
cbeed6b053 Testing some newer FFTW features.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4907 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-28 12:52:24 +00:00
Joe Taylor
a4897b696b Add nfft.out (output from chkfft, on a Dell laptop).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4848 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-22 14:06:40 +00:00
Joe Taylor
d338885098 Some final(?) tweaks and additions to the chkfft mini-package.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4838 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 21:06:21 +00:00
Joe Taylor
c628013582 A few more tweaks, and add the file nfft.dat of efficient FFT lengths.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4837 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 20:53:16 +00:00
Joe Taylor
1889b24c78 Several tweaks to chkfft.f90. Add descriptive file chkfft.txt.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4836 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 20:34:06 +00:00
Joe Taylor
22e15084e1 Add chkfft.f90; more thorough comments in four2a.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 16:41:18 +00:00
Bill Somerville
f37ed4cd78 Take advantage of the new KVASD v1.12
Pass the  temporary directory to  jt9 and use  it to give  the correct
paths  to  temporary files.  Also  jt9  passes  the absolute  path  to
kvasd.dat in the temporary directory to kvasd.

Clear out all the annoying cruft that has accumulated due to having to
run with $CWD as the temporary directory.

Use QStandardPaths  to find the  writable data directory  where needed
rather than passing it around  between objects. This now works because
the $CWD hasn't been changed.

Do away with the CMake option WSJT_STANDARD_FILE_LOCATIONS as it is no
longer needed.

Fix astro status file azel.dat formatting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4732 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-03 00:06:54 +00:00
Joe Taylor
e8c59114db Update the linux Makefile for qmake/make builds.
Minor correction for wsjtx man page.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4635 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-24 14:54:47 +00:00
Joe Taylor
021f677687 Add wisdom for the FFTs done by symspec_(), wsjtx[.exe].
Also complete the wrapper code in wisdom.c.
TBD: should be possible to use fftw3f.f03 instead of the ad hoc wisdom.c.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 15:17:22 +00:00
Joe Taylor
20ded259d8 Decode from disk sets npatience = 2.
This means that the first decode from a saved data file will be slow,
but the saved wisdom for the decoded mode(s) will be better than
for the default npatience = 1.  All subsequent decodes in the same 
mode(s) will take advantage of the newly saved wisdom.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4616 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 01:40:24 +00:00
Joe Taylor
2bc824b4a5 Try a home-made wrapper for fftwf_export_wisdom_to_filename().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 00:44:50 +00:00
Joe Taylor
3a5edb5af5 FFTW wisdom is now built into jt9[.exe].
New optional argument to jt9: -w patience
Default is patience = 1

Example timing measurements for 130610_2343.wav:

patience  plan   execute
          (s)      (s)
-----------------------------------------------
   0      0.01     1.25  FFTW_ESTIMATE
   1      0.69     1.25  FFTW_ESTIMATE_PATIENT
   2     16.97     1.15  FFTW_MEASURE
   3    390.88     1.15  FFTW_PATIENT

Conclusions, consistent with expectation based on past experience
with similar FFTs:
  - First decode (in each mode) with patience = 2 is slow.
  - Speed advantage of patience = 2 is small but measurable.
  - No measurable advantage in using patience > 2.

Present mainwindow.cpp has "-w 1" hard-wired.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4610 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-20 18:48:53 +00:00
Joe Taylor
b3f4432f67 Correct the logic for negative-frequency index into new ca array.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4609 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-19 20:17:15 +00:00
Joe Taylor
f07a960e2d Several decoder optimizations, including implementation of FFTW wisdom.
Notes:
1. Equivalents of wisdom1.bat will be needed for *nix and OS X.  (The
   version now added to the source .../lib directory is an example only.)
2. Installers should offer to run the wisdom1[.bat] script at installation
   time.
3. wisdom1[.bat] and fftwf-wisdom[.exe] must be installed in .../bin directory 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4607 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-19 17:23:57 +00:00
Joe Taylor
4fea8ebd0c Optimizations of JT9 and JT65 decoders; change clock in timer routine.
Both decoders now have slightly better performance and faster
execution.  The rare "duplicate decodes" in JT9 were eliminated.
On Windows, at least, calls to f90 routine system_clock() do not
provide correct wall time increments.  Changed to using secnds()
instead.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4571 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-30 19:29:16 +00:00
Joe Taylor
3dec8d4d97 Adding programmer comments to decoding routines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4558 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-24 21:43:43 +00:00
Bill Somerville
0ee86f63b5 Added new library source
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4553 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 14:21:24 +00:00
Bill Somerville
1ff68d5098 Make/qmake tweaks
The lib/Makefile.MinGW makefile  has been enhanced to link  to the DLL
version of fftw3  which is the normal version of  the library that you
get with the Windows installer.

The library is  located by passing the FFTW3_DIR variable  on the make
command line. For example on my system:

	$ # In a MinGW console
	$ cd ~/src/wsjtx/lib
	$ make QT_DIR=/c/Tools/Qt/5.2.1/mingw48_32 \
	>  FFTW3_DIR=/c/Tools/fftw-3.3.3-dll32-2

Similarly with the qmake project:

	$ # In a Qt MinGW 32-bit console
	$ cd ~/src/wsjtx
	$ qmake \
	>  HAMLIB_DIR=c:/test-install/hamlib/mingw48_32 \
	>  FFTW3_DIR=c:/Tools/fftw-3.3.3-dll32-2
	$ mingw32-make



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 13:47:19 +00:00
Bill Somerville
5a56cbdedb Tidy up unused files and move platform specific files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4549 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 18:01:21 +00:00
Joe Taylor
a47f3cb9fe Remove two unused routines. Remove declaration of unused variable.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4544 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 13:04:29 +00:00
Joe Taylor
8a6694f9b4 Remove a bad test message from jt9code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 12:29:45 +00:00
Joe Taylor
d110a5fbcf Update the "Usage" messages for jt65code and jt9code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4537 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:31:17 +00:00
Joe Taylor
c6fea4af05 Build a list of test messages into jt9code and jt65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4536 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:29:30 +00:00
Joe Taylor
315fc6fbc3 Minor tweak to the new output format for jt9code and jt65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4535 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:04:58 +00:00
Joe Taylor
47d2572b55 Forgot to commit a new utility function.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4534 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 00:57:29 +00:00
Joe Taylor
0e96882d8b Improve the way messages with compound calls are automatically generated.
Routine packmsg now tries the shortlist (Type 1 prefix or suffix) first.
Then it tries to to make a valid message using a Type 2 prefix or suffix.
If both fail, it packs the first 13 characters as a free-text message.

The GUI now generates the most useful messages with compound callsigns
of all valid types.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4533 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 00:56:41 +00:00
Joe Taylor
085bd4c2fd Use CPU_TIME() rather than SYSTEM_CLOCK() in timer.
SYSTEM_CLOCK() did not work as well, in the Windows Release build.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4525 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-17 18:38:06 +00:00
Joe Taylor
2baf0a766d Fix a bug that can appear when unpacking compound callsigns.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4343 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-22 14:31:08 +00:00
Joe Taylor
60955db247 Resurrect jt9sim, in case we need it.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4305 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-11 15:32:22 +00:00
Joe Taylor
617b08175b More work needed...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-11 00:29:50 +00:00
Joe Taylor
97aee45aa9 Save a temporary test program.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-11 00:07:49 +00:00
Joe Taylor
6de67f32b1 Tweak the JT65 decoder so that it accepts DT down to -3.3 s.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-31 17:22:51 +00:00
Joe Taylor
345d13ef54 Always allow JT65 decoding above the blue line, when in JT9+JT65 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4198 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-09 12:58:12 +00:00
Bill Somerville
0e6ca32fe2 Open decoded.txt in append mode when redoing a decode pass.
Before the subsequent decodes on a period (nagain/=0) were truncating
the file and confusing JTAlert.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4047 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-20 02:44:47 +00:00
Bill Somerville
3b8c9c0f0e Work around what appears to be a gcc 4.9.0 defect.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4036 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-16 16:43:52 +00:00
Bill Somerville
62d8eb1bf5 Legacy makefile maintenance.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4020 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-13 18:49:09 +00:00
Bill Somerville
690fc66ca7 Squashed yet more compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3980 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-03 20:17:08 +00:00
Bill Somerville
b17ff13e89 Squashed some compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3978 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-03 19:44:34 +00:00
Bill Somerville
542c85d8f6 Added recource file to qmake project file.
Made 'lib' makefiles a bit more portable.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3976 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-02 17:37:18 +00:00
Bill Somerville
68f47c4ec4 Add new sources to lib Makefiles.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3971 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-31 03:11:16 +00:00
Joe Taylor
3228cc85e5 New Makefile.jtsdk allows easy building of jt9.exe from command line.
(Many changes still needed to wsjtx.pro, in order to build from
within QtCreator.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3945 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-28 18:54:11 +00:00
Bill Somerville
9247e10115 Added support for use of "Standard" locations for writable files.
This allows  writable files  to be  located in  the "correct"
         location for  each platform rather  than in the  directory of
         the  executable  which, in  general,  is  not recommended  or
         allowed in some cases.

         A preprocessor macro  WSJT_STANDARD_FILE_LOCATIONS is used to
         switch be tween old and new functionality, currently it is on
         by default.  It  can be turned off by defining  it to a false
         value (0)  or more simply  with cmake-gui setting  the option
         with  the same  name.  JTAlert  can  only work  with the  old
         non-standard file  locations until  Laurie VK3AMA  chooses to
         support the new file locations.

         Even  if the  above is  not  enabled; the  QSettings file  is
         written to a  user specific location so it will  be shared by
         all instances  of the  program (i.e.  across  upgrades).  See
         below for multiple concurrent instance support changes.

Added a command line parser module for Fortran.

         Added 'lib/options.f90'  to facilitate more  complex argument
         passing to jt9 to cover explicit file locations.

Changed the way multiple concurrent instances are handled.

         This is  to allow the program  to be run multiple  times from
         the same installation directory.

         A new wsjtx command line  optional argument is available "-r"
         or  "--rig"   which  enables  multiple   concurrent  instance
         support.  The  parameter of the  new option is a  unique name
         signifying  a rig  or equivalent.   The name  is used  as the
         shared memory segment key and  in window titles.  The name is
         also used to  access unique settings files  and writable data
         files like ALL.TXT  and log files.  No attempt  has been made
         to share these files between concurrent instances.

         If  "-r" or  "--rig" is  used  without a  parameter it  still
         enables  multiple   concurrent  instance  support   for  that
         instance.  All instances must use  a unique parameter, one of
         which may be empty.

         The        rig       name        is       appended        the
         QCoreApplication::applicationName() for convenient usage like
         window titles.

Set non Qt locale to "C".

         This ensures that C library functions give consistent results
         whatever the  system locale is set  to.  QApplication follows
         the system locale as before.  Thus using QApplication and its
         descendants  like widgets  and QString  for all  user visible
         formating will give correct l10n and using C/C++ library will
         give consistent formatting across locales.

Added top level C++ exception handling to main.cpp.

         Because  the   new  transceiver  framework   uses  exceptions
         internally, the main function now handles any exceptions that
         aren't caught.

Retired devsetup, replaced with Configuration.

         Configuration  is  a  class  that encapsulates  most  of  the
         configuration  behavior.   Because  rig configuration  is  so
         closely coupled with rig operation, Configuration serves as a
         proxy  for   access  to  the  rig   control  functions.   See
         Configuration.hpp  for  more  details  of  the  Configuration
         interface.

Menu changes.

         Various checkable  menu actions moved  from main menu  to the
         Configuration  dialog.   The  whole settings  menu  has  been
         retired with  the single  "Settings..."  action moved  to the
         file  menu  for  consistency  on  Mac  where  it  appears  as
         "Preferences" in line with Mac guidelines.

New data models for data used by the application.

         ADIF amateur band parameters,  free text message macros, spot
         working   frequencies  and,   station  information   (station
         descriptions and transverter offsets per band) each implement
         the  QAbstractItemModel interface  allowing them  to be  used
         directly with  Qt view widgets  (Bands.hpp, FrequencyList.hpp
         and, StationList.hpp).  Configuration  manages maintenance of
         an instance of  all but the former of the  above models.  The
         ADIF band  model is  owned by  Configuration but  requires no
         user maintenance as it is immutable.

Band combo box gets more functionality.

         This  widget is  now an  editable QComboBox  with some  extra
         input capabilities.

         The popup list is still the list of spot working frequencies,
         now  showing the  actual  frequency decorated  with the  band
         name.  This  allows multiple  spot frequencies  on a  band if
         required.

         The  line edit  allows direct  frequency entry  in mega-Hertz
         with  a completer  built  in to  suggest  the available  spot
         working frequencies.   It also  allows band name  entry where
         the  first  available  spot working  frequency  is  selected.
         Recognized band names are those  that are defined by the ADIF
         specification and  can be found  in in the  implementation of
         the ADIF bands model (Bands.cpp).

         If an out of band frequency  is chosen, the line edit shows a
         warning red  background and the  text "OOB".  Out of  band is
         only defined  by the  ADIF band limits  which in  general are
         wider than any entities regulations.

Qt 5.2 now supports default audio i/p and o/p devices.

         These devices are placeholders  for whatever the user defines
         as the  default device.   Because of  this they  need special
         treatment as  the actual device  used is chosen at  open time
         behind the scenes.

Close-down behavior is simplified.

         The close-down  semantics were broken such  that some objects
         were not being shut down cleanly, this required amendments to
         facilitate correct close down of threads.

User font selection added to Configuration UI.

         Buttons to set the application font and the font for the band
         and  Rx frequency  activity widgets  have been  added to  the
         Configuration UI to replace the file based font size control.

Free text macros now selected directly.

         The free text line edit  widgets are now editable combo boxes
         that have  the current free  text macro definitions  as their
         popup  list.   The old  context  menu  to  do this  has  been
         retired.

Astronomical data window dynamically formatted and has font a chooser.

         This window is now autonomous,  has its own font chooser and,
         dynamically resizes to cover the contents.

Double click to Tx enabled now has its own widget in the status bar.

QDir used for portable path and file name handling throughout.

The  "Monitor", "Decode",  "Enable  Tx" and,  "Tune"  buttons are  now
checkable.

         Being checkable allows these  buttons control their own state
         and rendering.

Calls to PSK Reporter interface simplified.

         In   mainwindow.cpp  the   calls   to   this  interface   are
         rationalized to just 3 locations.

Manipulation of ALL.TXT simplified.

         Moved, where possible, to common functions.

Elevated frequency types to be Qt types.

         Frequency  and FrequencyDelta  defined as  Qt types  in their
         meta-type system  (Radio.hpp).  They  are integral  types for
         maximum accuracy.

Re-factored rig control calls in mainwindow.cpp.

         The new  Configuration proxy  access to rig  control required
         many changes  (mostly simplifications) to the  MainWindow rig
         control code.  Some  common code has been  gathered in member
         functions   like   qsy(),   monitor(),   band_changed()   and
         auto_tx_mode().

Rig control enhancements.

         The  rig control  for  clients interface  is  declared as  an
         abstract    interface   (See    Transceiver.hpp).    Concrete
         implementations of this interface are provided for the Hamlib
         rig  control library,  DX Lab  Suite Commander  via a  TCP/IP
         command channel, Ham  Radio Deluxe also via  a TCP/IP command
         channel and, OmniRig via its Windows COM server interface.

         Concrete Transceiver implementations are expected to be moved
         to a separate thread after construction since many operations
         are blocking  and not suitable  for running in a  GUI thread.
         To facilitate this all  instantiation of concrete Transceiver
         instances are handled by  Configuration using a factory class
         (TransceiverFactory)   for   configuration  parameter   based
         instantiation.

         Various   common  functionality   shared  by   different  rig
         interface implementations  are factored out into  helper base
         classes that  implement or delegate parts  of the Transceiver
         interface.  They  are TransceiverBase  which caches  state to
         minimize expensive rig commands, it also maps the Transceiver
         interface  into a  more  convenient  form for  implementation
         (template methods).  PollingTransceiver that provides a state
         polling   mechanism  that   only   reports  actual   changes.
         EmulateSplitTransceiver  that  provides  split  operation  by
         QSYing on PTT state changes.

         EmulateSplitTransceiver can  be used with  any implementation
         as  it follows  the GoF  Decorator pattern  and can  wrap any
         Transceiver implementation.

         OmniRigTransceiver is  derived directly  from TransceiverBase
         since  it doesn't  require  polling due  to its  asynchronous
         nature.  OmniRigTransceiver is only built on Windows as it is
         a COM server client.  To build  it you must first install the
         OmniRig     client     on     the     development     machine
         (http://www.dxatlas.com/omnirig/).

         DXLabSuiteCommanderTransceiver          derives          from
         PollingTransceiver since  it is a  synchronous communications
         channel.   No  third  party  library  is  required  for  this
         interface.

         HRDTransceiver also derives from PollingTransceiver.  The HRD
         interface  library has  been  reverse  engineered to  provide
         functionality with  all available versions of  HRD.  No third
         party libraries are required.

         HamlibTransceiver  likewise  derives from  PollingTransceiver
         since  the Hamlib  asynchronous interface  is non-functional.
         Although this  class will interface with  the release version
         of Hamlib (1.2.15.3);  for correct operation on  most rigs it
         needs to  run with the  latest master branch code  of Hamlib.
         During development many changes to Hamlib have been submitted
         and accepted,  hence this requirement.  Hamlib  source can be
         obtained from git://git.code.sf.net/p/hamlib/code  and at the
         time of writing he master branch was at SHA 6e4432.

         The Hamlib interface directly calls the "C" interface and the
         modified rigclass.{h,cpp} files have been retired.

         There is a rig type selection of "None" which may be used for
         non-CAT  rigs, this  is actually  a connection  to the  dummy
         Hamlib device.

         PollingTransvceiver   derives    from   TransceiverBase   and
         TransceiverBase derives from the Transceiver interface.

         Each interface implementation offers  some possibility of PTT
         control via  a different serial  port than the CAT  port.  We
         also support PTT  control directly via a  second serial port.
         This is done  by delegating to a dummy  Hamlib instance which
         is   only   used   for   PTT  control.    This   means   that
         DXLabSuiteCommanderTransceiver,       HRDTransceiver      and
         OmniRigTransceiver  always  wrap  a  dummy  HamlibTransceiver
         instance.  The  factory class TransceiverFactory  manages all
         these constructional complexities.

         Serial port  selection combo  boxes are  now editable  with a
         manually  entered value  being  saved to  the settings  file.
         This allows  a non-standard  port device  to be  used without
         having to edit the settings file manually.

         For TCP/IP  network CAT  interfaces; the network  address and
         port  may  be specified  allowing  the  target device  to  be
         located on a different machine  from the one running wsjtx if
         required.  The  default used when  the address field  is left
         blank is the correct one for normal usage on the local host.

         Selecting a polling  interval of zero is  no longer possible,
         this  is because  the rig  control capability  can no  longer
         support one way connection.  This  is in line with most other
         CAT control software.

         In the Configuration dialog there are options to select split
         mode  control  by  the  software  and  mode  control  by  the
         software.  For  the former  "None", "Rig"  and "Fake  it" are
         available,  for  the latter  "None",  "USB"  and, "Data"  are
         available.  Because  tone generation is implicitly  linked to
         split mode  operation; it is  no longer possible to  have the
         software in split  mode and the rig not or  vice versa.  This
         may mean some rigs cannot be used in split mode and therefore
         not in dual JT65+JT9 until  issues with CAT control with that
         rig are  resolved.  Single  mode with VOX  keying and  no CAT
         control are still possible so even the most basic transceiver
         setup is supported as before.

         Configuration now  supports a  frequency offset  suitable for
         transverter   operation.     The   station    details   model
         (StationList.hpp) includes  a column  to store an  offset for
         each band if required.

CMake build script improvements.

         The CMakeLists.txt from the  'lib' directory has been retired
         with its  contents merged into the  top level CMakeLists.txt.
         Install  target support  has been  greatly improved  with the
         Release build  configuration now building a  fully standalone
         installation  on Mac  and Windows.   The Debug  configuration
         still   builds   an   installation   that   has   environment
         dependencies for  external libraries, which is  desirable for
         testing and debugging.

         Package target  support is largely complete  for Mac, Windows
         and, Linux, it should be possible to build release installers
         directly from CMake/CPack.

         Cmake FindXXXX.cmake  modules have been added  to improve the
         location of fftw-3 and Hamlib packages.

         Version numbers are now stored in Versions.cmake and work in
         concert with automatic svn revision lookup during build.  The
         version string becomes 'rlocal'± if there are any uncommitted
         changes in the build source tree.

Moved resource like files to Qt resources.

      	 Because location of resource files  (when they cannot go into
      	 the  installation directory  because of  packaging rules)  is
      	 hard to standardize.  I have used the Qt  resource system for
      	 all ancillary data files. Some  like kvasd.dat are dumped out
      	 to the temp (working directory)  because they are accessed by
      	 an external program, others like the audio samples are copied
      	 out so  they appear in  the data directory under  the default
      	 save directory.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-26 13:21:00 +00:00
Joe Taylor
8dd4e8cfa3 Correct a problem that could occasionally cause "ghost" decodes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3902 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-21 20:11:52 +00:00
Bill Somerville
c2eff2f520 Improved Hamlib library location in configuration.
Added more install files and removed installation of old docs.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3846 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-06 20:56:29 +00:00
Joe Taylor
5f9b624632 Update the CMake files and the rev number.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3842 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 20:25:01 +00:00
Joe Taylor
3cf2b740e5 One more
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3841 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 20:19:38 +00:00
Joe Taylor
c49f0ef6d2 two more subs
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3840 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 20:18:08 +00:00
Joe Taylor
f7d4a71454 Another bunch needesd for astro display.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3839 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 20:14:36 +00:00
Joe Taylor
2e6611dbb5 Another one...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3838 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 20:09:03 +00:00
Joe Taylor
50a1865107 Anoter missing file
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3837 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 20:06:44 +00:00
Joe Taylor
86591544f0 Merge changes from branches/wsjtx_w back into branches/wsjtx.
Note to developers: Not sure about the makefiles...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-05 18:20:40 +00:00
Bill Somerville
3987269362 Made Makefile.MinGW more generic.
For example the location of the Qt installation can be specified by
overriding the Makefile variable QT_DIR like:

mingw32-make -f Makefile.MinGW QT_DIR=C:\Qt\5.2.1\mingw48_32

the default uses the g95 Fortram compiler, if you have gfortran
installed and on the PATH then you can override the FC variable like:

mingw32-make -f Makefile.MinGW FC=gfortran



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3780 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-02-19 23:30:25 +00:00
Joe Taylor
93eecbf08e Previous commit message should also have mentioned:
5. F7 now toggles the Setup menu item "Double-click on call sets
   Tx Enable".  Present state is written to Status Bar label 3.

The present commit updates the makefiles.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3673 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-30 18:08:40 +00:00
Joe Taylor
f7e39a2009 1. Add "Utility Programs" section to User's Guide.
2. Change "Appendix x" section headings to useful descriptions.
3. Add KB1ZMX and W4TI to the WSJT-X "About" screen and Acknowledgments 
   in the User's Guide.  (Hope I didn't forget anyone -- please advise 
   if I did!)
4. A few more minor tweaks to User's Guide



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3672 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-30 18:03:21 +00:00
Bill Somerville
1bc89f65fd Fix CMake scripts for changed source file names.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3668 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-29 02:47:18 +00:00
Joe Taylor
784e246557 1. Fix a bug that could cause decoder to hang when presented with
bad data.

2. Fix a bug that could allow a Koetter-Vardy false decode instead of
a valid Berlekamp-Massey decode, sometimes leading to program crash.

3. Many more edits in the User's Guide, *.adoc files.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3664 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-27 21:28:54 +00:00
Bill Somerville
fbe4a52f2f Bringing CMake scripts up to date.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3663 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-26 10:02:54 +00:00
Joe Taylor
b932baef5b Forgot to remove some test code from unpackcall.f90.
It's OK now.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3661 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-25 17:07:06 +00:00
Joe Taylor
051de6afd7 Fix a bug that can arise as a result of a false decode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3660 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-25 16:53:34 +00:00
Joe Taylor
15c102fad8 1. Corrected handling of compound callsigns: use JT65v1 encoding if
applicable, JT65v2 otherwise.  Thanks to DL9RDZ!

2. Fix a bug in flat3.f90, evident on OSX systems.  Thanks to G4KLA!

3. The Makefile now copy the jt9code executable into the destination
   directory for to-be-packaged executables.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3648 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-18 13:59:19 +00:00
Edson W. R. Pereira
e903647371 Added 3 missing files to lib/CMakeLists.txt
Added code to flush any queued spots to PSKReporter prior to a band change. This should prevent spots being reported on a wrong band.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3647 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-18 12:42:21 +00:00
Joe Taylor
74f35bab0d Correct use of "gain" in symspec.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3643 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-17 14:56:11 +00:00
Joe Taylor
65cc741b31 IMplement new spectrum flattening.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3642 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-17 14:46:23 +00:00
Joe Taylor
7cf44f5f54 Fix some illogical use of variable m_RxLog.
Add -DUNIX flag to FFLAGS in Makefile.linux.
Tweak the use of framesAfterDownsample in Detector.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3631 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-09 18:14:58 +00:00
Joe Taylor
052aedef20 More tweaks to the use of flat3.
Include updated makefiles.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3626 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-09 00:03:22 +00:00
Joe Taylor
a6406ea58f Some adjustments to usage of flat3.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3625 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-08 20:55:11 +00:00
Joe Taylor
999b3aab28 Flatten waterfall, but not the avg spectrum.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3624 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-08 18:51:37 +00:00
Joe Taylor
2928042321 Testing a new spectrum-flattening procedure, flat3.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3623 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-01-08 18:38:15 +00:00
Joe Taylor
de98c4114e Update Makefile.linux.
Please note that I removed the option "-mno-stack-arg-probe" from CFLAGS.
Was there any good reason for it still being there?


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3582 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 18:37:37 +00:00
Joe Taylor
24d74ac8cb UPdate the makefiles so they will compile fil4.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3581 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 15:47:34 +00:00
Bill Somerville
a49c4dd704 Added fil4.f90 to CMake script.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3580 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 15:46:26 +00:00
Joe Taylor
5da6167e13 1. Remove several obsolete palette files.
2. Clear the "Name" field after logging a QSO.
3. Add fil4.f90, a subroutine for downsampling from 48000 Hz to 12000 Hz
sample rate.  (Not yet incorporated in WSJT-X, but intended to be called 
from arounf line 51 in Detector.cpp.)
4. Minor updates to User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3570 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-13 13:42:11 +00:00
Bill Somerville
94e6348230 Adjusted CMake scripts for source file changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3559 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-17 12:26:14 +00:00
Joe Taylor
76ead6b071 Remove several unused files, and update Makefile.linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3556 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 17:13:07 +00:00
Bill Somerville
ee4ae6589e More complete CMake install target including sample WAV files from
SVN, user manual and, HRD Interface runtime on Windows.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3554 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 00:24:32 +00:00
Joe Taylor
b831d1e08e 1. Add the sample files described in the User's Guide.
2. Remove offending redefinition of "struct timezone" in timeval.h, it's
no longer needed.  (Let me know if this breaks anyone's build procedure!!)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3552 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-15 20:55:05 +00:00
Joe Taylor
9ab51fd8eb Changes from G4KLA, required to make latest code play on MacOSX.
It's necessary to convey "appDir" from the GUI to jt9, so that jt9
can find the .lock and .quit files.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-15 17:32:46 +00:00
Bill Somerville
97bc017ad9 Initial commit of a CMake script to build wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-14 11:31:49 +00:00
Bill Somerville
4f4c535c4e Added audio channel support.
Audio input can be mono, left of stereo pair or, right of stereo
pair. Audio output can be mono, left of stereo pair, right of stereo
pair or, both of stereo pair (the same output goes to both channels in
both mode). Settings are remembered between sessions.

Stream channel suport is implemented mainly in the new AudioDevice
class which is now the base class of Modulator and Detector.

Audio channels are selected on the configuration screen. Only
supported channel configurations per device can be selected.

Audio output volume (actually attenuation) is now possible from the
GUI. I have added a slider control to the main window; I don't
necessarily propose this as a final release location for the widget as
I understand that changes to the main screen are sensitive. This
location is just a starting suggestion for a trial. The volume
(attenuation) setting is remembered between sessions and is not device
dependent. This addresses all issues of volume setting on *nix
versions since there is no need to use pavucontrol to set audio
levels. The volume (attenuation) action is logarithmic.

Shaped CW keying has been implemented in Modulator although it is
currently disabled as I am not 100% happy wth the implementation. If
you want to try it define the C++ preprocessor macro WSJT_SOFT_KEYING
in your build.

The Modulator instance has been moved to the same thread as the
SoundOutput instance as it should have been since the output callback
already operates in that thread. Cross thread slots are now correctly
called in a thread safe way as a result.

A number of files where in the SVN repository with DOS line endings
which I have removed. SVN users on Windows need set the config for
native line endings so that DOS line endings are automatically
stripped on checkin.

The DevSetup class now holds it's UI o the heap to reduce imapact on
build dependencies.

The application settings are now passed to objects from the main.cpp
file. Management of settings are moved to the responsible classes (top
level windows). This has involved a few settings moving groups so
users will see some settings reverting to default values on the first
run of an update.

Persistance of top level windows geometry and position is now handled
in the recommened manner (constructor for load, closeEvent for store
in modal windows and, hideEvent for store in modeless dialogs).

The MainWindow class now holds its children as members rather than
global variables.

The LogQSO class now hides its implementation and takes responsibility
for its own settings and widows rendering parameters. A new settings
file group is implemented to persist the LogQSO class settings.

The WideGraph class now hides its implementation and manages its own
settings and window rendering parameters.

  --This line, and those below, will be ignored--

M    Modulator.cpp
M    rigclass.cpp
M    widegraph.cpp
M    signalmeter.cpp
M    soundin.cpp
M    soundout.cpp
M    mainwindow.h
M    main.cpp
M    meterwidget.h
M    devsetup.cpp
M    mainwindow.ui
M    Detector.cpp
M    logqso.h
M    rigclass.h
M    mainwindow.cpp
M    meterwidget.cpp
M    soundin.h
M    devsetup.ui
M    wsjtx.pro
M    devsetup.h
M    logqso.cpp
M    Modulator.hpp
M    psk_reporter.cpp
M    killbyname.cpp
M    Detector.hpp
M    signalmeter.h
M    widegraph.h
M    psk_reporter.h
M    soundout.h
M    PSKReporter.h
M    lib/afc65b.f90
M    lib/gran.c
M    lib/usleep.c
M    lib/afc9.f90
M    lib/wrapkarn.c
A    AudioDevice.hpp


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-10 15:29:55 +00:00
Joe Taylor
67f19ac73f Sorry, r3540 introduced a bug that preventer JT65 decoding in some
situations.  It's fixed now.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3541 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-09 23:11:05 +00:00
Joe Taylor
a8acd97f42 1. Correct bug that prevented save/restore of Wide Graph geometry.
2. Fix jt9 so that decoding starts at fStart (which now may be non-zero).
3. Improved or new Tool Tips for some GUI controls.
4. Updates to User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-09 17:22:08 +00:00
Bill Somerville
ef586e4b58 Qt 5 Audio replaces PortAudio.
Currently only Qt5 or above is known to work with this code. It may be
possible to backport it to Qt4 if required.

Audio output goes back to a separate thread to try and minimize
stutters in streaming on Windows particularly.

A crash on Linux due to mishandling of stereo audio output has been
fixed and both left and right channels are now correctly synthesised
with identical contents.

Rigs are enumerated directly from hamlib API rather than running a sub
process reading output of rigctl -l. This was initially done to get
rid of some GUI thread blocking in the configuration dialog, but is
generally a better way of doing it anyway.

Some refactoring in MainWindow to accomodate the audio streaming,
modulation and detecting classes.

Exit handling for application refactored to use signals rather than
brute force event loop exit. This was required to get correct thread
shutdown semantics.

The GUI update timer is now stopped during application shutdown which
is necessary to stop crashes when shutting down gracefully with
signals and window close() calls.

There is an outstanding issue with Linux audio streams; the QAudio
Input/Output classes create a new stream name each time a stream is
started. This doesn't play well with PulseAudio utilities such as
pavucontrol to set stream volume as settings are lost every tx
period. I have tried to keep a single stream for all output but there
are problems restarting it that haven't been resolved yet.

The QtCreator project file has been rearranged a little because it
passes all the object files to the linker rather than using an archive
library. Since the GNU linker is single pass; the object files need to
be in a logical order with definitions appearing afer references to
them. This was required to avoid a linking error.

The lib/Makefile.linux has been enhanced to use the fortran compiler
to locate the correct version of the Fortran library to use. This is
necessary on the latest Linux distros because the unversioned symlink
to compiler support libraries is no longer provided. This only an
issue with mixed programming language links where the linker driver
for one language has to link support libraraies for another language.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3532 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-07 23:09:13 +00:00
Joe Taylor
61f023ddd1 Most of these changes are thanks to G4WJS. Audio I/O is now done using
Qt's built-in QAudio calls rather than PortAudio.  Also includes some
refactoring of the arrangement for these calls, and more use of C++ style.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3523 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-05 13:57:55 +00:00
Joe Taylor
5af0f6880f Change Makefile.MinGW to use my qt5.0.2 paths. Yours may be different!
The old Makefile.MinGW has been renamed Makefile.MinGW.qt4.
Be sure to check settings in lines 13-19 of wsjtx.pro.

Soon to come: Permanent changeover from PortAudio to QAudio ?



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3521 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-02 19:52:25 +00:00
Joe Taylor
34a7d4befa Makefiles should create EXE_DIR if it does not exist.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-25 18:12:03 +00:00
Joe Taylor
f932f2a1da Wrong version of ipcomm.cpp was saved?
Running multiple instances now checked out in Linux, as well as Windows.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-19 00:44:48 +00:00
Joe Taylor
fb7948a836 Full activation of "Multiple Instances", thanks to some code by
Josh Rovero, KK1D.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3495 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-19 00:23:40 +00:00
Joe Taylor
8f3c9a672b Further optimizations of the decoders, and some code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3492 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-17 19:13:36 +00:00
Joe Taylor
f10ef57c7d 1. Double-click on a yellow Tx message should not copy the message again,
and if CTRL is held down it should set Tx as well as Rx freq.  Fixed.
2. Improve the logic for suppressing duplicate JT65 decodes.
3. Disable the "Advanced" item on Setup menu.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3491 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-17 14:18:18 +00:00
Joe Taylor
ac44bacd91 1. Allow waterfall window to have smaller height.
2. Speed improvement in JT9 decoder.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3488 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-16 18:17:20 +00:00
Joe Taylor
600c3e228c Apply sigital gain slider to spectra sent to waterfall.
Update the User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3477 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-10 15:46:27 +00:00
Joe Taylor
ecfc15f3e4 Add calls to timer().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
Joe Taylor
bfe9e49e03 Clean up two warning messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3469 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:05:23 +00:00
Joe Taylor
0f9dc17a8f Remove qDebug() statements.
Use ptt_() function included in getfile.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 23:32:20 +00:00
Joe Taylor
a4cc4f4101 Warning: these changes have not yet been thoroughly tested!
1. Correct the TxMode label on program startup.
2. Insert TxMode (not RxMode) into the "Transmitting..." lines in ALL.TXT.
3. Put TxMode in wsjtx_status.txt.
4. F4 clears Az, Dist, and all Tx messages as well as DxCall and DxGrid.
5. Make it possible to decode JT9 in the "JT65 region", and vice-versa, with
   directed double-click on signal in waterfall.
6. Improved logic for enabling/disabling TestPTT button on setup screen.
7. Do not call getFreq() when TestPTT is activated under CAT control.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3463 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 19:57:01 +00:00
Joe Taylor
3dc6abc0c1 Merging code for v1.1 back into the main wsjtx branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 13:17:22 +00:00
Joe Taylor
207116f574 1. Implement PTT control via HRD.
2. Fix two more g95 compiler warnings.
3. Remove some unused code in getfile.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3305 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 14:52:51 +00:00
Joe Taylor
bfef326b25 Oops! Add jt9b.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3304 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 14:44:36 +00:00
Joe Taylor
f95ab994c0 Eliminate all compiler warnings from gfortran, in Ubuntu 12.04.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 13:33:29 +00:00
Joe Taylor
e3921407bd 1. Forgot to add the code for jt9c.f90, which was separated from
jt9a.F90 in order to suppress a compiler warning.
2. Updated Makefile.linux.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 12:45:33 +00:00
Joe Taylor
d9d9047cb0 Clean up all g95 compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 01:05:37 +00:00
Joe Taylor
3699ac36bf Some minor code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3298 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 20:21:38 +00:00
Joe Taylor
bfcbce34a7 Convert all *.f files to *.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3296 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 15:39:28 +00:00
Joe Taylor
b226f532d4 1. Dashed line between decoding periods.
2. Tweak four2a for compilation on 64-bit systems.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3287 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 11:43:01 +00:00
Joe Taylor
9890731f4f 1. De-activate submodes JT9-5, JT9-10, and JT9-30. (This makes the shared
memory region smaller by some 150 MB.)
2. Some code cleanup (removing unused lstrong, etc.)...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3283 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 14:09:02 +00:00
Joe Taylor
6646005f20 Preparing for more tests of JT9 decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3282 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-17 19:35:29 +00:00
Joe Taylor
8f9e5283a2 Removed red3, was not useful.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3280 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-17 15:16:29 +00:00
Joe Taylor
a75430865e Diasble diagnostic writes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3278 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-17 01:35:36 +00:00
Joe Taylor
2ccb9206b0 1. Remove the "color highlight left window" option.
2. Re-establish the pxdb measurement for Thermo.
3. Double-click on decoded line copies it to QSO window (unless it's 
   already there).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3276 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-16 23:52:04 +00:00
Joe Taylor
7cb0731dc6 Reduce ntol.
Add "red3" (but not yet using it).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3275 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-16 19:01:16 +00:00
Joe Taylor
057287fab1 Many changes to the procedures for selecting decodable candidate JT9 signals.
This code may be the new benchmark?


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3274 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-16 16:02:00 +00:00
Joe Taylor
1f82d75194 Change to symspec() was not a good idea.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3273 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 19:45:55 +00:00
Joe Taylor
1fc406b8a0 Remove diagnostic prints.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 19:13:31 +00:00
Joe Taylor
9d30c88a6f Another try at optimizing choices for decoding. Not done yet!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3271 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 19:03:49 +00:00
Joe Taylor
bd103459f1 Added routine "chkss2" to test sync vector for sanity before attenpting
Fano decode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 15:17:36 +00:00
Joe Taylor
85af134fd1 More (temporary) adjustments to decode parameters.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3269 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 11:37:25 +00:00
Joe Taylor
cba66a9242 Move Tune button to right of "Halt Tx".
Tweak decoding parameters in sync9.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3268 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-14 22:47:32 +00:00
Joe Taylor
f195dda223 1. Minor corrections to plotter.cpop and widegraph.cpp.
2. New algorithm for 'sync9'.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3267 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-14 17:42:25 +00:00
Joe Taylor
f1d6248c46 Temporary code, to aid with a series of tests of the JT9 decoder.
This commit will serve as a benchmark for comparison with new code to
be written.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3266 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-14 14:29:01 +00:00
Joe Taylor
e881b10ce3 Another possible window function (presently commented out).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3264 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-08 19:08:05 +00:00
Joe Taylor
a5695a142e Better window function (lower sidelobes) for displayed spectra.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3263 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-08 18:38:31 +00:00
Joe Taylor
abaf1e3c5b Update Makefile.linux
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3262 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-08 15:31:31 +00:00
Joe Taylor
f9f180818c Fix freq readout for JT9-2.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3258 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-07 12:29:22 +00:00