From 15edace93066a9f3093a9d3a0af4e2d9c5b5dfa6 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Oct 2012 18:33:56 +0000 Subject: [PATCH] Add control of decoding "depth". Improve the way pctile gets an estimate of array median. Put info for mettab() into a data statement. Attempt decoding near all freqs that give sync >= 1.0 Remove killbyname git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2707 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- WSJT-X_Quick_Start_Guide.docx | Bin 176992 -> 177888 bytes lib/decode9.f90 | 47 ++++++++++++++++++++++++----- lib/decoder.f90 | 9 ++++-- lib/pctile.f90 | 17 +++++++++++ lib/sync9.f90 | 1 + mainwindow.cpp | 55 +++++++++++++++++----------------- mainwindow.h | 11 ++++--- mainwindow.ui | 45 +++++++++++++++------------- wsjtx.iss | 2 +- wsjtx.pro | 2 +- 10 files changed, 126 insertions(+), 63 deletions(-) diff --git a/WSJT-X_Quick_Start_Guide.docx b/WSJT-X_Quick_Start_Guide.docx index 0f5864ee146c383cc9e2fae078473481e5baafee..029fc6c0536d03f3badb999d4477987da666ad5e 100644 GIT binary patch delta 11186 zcmY+qV{j#0ur`|P*tTukwrx#p8#}hOlZlOqHL-0?FtIbSjqm;Lt$XU+{wK#URwz0RXFKP zo`TWN60_J6+|sUMxy^*jm)@9)R_tw_9Jg#PpUZO$#*u*jh&}dXv*@VNwtk4(>j14K z3cJVRiE*qVGAq_}aIrvZ#0lNsx$CUwMbt5d7t!zY&jdRO-FUqDo_!13e7~C;ZGh%= zV0xdy*WHK9p&8J+Yn>p9Ee`KBAD@q_QP;pgQ;6c2l^>ER0!FNHA@+*@mdw-4SqTpI zEh>z!pIg298Zo{-5^HtpdGu?gVcvDNpZ|8RPzaPVz{n)5WMiA~sccTm2tU7$S@O0j z2?kbd&V@zVhS0vTM?_GEnw2_TNie9uZvM%Mx?qf@grbJ_ z;U_C64qeTGc1$imBLWj^_Aa+AE8ofdG4vwkmS9Iphtpqv4rAz>FKFTK#R2O)TY^55 z(=vv$bXrcICI1GP5!8-EVD*))Ca<`e?LTTL3HV^8T}!c<=>QW8M}72olq!A|3W~*R z_j^QTn+PubmStOruqsKm0Gwfd`-rlGPnRAM!sH7>mOKP-uzm`-S0G%5bgag6<1hdW zQWv3h2V*N|!Tm4Rsm%x#6M%t0&z2m7k2X3fmO;B;Y9h5HuD$9|KPnl~iQETA>&)1P z5Nim=IJ5A4j!_pE^Vw}q7~vJ6<&kBm-{;5jIoIC5z(~Xr(0m(AOT!M=b-l|SqOadj zo7UjP?O{V~BPhN~PyAA9-#?TFo^@axh3B7jm=N9UHrmH{lp;fpO@Z@WV{c4qdnZ#W z;BkaQ4{_RtXZTv{GP_1aNeRQ$y-}$()%?9&K(D+-wbH1Yc1M zm^xercf~CjtP`G_(nYV;$=d$n(4iSU8#*{bI@E}e^3K#SrS|J3l z5*WtGg7|CI+w)kxc)(fN0raA~;C1}m^ZY>GG(#SgJ0=Zh?le=8p3Cd+m$m|!2knJC z2zDGRtQ9xWQAz}wD+=*yX9A1{o~PG+LUw1tM8X@sRDVU3^$lTKVP|#&>T_m~R3D1t z5LwBO=|qLbg9|2^I>B+vDlNByW63^_Y)yu^8)G)A>pTg1BjD+|n644BxIVu{+!fqfJM-uC_3$O>{%QPeT0HK@9wRoog`r z;%}%2Zla+i;Vlp*oy?`axI;@(o|WP*;zBRF@8~2$HCJjiTtz8Wx4pvl} zmcugSj5%t&d3)3KBU~BL3jXSaAvU%@OY~?U1gUFNs>m_54vH|0-VA)5wPJ@A#I~EF z?P76kBu~Lp5PX44;!3szvUofbuEN6`L1{fZI{`xiI_d#Fh`3oSffuc3(>_{~2wK(v zEN+$2d3Mw~>V&Y0$!N&H9n%E;oR5(?87ER28eNfA`e1mEe;<8g$G>v3Izo;bd@okZ;}UKCXz1gTS8vg#V?71S~~ zSZP5PK&gFo{0}Lo+)IDd2b1va*dqe$azE$n*=9AwlC*&7o58IH`v5jIf6uN{;IGJm z#Tlh6svw%nO5LRm_Rg*m@X4{k++R^^4nTfrG=J0ahV~S(e-ate$ZuR{Z16~HwR+n| zm2Vx=|1#lt2>QlL+JbfT3BArmO;JKF-GqEYo*`=L25?z=V?j-J7;U__K?F=#Z8$k6! z9ps~R0&M6i`yG8VEv`X_%6D=xL{Ix7;>}}(Uyj!*dR|C%xDDIhJFZT>l#R9fe&)X0 zvav@iHNUS;TxN_qwHlhM@{B5u**R9)ly)NWQ);WIw>mQ32O?;q5TUCzrLgF$b=-$O zH>9c0s0eZXgqqq>VARYs&~jx~m;kXOt$#xLlfJg4q^wEqyTZKt54g?}RGH?0l zke-mE^fO(DI();UqeD_6pR|HUNlvI}P{s3IWaj$%|YhyR0wB_4vX;$EAy zz^58D=1iZe6LYa#rYI$k5kOm!fnt7L_j-;9YH2Wv_D5eIr~N~hw~VP26ckSV`tJOV z7k#WptA7`!8t95lp9Z@jNbhd^voC0Z;a44rD#KeolB7VZv1(@#{x0xv4!yg{TR+sj zR>auJ^H>0;gS+kYUbhlMHgy}5)5vYZ_@~(+-L!yp9_BtOyeLZT*lglHQ@Oh0=>9F* zq(kpSBSr$$8Pogh=<)IA)miZ%-0C*ot#daMF=-|WVtXNf@Qbt3Sj>xPLf#N915OzJS957w}4JT(EACQWXJKndc3v)We}Q=Y>k z4}Wpud0~Zi{_~Th<+}dKzQ(#F%-C>sb|lY{?>8hY8{9@WvYF@$&wOe$Tjg|6^MJ2@p6LbRDi zTa_%onfiQ8Q37AMKJJ=O!CKo4wIvmd8E|nOWY;(gsd|##YZX{~4oqgH#G%i_0>Vtx z6&io~d(vSVC8nug>&ENM$1=&Rot-5$b^Xw5QtYXT4WF{o6;#G@h9P@*Om<*qqNg2K zCF2pta-S&0+;|h23&*aorgInOf52w+v{cbI z%wfr5>I)p$FZNQW)&!%RjH0um{qePp(gfx~Y$6Inw`# z&GYKox~{EZf=t0u|K%86E3j}(zG8<&8|h!VE=q#ffF?)QjRM9O7og91%gaK`bZ{-k`k|& zj%%V>=|MDNLE*EEoEZ|yePi`BXUHfvaj9O&9aqQw=M{~_ZW)P;Aw}}V)KnROQ{D)e zv;tl%my$^OmC@HdSx&}6?d5Jvnwo)%I;u`t3Qc+HH)e&x*{*k3y?>P&^O&n4fE~{t z!+0#w2}u)^$!{?`=d!y|TvUJI*{QxpqDPshesL8CfL$5S|9#}g8W_F8o2{!4JoC|n z92D#FeX%?K=+*64oxRB2!yItg;)be#We3t(M|%G}Z^AiZgwoD5QqJ2WVTGv!xk!UW zCb+z4S_150ix}>bmKPjD5;M>BzDm8eiRi9yy|$r_0W#cNA9|MAZI z6csu0OH}94Ny0deJl{zvr_^}RNknYEzVC0|mV~-=oKpId&UC`!depl1qpO#ODPS!{ zb}+Yl9M+6^71-ek(R40bXflGq3Uw;}AoEHDg3mp|7;PwxE{hND&5p^x0`mFHJ+h0H zd1Foxp+aM#!%RpcP#jVIxE}J<)CBT)L9b*XrywFt%n7p(UdCc<4cpC3Rtt4o;f+pI z1pO}x1&^S%aT=Ym28#l(>N102DsZx3G6I(Lb5DZQ%iVdoA*Fzc~5&{U7pL^W`dyBIeog+r%i6 z>-NHy$Uu7Z63e9|%NeBaqaFdt;#yt-WfR^YyH_^zeHWIo%YkM;^ZYwwRo;O_(oL9X zsq4OL0}KscB|C>h7UJX903aa0A6FZ8C-Jrq5@BaWG>ZSHySI~B%<#NugdtN+u`biq zXss{rKcv&al5plPNVB9bZD`!JOc-06rS5+M_enFi{ljy569L?llft{*D@te-E>@z?sDs{+q$dw^vXtt)JV ze1#}mL6>^BKQe^+l$@|!2MbA4eP!JWAj0`(#fEi$VhqHdCgLH>JYWqD_x3xH22e7) zY)&tTWx?|*EGG3CzMK1@f6CxJ;i)Ddjq=2ciZ2`wG3<{CS%7u3q2-mbh_agQ;{Le~ zRs~lIh%=-I2a7_yaRK@q2~+GVekELUe2MLxI7IL=ep}wI(P#M6ryN|~{!xTW4%JM_ zY(xq6<=n0^uV5+kqv5J#$XD)l^MG`$4I+(HkD~UtetESQ zB}+~UYw2fem}xv1ll4a9jb7x~U#5t$nJHo6ffm*>H38<7v(2XKXlFBPKEeeRgH@qGogX zUs8L{&9qd1}W*>eAIm; zn*_OoBw#; zFM&ghM7lkn*?4Z5739wLEm<>0r~?)lx^<^gP!!7HNpvf5#}AqXrYa9~7ssm46UNA{ z%m5UAoWtwneKNSiJ-pt^5%E6#vq~0(2GeN)|Az5r4+LqFq@+0-TIG~CG_+X+~Xm5k%t|jOAkf6%I^)6 zeDrUh4BVp3aG^RT)8b3M_UMcRL$4KjTB$gx=0Zv6^zBFEMg=fVRJRPXVDxKFb3oZl zwr=$RGXJ@m)*n}5%D=j^7edl4OHoy7D5(Qv&MxPU(Rpx*x9!G_zl9AO4}9O5exOe* z5(}j`3;d?p&7#79%TJ7KNN=(;%RJXcNea_VQJ3I}=Ca67gZGZR>5I;~`7HJ$xJ|uv zFXSX%EZcO+-KSXkG$bn#b4GFvUWy{knO$#IU#bD zbfFL7>(Kr|-8L;l-5prkuB<*v%SFjU`_J4+GsTSy!yv6Hovn>CQ|Aj54lx`L^0@A9 zGpk?T8$HK1Z1od=QYghM4RxX&He#cDn)N%UYxHb*>;l^F)ep)DP6HUaHts{Q@E zo8znQ@uoZcrf;}==yQt7cD^rxy3LRZ*F+wEGrn#G?Abn%a0#z`f8o0*@=|gB%iL{f z-rd-A)_S8HcW212Xlr2a$M9R@xlviHW^puq^PkiAAr-ou^#;!7sy6?tR)QispbF-5 zdDb+d+a0b$B21k;U#Q}pDR6_`=mb?vamiN|LprW~V@SiDr;puZiuNiM3h7S?EXbf_ zHuv$QXh<;lcl;b-@jDTMh7kTxmxH$Cp%>6+9O5zDi~1QUe-j7^-Mip2a8nctFXJx;lp-kdcmP~}Z-EEhNYK$IyQ&EvX)rmO zTwYzi;R+L^ZAH>t8m?8g{WaamcOK;P$(SQw8C0-J6hV=`dVfcD_ERQNBlRRfNRxKG zk~!8#Cpli%3XABkI}kyw>^MFcqGRX8IH|e@-n=IzX20l1Bn8h3bg*$!&NDd)Oar6G z&0jFV9JAofD~#5nQ>{>aBF!{kTCt}RHVNeXLKot2iPHpq`0=}Ld2=Cuf}IVC4o7|c zEr||rc7wQ!W*k$qUru1%2^WAvS5h`OqI?oKg@G7x+N>UfQy`rtR)BgdxMwGs8t(yh zY7eez*{La|Q@6$-{+7pW1gCp$e%(fr1sbgx$1gc;ED+ckOpHs=1!U6YKi*TXiy|fx zL~;nlt@8q6h91B#ze~-WPm!Jv@4;B*>((~jqI0mwNj@ezJBkE0)COu71A40U< zF;XQXbGF@b?NZuBvjivo_6mzC+6E-8CPDkHdL(ax{s)010Y9}P_%Bt@^MVIT zB;BxsdVp2Q*|en=d86B4!g8*|u*fS}{`t82WdT6X`B7f$UKEkAi^D{fJLw+Y^GD;@ z5Kq5ND8%-I*;WdA<*0(#&irU6u@@rm`IvNGgV7E+nTx12D|3)v8SA&?hD<(j$F;}P zp9dqtNQWXLLFBr9WtK`;-bk2}s2?qOF1M`na6n@Z{2i`V(8c#x7*}%FVkL=aLYRTY z^hU=8lIPAzER>bpB$r>e+lW^B9LeP)3y{|;s?-$LIyU4=>r@LRFwBqvTt7LHmFt{= z1ZmDh|5Q`v5~<=KBu-gQ-5l~P5JML`@LD5@%p5Mwv_E)AKvLsUIAXw+6qd>Mbl-zU z9q5ezI2&{?P)=k@9OcL@nZyTU*}Sg>`BCOmg$C}98{U`h`n-qZ0S>F=|F(Yyh%nBy zzaZ+}6p_q4fIJCiJZuFm#k!Pd6DqFH;LT=hD$9ctVW6e;O4C3&Hc{5ws z54V6)k&2_qF`*H1#5KxtH_?mvt}iUy*uY1KqZHx7f5epxM&2zZpt(lHX&&V%3jI;Z zXBvvUUN&R{byS>E%+)e3M1DEWKyJ6LEd7@^cRPlP@~OX?*N`;7W_qo`zEmKD5hw_f z;@V2H+-2kk4Ar&uT~sNyid;nM7OE#z+xe^s?M-!D+4Cp?*JO7|3UBuD^bT7%qO1=ae>k0n=H zO}B*YFIt& zs+jnWtiJ)Iob`3;)Mrw%>Aa70UBaS`=E)MD(=PNWtuvf8`7*h@yvy3ZIcMR~GZe2? zneBw6Qo_7snMtQ@#PmmWiR?eALz91aOfDr*;Mf}Gzz(>Ys)-R6JNjUmuldF!G9AT5OA~%4m%&cA$&+YNnEG0z5Ro@)_p(fyjCNK zK;-awa6|)NXhh(3!Q?(pNY}}n##QJ`%wx-Sr#Eyn6NUFmWuIjo_^J<{FIon-wTod6 ztJ^AV@WiGGtg|Nq|NYjC4RWX!Sw%r{~>^L$QpqH=bv+) zDxPLIQz33f?hQH(jVJSkaCl3P8>UGN8Ro|`@c_hZGdVx(gD4~8fRldCiyFo3%zJdU zTqticuTB~xOAqHjROkJ`YPuS`H}sY@sSLdb(EP9!t;X)5?x}HI5FmaHg^&yCMbOS2 z5Jc)hJ!}?_W$7%8$*LK)6hogMoHiy9z!!l! zwp~D4C(~&pD!z$~XiyJ*ooawfO&Qe4nYGPueP^921IPOTL?J$nkQ(M0HOb zxf%3n#n!TyL7^ijvFQU!->zZh7GFegvcju|S;9sz@k{v037cruDhv2{YAgSu$WF$C zR8)0eqe=tnYE<^+GWzOXo`=Yu@5r=tE@?()v-}69f~x?P{!oLM%u^QKn8x0a z2o{h!8NA{|yuA9?6|Xm)ru(2p|3HsGx6WqOK5q!VeR_49c<{(yK~(O1iGX4F@$uPuuJ+AoBz@T(bJ65ONML_rZ6+Ce^$RePilyJi<) zpQJMIY1}4F0H{;&nCff(t^rtG3Qz-6qk&pvXmFvo3M9~}`!%5=jY)M_S<@0cG`U4s ztM5gEXl0@w<7HyGMY%>uu~uMvuZ+$i=)8a2rs8V!jQ7bpwa#q_!#|`F7t1`s-!`Uq2O#aYW>_&FW-y#Ed!%aUU^9#=}T*9nff?j$MYr}2Yoq-S_ ze@H%FOc;V>%+KkPK=&OgQ_M#1-TBP|7G^*bWk3V|+kgguW(nuA+j;Z~0S2ZE@{9*4 zK>y@$=jE9Jjl~00fZdY^p=7TCSH}saM2n@=>8I!951-39Hp71f6!KLt-KFvA(s^yn zQ{#q0IDPzd5nef-6Eh7Ka`BG++Fi-mphzHfXcpR}; zbeqQGPk;8UH#wm5Fp;$3;fGIgnI*#e79np1idQvv#Hw))fLjO>P{$!6xlZ{EZ?oHK zmyNMWrJ1scmXXk`#tqcpK8NDPKgBg3#V&+IWj-k&a~^%8EFq*qy&eLc&A?!#37_z7 z5gX1}%Orr@m=vVv_a%~u{Pvd#sRQLBFdpS^2-VN}9)%uayYAS^=`(P0%QlS9M0UZo zn1%{swZ;rzK=jUV=8WXwg_uU`1c3uvktY#dmtoRaHU7tkG@HiT3&x2q$v~ckQPUfC z*qICj|FjN_-g)iyp&fCXU+3?x_%Bm#9*dP*sC}@Z9tYx~jFlf{7<5fD>~7?inHdZ? z=%cP#Wz3YJD>47+Q9*kG>%Al@-AY4l^t&6fX_Sn>-vX;b6Uc@xqiN8$UZ8e|MM{0A zHf0N}(XRdo3%OLyS$YdSeau-x3(Ka7T)y$@O8MMJy$shBzCeS^!3GcQqUeuOm%o^5 zS+%)%OigP^KXgh*sFBSpR;fHTW)p_h^gB{G87Qo=CfV<{j9Qse|5UrYwnY#!=JBmj zsWrF(ty<`t`@Q{CwZzodon7AmdQQ}z)~_xi`SiGi9Na;_seZIl+B{i!fd>pQ)*szR zy2P#GdXar$uNT-O%$`sb;ug1r?s1~FNO~Fs;Lbk4O&laR(h^LSX}}*`&yA|*xW*n` ztLJvzCK?xCQ8^Y#J1o3?Kk*IsFwyjksob zB&z8_F(%+aqNOfwk?r{>btK&XW5wssXQLN3;dbwVkpww7oV1;&?y=94&4=x=ps)}F z-eo(KnTK*J8Wq}VnI1yV#6-al-)B*B7sdK)&Yve1b0LB=!azTVii`zha>07D>dD;Y zS*|7C$fo1ifpJd5gP}>F?g-&mYmP44yZ6RshBVi7Oh)qH0GH~8|I<~IS1$r2o#KBC; z{Vq)X=PXD8J)M#UL9Nhhy`Cf}Qx+EqnV|i15lh zqs+90cE)~s9s4eW%#E{+KcJ>)T1TdY<_5+j)G2}6R}2%F6SBfcUDSw#DYv9koOr3$ zDD6?S3??mn9Q_!~NFb5BQVG_kz~f@56gN@Q38FEY1JYv#3G7t9t80H!>WVT|;B6JZ zA3CECR4os>*oUIqbfwpt8@Gk;k?K$R-=xPp8uW-{CR0R`YzH+kAL|kPu^Z=n)bD7MDN}p)qqGO4R!wi$@YE;)vv=6a$3O?s9>@e4wqr(=S8vBO z%*92DMeIXn*}kM7;?>Q`&gq;Dp=+grY?VQp-S_!KJ1b zDhkSz%p);qCZ^P|s#+9&hk#*H`h>{#s+BRK=?%9U>mQ3;sO=7lkUh}!hSlfF(Md>K zNIPf(6C+;uevVbyxroTtA48pPwV)^36)^*-Q-{XZPJc|FQrBLswC}!y6`d<#$Hkm_ z(1ZhCKGzkGF+Kiz0DpyE{wg`cEs`V3GUo}#9^U|o4fH^%#y^v;u(#!VAQ{tNjqmso z3vT?SRmT-NnGLpXmRlUqfAPnJq(8TE_zkK6(0~I?6oyzaM|Pn4BqscGEF`kaE=4V) zd2w~s0uUy)upQHqhd*DR%GdRI9>h+kj`BbJX60i4)j6gj>C&{)qs_p|i@GwE>Svsm z<(FZk^UkH4CTOb`3-NN+GPA%txz#Z-)^MBlK!PAs-S~K@^!=UP;)zTorVOz$=@~(P z+opk03v~@NnuFy$%@Qq2@M)P)9`Ncq1bEC~clV z;^-U?9)Q-W@UGz z)o4W}>8T!ycKj1VGUM-Hmr?^37l*r;lIZHkQOa*K=Py^i`9&c-#VOwIyN}gboFATG zZDTgyq=~jlvdZBAdDseKH#tb#L@&{{C`OSWZDG40&G=)yqf^z wg#R~DY{9|6+Wspv|9>l>et}w>078JWTF^riKoqcF2jXr9P(lkg{|5#8KT6b1-~a#s delta 10301 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 z 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 mM?(K+6=CIIu2!HBkg5vo-U<{2npT5bTY;1?y>actionSave_all->setActionGroup(saveGroup); QActionGroup* DepthGroup = new QActionGroup(this); - ui->actionNo_Deep_Search->setActionGroup(DepthGroup); - ui->actionNormal_Deep_Search->setActionGroup(DepthGroup); - ui->actionAggressive_Deep_Search->setActionGroup(DepthGroup); + ui->actionQuickDecode->setActionGroup(DepthGroup); + ui->actionMediumDecode->setActionGroup(DepthGroup); + ui->actionDeepestDecode->setActionGroup(DepthGroup); QButtonGroup* txMsgButtonGroup = new QButtonGroup; txMsgButtonGroup->addButton(ui->txrb1,1); @@ -113,6 +113,7 @@ MainWindow::MainWindow(QWidget *parent) : m_NB=false; m_mode="JT9-1"; m_TRperiod=60; + decodeBusy(false); ui->xThermo->setFillBrush(Qt::green); @@ -193,10 +194,6 @@ MainWindow::~MainWindow() soundOutThread.quitExecution=true; soundOutThread.wait(3000); } - if(!m_decoderBusy) { - QFile lockFile(m_appDir + "/.lock"); - lockFile.remove(); - } delete ui; } @@ -307,9 +304,9 @@ void MainWindow::readSettings() on_actionLinrad_triggered(); ui->actionLinrad->setChecked(true); } - if(m_ndepth==0) ui->actionNo_Deep_Search->setChecked(true); - if(m_ndepth==1) ui->actionNormal_Deep_Search->setChecked(true); - if(m_ndepth==2) ui->actionAggressive_Deep_Search->setChecked(true); + if(m_ndepth==1) ui->actionQuickDecode->setChecked(true); + if(m_ndepth==2) ui->actionMediumDecode->setChecked(true); + if(m_ndepth==3) ui->actionDeepestDecode->setChecked(true); } //-------------------------------------------------------------- dataSink() @@ -780,21 +777,6 @@ void MainWindow::on_actionNo_shorthands_if_Tx1_triggered() stub(); } -void MainWindow::on_actionNo_Deep_Search_triggered() //No Deep Search -{ - m_ndepth=0; -} - -void MainWindow::on_actionNormal_Deep_Search_triggered() //Normal DS -{ - m_ndepth=1; -} - -void MainWindow::on_actionAggressive_Deep_Search_triggered() //Aggressive DS -{ - m_ndepth=2; -} - void MainWindow::on_actionNone_triggered() //Save None { m_saveSynced=false; @@ -880,7 +862,8 @@ void MainWindow::decode() //decode() jt9com_.ntol=m_tol; if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to wsjtx_rx.log m_nutc0=jt9com_.nutc; - *future3 = QtConcurrent::run(decoder_, &m_TRperiod, &m_RxLog, &c0[0]); + *future3 = QtConcurrent::run(decoder_, &m_TRperiod, &m_ndepth, + &m_RxLog, &c0[0]); watcher3->setFuture(*future3); } @@ -1560,3 +1543,21 @@ void MainWindow::on_pbTxFreq_clicked() m_txFreq=ntx; ui->TxFreqSpinBox->setValue(ntx); } + +void MainWindow::on_actionQuickDecode_triggered() +{ + m_ndepth=1; + ui->actionQuickDecode->setChecked(true); +} + +void MainWindow::on_actionMediumDecode_triggered() +{ + m_ndepth=2; + ui->actionMediumDecode->setChecked(true); +} + +void MainWindow::on_actionDeepestDecode_triggered() +{ + m_ndepth=3; + ui->actionDeepestDecode->setChecked(true); +} diff --git a/mainwindow.h b/mainwindow.h index 1748c5fd6..3832792d1 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -68,9 +68,6 @@ private slots: void on_actionDelete_all_wav_files_in_SaveDir_triggered(); void on_actionF4_sets_Tx6_triggered(); void on_actionNo_shorthands_if_Tx1_triggered(); - void on_actionNo_Deep_Search_triggered(); - void on_actionNormal_Deep_Search_triggered(); - void on_actionAggressive_Deep_Search_triggered(); void on_actionNone_triggered(); void on_actionSave_all_triggered(); void on_actionKeyboard_shortcuts_triggered(); @@ -113,6 +110,12 @@ private slots: void on_actionSave_decoded_triggered(); + void on_actionQuickDecode_triggered(); + + void on_actionMediumDecode_triggered(); + + void on_actionDeepestDecode_triggered(); + private: Ui::MainWindow *ui; qint32 m_nDevIn; @@ -232,7 +235,7 @@ void symspec_(int* k, int* ntrperiod, int* nsps, int* nb, int* m_NBslider, void genjt9_(char* msg, char* msgsent, int itone[], int len1, int len2); -void decoder_(int* ntrperiod, int* mRxLog, float c0[]); +void decoder_(int* ntrperiod, int* ndepth, int* mRxLog, float c0[]); } #endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui index 097e4074f..3b88f6b7b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1179,7 +1179,9 @@ p, li { white-space: pre-wrap; } Decode - + + + @@ -1350,31 +1352,15 @@ p, li { white-space: pre-wrap; } No shorthand decodes if Tx1 - + true - true + false - TBD... - - - - - true - - - Normal Deep Search - - - - - true - - - Aggressive Deep Search + Quick @@ -1606,6 +1592,25 @@ p, li { white-space: pre-wrap; } Save decoded + + + true + + + true + + + Medium + + + + + true + + + Deepest + + diff --git a/wsjtx.iss b/wsjtx.iss index d182f2671..74487988a 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 0.2 r2705 +AppVerName=wsjtx Version 0.2 r2706 AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx DefaultGroupName=wsjtx diff --git a/wsjtx.pro b/wsjtx.pro index 2e502dd54..ebfb845b5 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -38,7 +38,7 @@ SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \ displaytext.cpp getdev.cpp win32 { -SOURCES += killbyname.cpp +SOURCES += } HEADERS += mainwindow.h plotter.h soundin.h soundout.h \