From 2eb8abeb005f97da2e961867540eac2eb77ddcaf Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 27 Jun 2021 11:42:27 +0200 Subject: [PATCH] Scope GUI: amplitude and offset reset buttons. Fixes and updated documentation --- doc/img/ChAnalyzerNG_plugin_ampOffset.png | Bin 0 -> 5329 bytes doc/img/ChAnalyzerNG_plugin_ampOffset.xcf | Bin 0 -> 19714 bytes doc/img/ChAnalyzerNG_plugin_ampScale.png | Bin 0 -> 6030 bytes doc/img/ChAnalyzerNG_plugin_ampScale.xcf | Bin 0 -> 22467 bytes plugins/channelrx/chanalyzer/readme.md | 77 +++++++++++++++++----- sdrgui/gui/glscopegui.cpp | 24 ++++++- sdrgui/gui/glscopegui.h | 2 + sdrgui/gui/glscopegui.ui | 26 ++++++-- 8 files changed, 103 insertions(+), 26 deletions(-) create mode 100644 doc/img/ChAnalyzerNG_plugin_ampOffset.png create mode 100644 doc/img/ChAnalyzerNG_plugin_ampOffset.xcf create mode 100644 doc/img/ChAnalyzerNG_plugin_ampScale.png create mode 100644 doc/img/ChAnalyzerNG_plugin_ampScale.xcf diff --git a/doc/img/ChAnalyzerNG_plugin_ampOffset.png b/doc/img/ChAnalyzerNG_plugin_ampOffset.png new file mode 100644 index 0000000000000000000000000000000000000000..e07cd277b1d880912d8025c2d7f6ab4c9bccaf4b GIT binary patch literal 5329 zcma)A2QXaS+b4qP2@*9r(M!}-qqk_$qprlVVG+Hqwt{F8y$6YIwXj%yU(pGoMOh_E zqIaTwH}AavnRov4eKX&gx%b>T=XuWaoO7Obf6@B7>SV<9#5g!OWSSZ(&w&0Ac+&0= z0Pl_@m71|`aAV4g5`+ZfiX@{)Vs_3G8n;ita; z`Wr8GzEa8k=U&21M=Wq$~NN19*`t%HY*F#T5e;4r! zyOA6r#RHtSSB`Ks3{CqO78mc*^68&6_n^abTCW0%Ca@Hf6Ye8~b;(u0wGh~8tE&J# z(9V_7!9YjkreO};lpy<`2iNzLf;TWo=&7lrO1MhEK*S^^8yLM&-Qvd3`B*x5n;KC33duD# zi}dpQDko^Ss;Of80bh$pAV`BpXS`?#Gq0faLOY9+1)6kpA^nK3kx24%Z7m6Vb+vPK z1tlt{+aj>9l-Ig z1pto!OaOFIx}*p9R1(_w{5MUIF~j~2HzURdvug*t8j2{Cm;CR<=d$)lwfM&pHl%lS@CE}r;v6^#`p(#W&{nId@ z>U+?ac?o=`46>vzq3mR&^w}_kTyR7%oT_b_Dqz<6vEq) zfbk|K=|E@5-IjCkYUIGC%gZk(4K%jcP%8YIbP!J35X@jPD|^{Vjco221udF7POCpk zN_A2c$y@%RuH)_oaK)gByqQ8qyt{Uk^{q%eT*KSjsR)WX3;b$mAoEooCy2;jt%7AY z-&H)Id_PSsXhBXa4PedKvqY;de(+AP%XK7jKpsojr@42CX2mcC%vxT?$1M9;=A?=< zIk7F4E;ZXwsEY9Z(Xha3yy=yLpVyXaxqVcBN4Y?33*W<#X7*>i+UfW>%FcT$S@{e2 zRW0|?vwp`^n(V)3Hy(L?R3$I@mT^%W7GT?5Xsf@} zhs8K;u6QUs<1Ek!z}K16-HFAB~4@3ph6BShqtA!bl4}beqTwY z>CXE|FJ?VSAKdpbj$t$d#2zj_wAFkS&~mOcTUdz4DSTZla$-;SVX3!0tYXu!S(aw+ z7xhirXNY#Xs-;xpni%^|Ly~k?7^pj>Aav?shw*6FD48y=#6auc@&{Y@QA6UY*00{` z4s^yCjAaV^?Eu9ySG^_K4Wo)|O>K^KD)7gmBW|Leh_8?)(;07{p3dIm2?DbrmfNbCFBBX-n* z1qqtskY3JTM$9HrxTnldGN4f!wdh6b3(&JU8><63an9JX(qe?A;n(;q~RbwwJTR!%G-DG)o1;;Tu zW~=JR6?}tTplr(Vvx`BPTeeJU;W^wm$6s7k&r`%UcBD<&vWSbPTwVr#iKSCEF?o<# zWMFEl4u$drobG(8t$i=*Fnl{ax0hq^o_j5Cc;V`#buczj+45^XHe5Gka?&I-OF8e_ zg8zY$akp(07UNnsqoJqg&>4oGbHWY+(V^#u7dyiUcRd<2;i2=hiFk(<-b5)!cQDh3AkY=W=EEgGCz<>YeK)*z1`KW^M@ zyXYMr{<3?za;UoacmdnGFj-x{GUA?@)5}OsDAcld%cT5%)zrY-`+VFyJVcw~nME}( z`zQ|%4)m!bPz(MsdJ0!!KMn*5jl}hBY_KaQ6H`+!P_z5KvW}S#OuaO-hQ5U1lQ=@5 ztatBx;3nouihlEkpscK{aV^tH-#7&jPmY?68+H6xS{gk!XZePLSyxAg%)09IK*H|w z>DkhV?Rv1%JQ0xxTfot%`b@JIA2a-nmFki1j|_)g@b%?6xOHs@z5B(kM%Z;hc5Hmy zybeNU6LfrkyjXA78Bo;8fI(ATvcAGns2aFQ=M3h^ zq>ad5kg6IqUY*RAmX)yq=eQ{?ARsWkePYYd$!RLcbSd}J8bA0_b<0?BSst|RKbb9Z zV*S$&RG;uM+(|iAu&iwC+tJk)xo&Y%C>|jJW^UYR%UecVT)cC&zP?^ga98l-Qu5$- zm4UH%k#3!Zg@y8)8Aq}A85z-2n`8vf4U%p9Hcv19IK$fleL&Nm6~!s97Hgrz< z<6^f$pH#Qa?Tb3PxD+)tfoP9TSWq_|ey!F7Wb`Vks@SllBRwIwcy8!ENMI=bh9-%C8b*u8%X62T92zN_K}Jp zUl&7HRPaN74RR$B)q#%4gyi!mipMq8)YPi)qgPf@@x=?l5-($ha(O5@?@9IP)2BvD zLBQ}v#o_=nc~>>l79>*#8Cs4JYP0?NK@qU9(A9yo7xmB4R`PtO2U=^%$;pjPlXKJ4 zz0p*Udi(o-ePgREdsQ5?WA+%O0E9xpw9T>82{D#6g**hYN5DwtiD7x}P8e~yi*wBf zZmro;n-Xh@dEes+Q@`u;^`^sN8Nk~r%xZ3h%+xs~WoGu58J8=yttIKngXbDwS6HD_ zpRjaj3$-E!R*9Qhv~$L>VH25O09s|2ydel?)g3I6weqVr8N2H+k}EgoyAqf4YjB$r z*7N@SGP2ulsW*{*9u5J|TrHR5u7;AW&Xzn;|i}#jyK(9>4oQovjPPC+N8qqdQ z&CQwHvnWx&gO|U4{gO83QHq$ct64m~n5hOU3lB#7qKrJX*W@>}iZ-SF{QMj<)nMDJ zWc|7C-z!;LGogKU(`?VH=POWxYPp#Dwm~;S9m6es9{+|oD z(}y7Mlalr?t}33_6Bm!u1zH=al-8*SCcEq46$Jnn7r9 zRh(9smJ~>jKw4`?`VhHau#nPBymB4+nF5AWvJW~8EHTT>naX+?RJCja7RbZR{h_-0 z-PqVOBV+sFY!JV7OFE}^YA=r$sRu}{t1^P-nss;2XH{u)bNKQMwyN7pP_55-m<{sq z-EBRU0?y~FH&xf~5?Kko{p z0}uE0E$uB~ta4=n&xAoB(AM{QK0(YD&)6O{l*os19>wdHf-vfugC(%Zy>w*{@4S0( z6V(O=)mNEj(rCx;rV96D0m=e-wAnM1LC#-nxBUiggq1NN7)%hlp{y6*<*NzA`ZjqK zBS4ed>xY##?YTY7!Px+hmX=l+nXP=D&@Ytpm;R9R0xOqdzI(rs8?A<}IxN#wx^)x} zrT_XhQ4X9*2c#~an;7lAZ8uYE&#G6vDu%w{mLco5Pqe_6WH00lqiiDR7H3`C?MDk# zY3h+0o8`EN7igeTl3Q@Mup~h7N6lTp{3_cKeiND+%wvA$0jR#Z;-x&wQ}{|7y>NRw zUm!vr9c-<&#+^KvSP~HPHBg=zs6+CLdYWLwmp)Mqja(F@XW(Fp!-9OuwcDhCVLztg zdaAMU^YzD4;WP_4)vLx_t9=?*!ig)1T zlBK;hWYk=Pt~M0!&)Q3`+U{wX2EwngnT$j zP!2kc-}NfzkG>9Yb#dwC4ql!g?)$d_RV^_INohp|sr*d`9)%~dM+wxa!DasUl_I(C zSxW~+s^`~2(ajf?13jN7bigRnqsb#FIUOI5nrG6n4NiIy7F?Jw3LRTEox_-D#y^qp z!LFPW5Mcb4qaUR!1j_^N{4`HKCxV3L;AmVg^17Au#rI6Dv|A1L7NzN0<4%8v?mA@M zS^wP9`kZ=bd@HvIO@t<1iVW|uUAgI+tYYmZ7Ih72LOp4~%M}WdfeUy+MipIL1ijHY zX*O_>8S}|`AStta_9yMMTf)xM)r;?1_2iC?(!4yU5;+En!catG1yaiqlf>CkO~UF0 z->@xIU*@O$W+G=7zl!+!-TTp_F@ij!IBa4PYHF2zZTVR%@$Fk;pf$^$?qOgMGGOM{uV8$_+xZi1qGsdO! z_QHxsK)`;nBb1auA{HnLh3)&PfwGlB(uMRqSV_lW{HMB-Bo2Xd!v+jJvX0sIw(;y^ z)Ei&P-mM{=rN@+QattoZG9^R;`#PBO7+Ko))u;ZXEzIn{k*|A0?(;p<(a>1jHxB!% zp6lC@RNj@7MN-FP&fY4VHvLvzQKy~@EC3!HjWG8tEGda9C@9!taOlczD3a`|fYNt& zcXu`i7d%Z!vWsAj4Yert3_{itq+V%u@l(bE1#f-5_)<}i`H4FB8Ih$Z{g~ks;}6LE zZRx}D_D!Lw4Au5=c?mBzorJ@E8d!qaBk&GhkhoAv;0_Y8pg`ooyfNTc3j8HTAtZT= zVV>_aka}I&A$IoGyrcWRo~cPQXw0QbrqVi{-16kd+l^3_qqrQR$KPDK0G4ZA{|J&l z@XG%Qmi%ktAG&|RFn>UmfAE?A9fkqWmj7Ddzj2)NJO9RY{yz(HB;OFeAHGMejUv4V QAX_+^s=6vjCEKw70rVYG&Hw-a literal 0 HcmV?d00001 diff --git a/doc/img/ChAnalyzerNG_plugin_ampOffset.xcf b/doc/img/ChAnalyzerNG_plugin_ampOffset.xcf new file mode 100644 index 0000000000000000000000000000000000000000..907eb4ac9c8c695f8ebebeb9ea0d5feb707651c9 GIT binary patch literal 19714 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 literal 0 HcmV?d00001 diff --git a/doc/img/ChAnalyzerNG_plugin_ampScale.png b/doc/img/ChAnalyzerNG_plugin_ampScale.png new file mode 100644 index 0000000000000000000000000000000000000000..9e5eafb9fcad76bb0973b7d899c173d903a548c7 GIT binary patch literal 6030 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 E0ir;W!TW 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 Z*~0ERr&Pg>x)onRC0VvpwCnQ@{U06oPMrV% literal 0 HcmV?d00001 diff --git a/plugins/channelrx/chanalyzer/readme.md b/plugins/channelrx/chanalyzer/readme.md index e7c994994..954f0e15b 100644 --- a/plugins/channelrx/chanalyzer/readme.md +++ b/plugins/channelrx/chanalyzer/readme.md @@ -312,31 +312,74 @@ This is for future use when more than one incoming complex signals can be applie

6. Amplitude adjustment

-This slider lets you adjust the amplitude scale. The full scale value appears on the left of the slider. The unit depends on the projection. +The amplitude range (vertical scale) can be set to any value from 1e-10 to 9.999e+10. Values are entered as mantissa (6.3 and 6.4) and exponent (6.5) values. + +I/Q signal range is +/-1 however values larger than 1 are accomodated for the general usage of the scope in other plugins. + +When displayed signal can be negative (+/- scale) the range is -range to +range. When displayed signal is positive (ex: magnitudes) the range is 0 to 2×range. + +![Channel Analyzer NG plugin amplitude scale control](../../../doc/img/ChAnalyzerNG_plugin_ampScale.png) + +

6.1. Amplitude scale reset

+ +Push this button to reset amplitude scale to 1. + +

6.2. Mantissa display

+ +The amplitude range is M×10E. This displays the M value. + +

6.3 Mantissa fine control

+ +This slider sets the decimal digits of the mantissa from .000 to .999 + +

6.4 Mantissa coarse control

+ +This dial button sets the integer part of the mantissa from 1 to 9. + +

6.5 Exponent control

+ +This slider sets the exponent from -10 to +10. The value is displayed at the left of the slider in exponent notation. + +

6.6 Unit multiplier on vertical scale

+ +This displays the unit multiplier for values on the vertical scale of the display. + + - **p**: pico (×10-12) + - **n**: nano (×10-9) + - **μ**: micro (×10-6) + - **m**: milli (×10-3) + - **-**: none (×1) + - **k**: kilo (×103) + - **M**: mega (×106) + - **G**: giga (×109)

7. Offset adjustment

-This pair of sliders let you offset the trace vertically. The offset value from reference appears on the left of the slider. The reference is either: +The amplitude range can be offset by any value from -5×10-10 to 5×1010. - - central zero value for Real, Imag, Phi and dPhi projections - - bottom zero value for MagLin projection - - bottom -200 dB value for MagDB projection +I/Q signal range is +/-1 however values larger than 1 are accomodated for the general usage of the scope in other plugins. -The top slider is a coarse adjustment. Each step moves the trace by an amount that depends on the projection type: +![Channel Analyzer NG plugin amplitude offset control](../../../doc/img/ChAnalyzerNG_plugin_ampOffset.png) - - Real, Imag: 0.01 - - Mag: 0.005 - - MagSq: 0.005 - - MagDB: 1 dB - - Phi, dPhi: 0.01 +

7.1. Amplitude offset reset

-The bottom slider is a fine adjustment. Each step moves the trace by an amount that depends on the projection type: +Push this button to reset amplitude offset to 0. - - Real, Imag: 50.0E-6 - - Mag: 25.0sE-6 - - MagSq: 25.0sE-6 - - MagDB: 0.01 dB - - Phi, dPhi: 50.0E-6 +

7.2. Mantissa display

+ +The amplitude offset is M×10E. This displays the M value. + +

7.3 Mantissa fine control

+ +This slider sets the decimal digits of the mantissa from .000 to 0.999 and jump to next unit (so 5.000 can be reached) + +

7.4 Mantissa coarse control

+ +This dial button sets the integer part of the mantissa from -5 to 4. + +

7.5 Exponent control

+ +This slider sets the exponent from -10 to +10. The value is displayed at the left of the slider in exponent notation.

8. Trace delay adjustment

diff --git a/sdrgui/gui/glscopegui.cpp b/sdrgui/gui/glscopegui.cpp index 7d518f774..0c4ee0980 100644 --- a/sdrgui/gui/glscopegui.cpp +++ b/sdrgui/gui/glscopegui.cpp @@ -854,6 +854,16 @@ void GLScopeGUI::on_traceMode_currentIndexChanged(int index) changeCurrentTrace(); } +void GLScopeGUI::on_ampReset_clicked(bool checked) +{ + (void) checked; + ui->amp->setValue(0); + ui->ampCoarse->setValue(1); + ui->ampExp->setValue(0); + setAmpScaleDisplay(); + changeCurrentTrace(); +} + void GLScopeGUI::on_amp_valueChanged(int value) { (void) value; @@ -875,6 +885,16 @@ void GLScopeGUI::on_ampExp_valueChanged(int value) changeCurrentTrace(); } +void GLScopeGUI::on_ofsReset_clicked(bool checked) +{ + (void) checked; + ui->ofsFine->setValue(0); + ui->ofsCoarse->setValue(0); + ui->ofsExp->setValue(0); + setAmpOfsDisplay(); + changeCurrentTrace(); +} + void GLScopeGUI::on_ofsCoarse_valueChanged(int value) { (void) value; @@ -1526,12 +1546,12 @@ void GLScopeGUI::setTraceUI(const GLScopeSettings::TraceData& traceData) ui->ampExp->setValue(ampExp); setAmpScaleDisplay(); - double ofsValue = traceData.m_amp; + double ofsValue = traceData.m_ofs; int ofsExp; double ofsMant = CalcDb::frexp10(ofsValue, &ofsExp) * 10.0; int ofsCoarse = (int) ofsMant; int ofsFine = round((ofsMant - ofsCoarse) * 1000.0); - ofsExp -= 1; + ofsExp -= ofsMant == 0 ? 0 : 1; ui->ofsFine->setValue(ofsFine); ui->ofsCoarse->setValue(ofsCoarse); ui->ofsExp->setValue(ofsExp); diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h index f8494a115..c41f361da 100644 --- a/sdrgui/gui/glscopegui.h +++ b/sdrgui/gui/glscopegui.h @@ -219,9 +219,11 @@ private slots: void on_traceDown_clicked(bool checked); void on_traceStream_currentIndexChanged(int index); void on_traceMode_currentIndexChanged(int index); + void on_ampReset_clicked(bool checked); void on_amp_valueChanged(int value); void on_ampCoarse_valueChanged(int value); void on_ampExp_valueChanged(int value); + void on_ofsReset_clicked(bool checked); void on_ofsCoarse_valueChanged(int value); void on_ofsFine_valueChanged(int value); void on_ofsExp_valueChanged(int value); diff --git a/sdrgui/gui/glscopegui.ui b/sdrgui/gui/glscopegui.ui index ed12f2d8a..23f84497b 100644 --- a/sdrgui/gui/glscopegui.ui +++ b/sdrgui/gui/glscopegui.ui @@ -825,12 +825,18 @@ kS/s - + + + + 22 + 22 + + - Vertical range + Vertical range reset - A: + A @@ -952,7 +958,7 @@ kS/s - Vertical range value + Unit multiplier on vertical scale - @@ -974,12 +980,18 @@ kS/s - + + + + 22 + 22 + + - Vertical offset + Vertical offset reset - O: + O