From f091e976aac2790a610ae359f6bef19c983117dc Mon Sep 17 00:00:00 2001 From: esposch Date: Fri, 2 Jun 2017 18:41:32 +1000 Subject: [PATCH] Default resolution now 1440x900 --- Desktop_Interface/Labrador.pro.user | 2 +- Desktop_Interface/bin/Labrador | Bin 1914872 -> 1914872 bytes Desktop_Interface/mainwindow.o | Bin 681288 -> 681288 bytes .../ui_files_desktop/mainwindow.ui | 54 +++++++++--------- Desktop_Interface/ui_mainwindow.h | 36 ++++++------ 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Desktop_Interface/Labrador.pro.user b/Desktop_Interface/Labrador.pro.user index 2c3ffd74..df67dc20 100644 --- a/Desktop_Interface/Labrador.pro.user +++ b/Desktop_Interface/Labrador.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/Desktop_Interface/bin/Labrador b/Desktop_Interface/bin/Labrador index 0aaceb96c265a62d089afe4a32e4fe9ec8369b48..3c070179b6be46f89734cdf0496c7db7f73eefb1 100755 GIT binary patch delta 20020 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 delta 19816 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 diff --git a/Desktop_Interface/mainwindow.o b/Desktop_Interface/mainwindow.o index c020993b4221294e51811b29b6e7ed8ac06a9754..93cff8ddf9ec601e690434e29ee42195cce54579 100644 GIT binary patch delta 25013 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 delta 24795 zcmb7sd0bT0`~RHF+!;_vNd?AS7yv?LCaDRH`M9M_ znWDLXsH5fruDFAHX~~q8mX&@#WwvO)_c?cldDKsT{CvHf_c`xpJ>MD(>CJJ4XqhdsvD+jL^T}Pu5 zMZ9aM&E{%q3l)j3cDDMeUmxwaZCgaFtE76A7OS~#+9F-;s<(8Vs@@VYBpIhjk)=9W zs-wjPxk{@eiGtpbU8yBs0#=uE{s1BRp?O3^?Qd7 zNauQoL@guN+=6ragi&xQ%l#QonF$il3ih)lf*#z>I&`rh-+i# zF0KJS%;{XomDHuPnB(furI+g`^uFoR+10*_#7gX|16I>Thg z^-lbB*V2TRE_1@5g8wEIHN<$gj%toUT^*HM0Tr2_7KPW{`IMx&;ED;eB`+O-PEJkq3I4J5-|BpnL%v8iv)lWn-+V_#DPJ=%YHra}# z!dt>BG%EZ?#L&Hu!~)9OE6nutY7s@FKQ`nRs<=u#N+sXG=FL@b8ULfO(if{m=g?$~ z-Z$W6D$7O1epn^y(1bN;RalMMeYHkZrA@1aZq3{`w|hzEAzFC_3ScUVWU9PDw5F&v zVi0XwAs!1I8SpmJ@D`mbblSZ})HGZUlijqv$YW8i4D+_IY7;a{-GZ?LWevmxI=NQV z10<{!)#z-lsOd^?pa*44)hPN4(T*yt6>Saa0Lr?HVJ_M#+WFMAIdHaD)SwaTr2Ac> zx|lmA4fYowfg?o&T|Z?~usniCjH4kd3uJ)+l(HZ-hIS(N1< z@VfP4&?9-dOi?3yA!;7GSH$=;%JXIP`UcT}PMtjqlA@<0u@@aQRMlgH9iQ@!l_T8Xy7;XY`WjHqhFAghsllJ zh@D`|7ZuCB-@G8IE!q+&%KQ0HQ(5Qb`?J2tvZfmW>l$>kAduGZ&3?<7oBft$+;Z>c z^0+nVAXUsuSsA!$2R`tHknIUVHd6=4RMLp*o#9T~0Dni9b zD*RM5H8yyi0%L|^FL4Xz3R}akOW$r43C0?1v;*O9s_;HX*xHU=q9&kpk7ys3VG5Gds|Kg^Y&3Ga zsNz$m1dkXF`8=c6~%dfhkv6*2N@f!c!y|PF0Q)MKh)?$ zqMe@>v1*Xi@iQ40+buLUFwAIj6pN;QRhsh|hWG#%yUWkn=%3vfQ(|CDi9wXI0b{zo z%eU>MCvOhcQpRpEC@e3Tsgip?j+mhvMLnq${wod+S$s;~8Jmvk@4=$aIw-1z z4&)y44?=&zJyDr@7m9}Eu{Q5PhKYuMx$DY@Gk&kggFu><@49lU`GoI3q$c9?Dp5xpMms`~CKV_WSMUaQitA*tZTf z3a*xAG~GIg3Ei|E2h7dwSZtNm1RC4v&VJu|%JQuzhH4$5FRq}dfe4F(jP0}7x1MSp z^lcvvx@yghKjd3fVHr8fPUW%KST{Z;k!wt4`eA8}3kIR3)81lXH(KA8w<;dN)ksQx z8z zj?nFau_aT+MNu`W{ve@W(fvSZVR%C7HtNDiE0qS!b@iYaA}s3Y$Jv|`^r2C7>IpsGJm)-u(E)x z%y;mtIWFp|^gyU%28c^rTNy;|S)6lfLry#)8db@<#vRC$ywp`Xwi@LXV9Ch~tlx_C zlcKLEqo7kbM~rlhzPyI0?=QlM3-`p-A`f3>kPQ1CCY3?DRX*Fn#DHMtQBzw>br)Q zQPOGV`F5$_bJf#+&rv?lQHJMEr7^TDDfG*)vb5_HQPI=rC-GLKH3ClnJ2K3ke6x13s=P-{sj0q;AKvEe`-Ls0gCXJ-vLKE|ItZ3&^L0fd3U7pV&BwF~iVanF zOzO!dPs!pazKQmvGSlv8lwA)2P12}cxxeMOHuq=d#q+GGN>Y zO7Zm&%F_T@jBV!2Lf(xl$FYVPDiEq#IM#|9YEO%cMlYJOq=%1Vv=6YglWS`2a9pU! zFT}v#f<{^o!+l(1EnSP(s6}IBn@D#XYx5~Vmij;w==G76*XwER<$w|}AkBm`vL4Fx zBuM0|T*_+s$MJV#SS)R%bx`h6G#Ojom19I*$>32RtV$AH>?ALR)EFgR(Gbe>k*0ewB_b1M0F(T1$*X8hRpHX?PbSr)`Am z%6k^ip59t(;mLYNyDjeL2wW^B=V(41*)J^bSHDlYk0=+wSzbR4PmL!%n+I!2db+&H zF6pV4y%S`bo2cIgoJ*`^GTlkkvv9*ukfg5$Tu7P^wL4Ggg_7%~pO;*(W5Q(G)ly#(zUef94EJNouEndYTGqi4Ju zWZLu$4(t1F57SQ*UQk}-Cw^A@b>RwGHn^4XU#=E z1Dcsko1WEIqkZsMsDAaVUWoRRf%WxrV^;{vrAzv~S4voEP*wwD-TD9|Eix zTE%2KI8-k~J7buB8?blSe3axHr=Im5Ez1ewl`XkapBzoO@$ef$-D8(_^yn4TP|m!O?FO8*W}JnD6%JX+7dElu{T z`XWHds~a$1+2iy)bdHbH4*_nDL#_6Y*UQlUZaiwWXM%n^D;-fLU>rY9(6h3GOu4E0 zYQX=cV#pu7rWc}J@|u1guyi7*-4pejXy2Kr&wfA1v@dNkyiC$_(DqJ(lkCa*Hni7F zM!RsbUV`>tllAWaE2lhbGQB%h&v0QaOhxdwr|FB(UY0%$x?85{dFcEyO+N(K@j4=1 zeqAp^oBpHU26+DiYStTi)d>3|O|-AS3BOCy z_1PaF&vdlEO4oDHUXmg7ZNOhM1PZxqM!L{T&^*fCS+8H=C=Tm(Ed zOKRVqCG^4}KvA>hromGZ)OgkC0m*JP%xvK38D&*3T3AO?1Bp&R!g3T0LKQk;bwGLeD|>Ja8NE&jkW=cp?iqqjxh) zppeDc$Q-?|fF{%Lc+FT6WZL{b5(obMzCcY@x{x?}UjPpQ=PeXVK&)NF*Z)TM&y}LR$#g6Sxi1eg z&2|fYJ#e>M)IsslJA_{TM?$|0y!MeC+1!s&bMy`Y=Y1GtdV7_aj(PtC$)k4`xC=OU zwbb2+H?q#7cO7^Gn7c;m?!voL>9bb^nSMuOIdJ1zsa(1id80RP9r6YqTPH@FOh-ON z-ssI*kA#8y*NfdK-NKE?cqLW=~g=udWT$ z$UR%@g&UDu8QPQb!YsS;A}o={zNIb4MNrD*Gy$?qMX@UZ>sUO z)<-^9=1FUC8lId~FZq)n&i zGPMkmLzgnOsajqTWfNTa3~+x(Cv{*=vyP4vwZO$VExd8LVde4;6fcQ? zU6Re;n(7&8rq#{RENrGPO*7q+&G(w?ThdH>o1=NTxqdRuG`|I!>ssj7(oC0R^S2iI zTa!$bv_-3&p6$@LO)~9sfWG3;OD37JTB5n3rT)Vt(^s;2r=>n?vT1EAH21gCS4=kj zDx2@M*0)bK?QMw=pBsHuYf=^-IUc%|6_`&s2%7_?R3{v)1U2NexSX6W2)(Td;QW>(|aBC zqf<>AIt1~Ex^jl zJ{Z&!@VSI|vL6D((Wpa^#nT_E=SesmG)YvcZTDdsc=WZ|fI;MsXxw}qonAz$Ll;SDnX2X1DL#PyDv6jTqpvai3O6!e> zv}z8LLEkLrlWEY=pq}mgv16W-&Ko@x`x(X0DmU{Fa?+jCB#wY8IZA5Dj|_Y1Zx_six4PrsMUqXbo$8(f+GX=0A0yDyvH zmtq@rm>XQl;C2rOm-D*0ITcn5u1MAEnjKX06|A3Hp5Z6W$6|z&9Cyrn#R$)>JLVuEws?N~!`wlL zS3Qou%-?Hb64~yVhl+PR)9#sn4-+m*4b`Uz@>~zqUong2loGBF727CZ!Z8Ye6!0yj zO8AFLB~v-8BTgR8+rCSbOZb<1_*-~C!cIy`ny;&cD!vjPjRsC4Ms6|@og~@sk zYQ0L2)v8nBr_?mPu2$2KYqbocuo@4m*nKK>tn|oKy=Umd z8ujmYLQPleq1eMJK%;=Q%qmPC_xI;Ot=H&L_#~_M8hwh^;(k|Q%^y>@sJ8# z&4tIdbT=0s+ZpQg{A4{bEbbv)t)ova%Ny3=AvrBvr$-re{&gKntY&7`r)a79sJdQH zEU)+~bd1Sqy@AmO&@t@#ZA44W)YXlcJvEQ!JaB4-EJVvc5mYZ99hAJ!OuZ*<&DVRD zOS)~=6Ga`Gzgb_PHTBK)%LRt%dv8Pgw*tK<6gq8zLR+6g)vf+0tI#UXxb-&B9pw@` zfR?0xo&yj4J$Nzl^gyOYnzkJ+HG1<7wAQELWua^-^Ljh|+!onVw%tCHW0cNc-h~&n zl7E%0^^5T`Yd2nuRl5f*rMGGi)-RUgn|t;5_{`TEXN|pg6g z?HSK!w>#t4G5wK@&t?3782=|5-eQA)RF#*HZxuO^mu(}nd8|f|0jVp{l%)H)ZJii~SPF_UA*Fa_flG-&544N;Hml@Bu`Z&h( zEZ(7n+8DzpOk9c0%swONNfp%LWm-IFDBdcS|Kw8PK_f^+!+8rP<|FM*4v4X6N|Az? zOiuJ1nM|3-*ur=oV~>jAxWL3b#&3+T#s>B%-IB3ukvkFBUI*FjID(>*a0D%n#t}4v zQb5>Jo2zlDffchkT1Z85U~8C|-+v!4oZ|y!IJbSnw0>Y){U;T}5z-OOU9GXkp~+WsP*!^}P=v z=bNAK@r>sexPgp6!J@s&cs|!_s8kMd4>@GeVsfMBxXP4yoisp&!)L0iW2@jlIXK1E|0 z&z~6IrCS)Na}g77XB%)mihB zr!qBuOP|Sje(&LC{J~&a5o3v<&=^Z-=L1Z@Z!*4TJio`N6c@;QEp|ygJtCdIVbO)j zdEQSko-dF7jOXnMz8$VHp5Kc9pAo!bM-^KI=bNHAr8dV2Ie>}zefB8E_hti}O>UTp_o>Kfjil%o ztzp!=xuv3GE7Rv|{0!rhnV*}6pTCu#q)MFvN%Bc-&v?F;x-p)wr6H8vLS9~9vWC`w zhDBS<^!bLu(WHk2vzpzo4b zYAvJ`fMWyG;x3Odeh?e!H6zBaDh8hFQymD^5?`{A{~ml+=tv1MdZeu<6Z1Rn(G(7A zF`Y^!ETseqtI694HanONzhT+0Tsp2WF~4EC%lM%z?dp`>63!ctqp==|k0grFvrURu zS*x`9t;$TwhL&SF6Z4DvPR75;Vq8!$=-Mc2RMHwgcGHpOI~Wnx~9TU08oL%If%;e)S1q7B3YnV3)0cyd52rqPV% zsKy6Oi&vw7@vpLKlu)*`zD#yli(gbIN0V-WOn9g#7|&N@FS;c&9LdBy_H44Zh4^D8 z=GECmsVxwDALUD}drXVR4y96PIqG*0q{e5UE8|ny_=Zu!;~3um?J6cKehlO9>2$J#B|^&! zrtdmfnv26!t)pe8t?yF-&-Z6Pqa$uwS2HnRJg5GJ|D5ssiv9=VbxWX>PxcCg=Lb$d zgEu}V;EpCR1AYX($N1T-j-OI#Cyc|x#Qf&_1mpQ0{DJZO{r1OPO8O8k`tzZkVPd`oe`Gwr{|)LB z7y{ptVN?XyNe!6z92;R0tmGOK_&Z1jzXLB<#-;x{1-UYkHqk=k0m=@oeKQn#- zD@jF4jfZt4g-d8mZb15orvn4yhj<#}`4XGO`15Q;YZ!ll@jDs+K1=3;!PAs@OSt$( zrDXey>0V?$s*p1Q88@J83Ha_25_j}U4kXUk`e?>~zyiKQ4p=)}Ow1R=9>#ycVwW00 zapK6JzcVc!v|36anZ+zp8RaYN zI#Vv8u}|oc^hQ@psIykzKqmY;*p~5^*!Y}`=Q*V@o}WE$l2_)sl!oyII*slcO7UjB zJ|`!@Vea?8laFLPub7=?bcb0dCgv3z%=lGo3{$B{Mw`XNd<>fy&r7&NMN2x(#JplR z8NY@_3+o>k6rV5~d6B%W1rzg%^&)o<6#8W*=8NtP#`8tDhVeZ4daC$ zQmha7-?@g9vnRw2nV9F=jj|zjKF`EF*EGiSTvsxl=en8k{NCVaDn*jwZxS+EwPypl z@+a$7jNicKA(`=f9-e1BUk2mp7Q#3_WnzAc?_)e)lgB9~33rm$n3%6g%fLX^c`UoS zjOW?4pc#o+22U_CFUgyX=h=P0c%I!#^1_|%GbZNQeNN#?5Z`8Eo{UD~NtC48puiY- zGAWGb$qXg8^g5M^zhvj+A}W>Q0w(4`_ZmSjF!5K++Vor?8GdhCg>E5N+tWD*g5r3WFDcm{L7#xUwh2_+q@jKWgKg;-)Gz2cf_==lMc2JMF znHKJvCqIR|<|6v!Da!(}kJ|LIOc4iYLoaNEgLJT$r3J0;WeHu>+p!Av4uWxT3XonSF%pM7I3}O^QF`BxDdyw+Dn!T;*#g5mn>I= z^flZvl#UNasJIdM82uo1AEAmeX$0zg7~dFH5x;x|v$3B#jl`%fzk+AyuxSC`2Wjj` zW%J=kD3^GKjIvmz>*1r-YWZ@sS}nhg#+WXTMxfYNEz4!(SC!9ZW8m}ntMC~15fXTKJVV}^_>RJLpIC#Ij{n^%8tOMGycWJ6fuAEli(+fz`w>l}@se2E z+DP=L)Y{gr_zBe3+SXR$dAeTP`nYXl)j*&i7HB6G)kdHapV%Mh6aH;A)yJ~lJGcX18lt?u*vq>^fPRp zH*6*wHg6d=iyyFAJ^<%d4Y9}LU?Ql zonUQSqV7-2znnf(MmS^a4UkV6*l4!oyDUC&qtWmZDJ|_<@rxGK^cMrtyFQ=c37{3{L zRl;xjk=J8nk3n9J>i3VuzntPI1!8>4b4w~eXV{D|Y~Fal=1X6uGYy-$%7&&^#2Kow z4Vk*$;vY|ClX?1?trzP_}f}_p<`-CZsKf(CS`*?aU)Dn@-X`C96O_&W~^6mO=4Fx<#iuW^6P9`jYh{s3Qy+~mI)3U7vO zH82d*%+Kk*hP#mum^Jjd8~*_BcQ-}3dnDT@HkLT;X==q^o5W|zI7}}y5noq$T$B0# z#l(DFh1WFl^`G_KeThU-D)PtArku^OV%k2S)zhcd$LA3y`i9Sa+Lf&;L<&OGxA)@;Mc@&}yw&!~?LC!ZQl4*rXiQp3sj4><83 zQ$HI{ZYwAFX>+N}s|Gp4aTCnf`!Hf8S9t%dnZJ zY^czIBR7anIB?`X<(tmaN`s zmr$QlIs%%|k&e~{_=`q^I$3*S6mAJ!J=Z%~ac`eUAzhTtj4nziJYMMxlF-%Tj+Z)v zsVD(Dqp95!fC+dP5iprzx&q!Hw}iLI)(wz}x4QrzP)K(`F5XZA?4&;=?4{Hmfa7#s zLMh&H0bHWbC45UMiGZ7QL;{vel68uPlYeKDbuxa{>39-sHCij79v&hAO=yXPHWc0q z5KoyBo+Qy*$)-ubg-${n8r27o;_>#e&I}LZo9jd4YcLxP*lR$E0hh>IUyl?&7`@+A zkD{E`G52}sroJD78x{F=6MREh!4w1DA_quM@Qc=wj|lu&bb@uS7)p**>rg;;s`VF& zy<-lhIj>oBRO_ACiB?bS#Nb(j>DQCNO{wf;a8>zxzP1q|O~`&cxC*760zK?hF#c#& zWJpuWk*!}PSB92`-|cPN73@>pA{B;}fX0vYZf6HKrW|zW*Al6%T2djpGb+3!?mX-H@MI?A~e>_E&ddC zjmY~cMB~W0KI9#Ijax~AH$Z~F|F8iPe9u-w8QC|6bb-2aqf+-uC?n@4kg??6q%`e$ zh+P&eRB)fK;ymTc3z7U%eZJHPF*JO61aDS(*f%T3ZV8B1pd333l$jS0QdaRk$8)wQ z$L=jk!@gB&;9QmeVrf+O3elb;TSIV$pr+eU0~6Uj(Ck5OPkBwZ!^0hNZU^6)yxaZ! zoE_jVl6wdET4dh|&l!~s&;F9{ga&@a1`%e-`58)wFrOJyw@Z=U-EtM|3KiMwHiIou5e%;D~kcXTYXQTt(r3+H~YE69ETU?TSc3_p&%viBxA56Zzs-Cwms zaMlQavH=?7$bBdx0 z?>?M?Rw231gmj_W6dX*A&SBpKpM|goInN@U!g~Hmynfbjd>-bB=ah!~oHDnc$0$($ z3y{n?uO!~{NVKqlFVQ&{5c!T&kc-BC5jkP|UxYtw>5Cw-r9TfO8vF&+i^={4B#+>I z5}EH8Ap=7)VvJm1E02!EOHj)r=Ow7!mTGcA8HdVcNOH)18IteF{v}`-xxYk~*z&T6 zE&mk;H>|0Dc8o221!j15z5)&03jsogHS-VO2wA2aJIj<0FCb(X{wlaJ!=t z%H0076t=j}y!dNn?uAIE@Qu`n^_v?hTs2a-YNQ}x7}>u?=DFnjR*_x_!^ruaBHiC9 z(*C{l)ynYYUpn8zR~~sGLVcXqq(*ChKG&bcM2B3*g3TfOb!dD?Za~PeHhv#5KVUd0 z?+?n{3kVw4)<2;?!u4Wu{|MPv9{Y_D>k!-p#UxdD9QPK^qzdU`7kQH^bioDL{v>+q z$o(XGAZ4!^IiEtWCAptMZy?!w0k9t>SjgTRGF&ryqql*)vbTrqebDPq?mp-(B(DVg z>7AzmjmasY8@Zo`$_r#q223Tlg!jpw0@zM&3AnZI3;2rM67G=w832Ah^o;W2mA!uC z><3s*UI{pM`a^bz+!D@`SHjn19{|85OTs;=g5^1&LX-$4ucWGz{aFCEx`ejmme7s7 z68e&TAON!`0YjGX26-jCOZGv4#pIN*n%ok$kXOP!vOfnXA*Te4K*A03O8ArPgOO}K za!bJWdLEEQZV4{34*_f@w**w|1psDRLLIUX1w27+30MWg;A|r~CEy1;60Ui?!z#RD F{(n-9-u(ao diff --git a/Desktop_Interface/ui_files_desktop/mainwindow.ui b/Desktop_Interface/ui_files_desktop/mainwindow.ui index 94705533..8ba7fc27 100644 --- a/Desktop_Interface/ui_files_desktop/mainwindow.ui +++ b/Desktop_Interface/ui_files_desktop/mainwindow.ui @@ -9,8 +9,8 @@ 0 0 - 1152 - 1032 + 1440 + 900 @@ -48,6 +48,29 @@ + + + + + 16777215 + 48 + + + + cursorStatsLabel + + + Qt::AlignCenter + + + + + + + SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER + + + @@ -530,22 +553,6 @@ - - - - - 16777215 - 48 - - - - cursorStatsLabel - - - Qt::AlignCenter - - - @@ -737,13 +744,6 @@ - - - - SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER - - - @@ -1310,8 +1310,8 @@ 0 0 - 1152 - 22 + 1440 + 19 diff --git a/Desktop_Interface/ui_mainwindow.h b/Desktop_Interface/ui_mainwindow.h index fc78a37e..c34641f1 100644 --- a/Desktop_Interface/ui_mainwindow.h +++ b/Desktop_Interface/ui_mainwindow.h @@ -120,6 +120,8 @@ public: QHBoxLayout *horizontalLayout; QVBoxLayout *verticalLayout; QCustomPlot *scopeAxes; + QLabel *cursorStatsLabel; + functionGenControl *controller_fg; QTextEdit *debugConsole; QSlider *timeBaseSlider; QPlainTextEdit *console1; @@ -170,7 +172,6 @@ public: QDoubleSpinBox *triggerLevelValue; QCheckBox *singleShotCheckBox; QSpacerItem *verticalSpacer_3; - QLabel *cursorStatsLabel; QGroupBox *multimeterGroup; QGridLayout *gridLayout; QComboBox *multimeterModeSelect; @@ -188,7 +189,6 @@ public: QLabel *multimeterModeLabel; espoSpinBox *multimeterResistanceSelect; QSpacerItem *verticalSpacer_2; - functionGenControl *controller_fg; QHBoxLayout *horizontalLayout_5; QGroupBox *signalGenGroup_CH1; QVBoxLayout *verticalLayout_19; @@ -268,7 +268,7 @@ public: if (MainWindow->objectName().isEmpty()) MainWindow->setObjectName(QStringLiteral("MainWindow")); MainWindow->setEnabled(true); - MainWindow->resize(1152, 1032); + MainWindow->resize(1440, 900); MainWindow->setMinimumSize(QSize(1024, 768)); actionGainAuto = new QAction(MainWindow); actionGainAuto->setObjectName(QStringLiteral("actionGainAuto")); @@ -496,6 +496,18 @@ public: verticalLayout->addWidget(scopeAxes); + cursorStatsLabel = new QLabel(centralWidget); + cursorStatsLabel->setObjectName(QStringLiteral("cursorStatsLabel")); + cursorStatsLabel->setMaximumSize(QSize(16777215, 48)); + cursorStatsLabel->setAlignment(Qt::AlignCenter); + + verticalLayout->addWidget(cursorStatsLabel); + + controller_fg = new functionGenControl(centralWidget); + controller_fg->setObjectName(QStringLiteral("controller_fg")); + + verticalLayout->addWidget(controller_fg); + debugConsole = new QTextEdit(centralWidget); debugConsole->setObjectName(QStringLiteral("debugConsole")); @@ -799,13 +811,6 @@ public: verticalLayout_5->addItem(verticalSpacer_3); - cursorStatsLabel = new QLabel(centralWidget); - cursorStatsLabel->setObjectName(QStringLiteral("cursorStatsLabel")); - cursorStatsLabel->setMaximumSize(QSize(16777215, 48)); - cursorStatsLabel->setAlignment(Qt::AlignCenter); - - verticalLayout_5->addWidget(cursorStatsLabel); - multimeterGroup = new QGroupBox(centralWidget); multimeterGroup->setObjectName(QStringLiteral("multimeterGroup")); multimeterGroup->setEnabled(false); @@ -909,11 +914,6 @@ public: verticalLayout_5->addItem(verticalSpacer_2); - controller_fg = new functionGenControl(centralWidget); - controller_fg->setObjectName(QStringLiteral("controller_fg")); - - verticalLayout_5->addWidget(controller_fg); - horizontalLayout_5 = new QHBoxLayout(); horizontalLayout_5->setSpacing(6); horizontalLayout_5->setObjectName(QStringLiteral("horizontalLayout_5")); @@ -1244,7 +1244,7 @@ public: MainWindow->setCentralWidget(centralWidget); menuBar = new QMenuBar(MainWindow); menuBar->setObjectName(QStringLiteral("menuBar")); - menuBar->setGeometry(QRect(0, 0, 1152, 22)); + menuBar->setGeometry(QRect(0, 0, 1440, 19)); menuFile = new QMenu(menuBar); menuFile->setObjectName(QStringLiteral("menuFile")); menuOscilloscope_2 = new QMenu(menuBar); @@ -1550,6 +1550,8 @@ public: actionSnap_to_Cursors->setText(QApplication::translate("MainWindow", "Snap to Cursors", 0)); actionEnter_Manually->setText(QApplication::translate("MainWindow", "Enter Manually", 0)); actionTake_Snapshot->setText(QApplication::translate("MainWindow", "Take Snapshot", 0)); + cursorStatsLabel->setText(QApplication::translate("MainWindow", "cursorStatsLabel", 0)); + controller_fg->setText(QApplication::translate("MainWindow", "SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER", 0)); deviceConnected->setText(QApplication::translate("MainWindow", "Device Not Connected!", 0)); scopeGroup_CH1->setTitle(QApplication::translate("MainWindow", "Oscilloscope CH1", 0)); pausedLabeL_CH1->setText(QApplication::translate("MainWindow", "Paused", 0)); @@ -1582,7 +1584,6 @@ public: << QApplication::translate("MainWindow", "CH2 (Falling)", 0) ); singleShotCheckBox->setText(QApplication::translate("MainWindow", "Single Shot", 0)); - cursorStatsLabel->setText(QApplication::translate("MainWindow", "cursorStatsLabel", 0)); multimeterGroup->setTitle(QApplication::translate("MainWindow", "Multimeter++", 0)); multimeterModeSelect->clear(); multimeterModeSelect->insertItems(0, QStringList() @@ -1599,7 +1600,6 @@ public: multimeterResistanceLabel->setText(QApplication::translate("MainWindow", "Series Resistance", 0)); multimeterModeLabel->setText(QApplication::translate("MainWindow", "Mode", 0)); multimeterResistanceSelect->setSuffix(QApplication::translate("MainWindow", "\316\251", 0)); - controller_fg->setText(QApplication::translate("MainWindow", "SALUTON MI ESTAS FUNCTION GENERATOR CONTROLLER", 0)); signalGenGroup_CH1->setTitle(QApplication::translate("MainWindow", "Signal Gen CH1", 0)); waveformLabel_CH1->setText(QApplication::translate("MainWindow", "Waveform", 0)); frequencyLabel_CH1->setText(QApplication::translate("MainWindow", "Frequency", 0));