From 2403fc93fa1bbf7b046f3ae7ac8964b6cfa5f7ae Mon Sep 17 00:00:00 2001 From: asb2m10 Date: Mon, 20 Jan 2014 00:36:42 -0500 Subject: [PATCH] Program store fix --- .../UserInterfaceState.xcuserstate | Bin 75359 -> 75363 bytes Source/DXLookNFeel.cpp | 14 +++++++------- Source/DXLookNFeel.h | 11 ++++++++--- Source/GlobalEditor.cpp | 4 ++-- Source/PluginParam.cpp | 12 ++++++++++-- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate index 33331dc7035fde326414c8b58eaa523c6bedf7ff..7d7bf609b20ac1547b7e2aac51fde86086dd7363 100644 GIT binary patch delta 8508 zcmZwBXIzpC*vIiYws)s>+Iya+?JYypR5b4!bMKWqwX94@(;N*2G;@@eyEJzyprR-U zA_xe`a0{p@Zdr}zJkRUr-Sxjd-xt3=#*!h%lCn+fR$Mr*dvf2o^A{_3uJb$h&p5{1 zYKvXig-e$&{rA0e@lv>T*u}F~&*8Ffk1pK{@%0R-e4}R+wry;zB~E1exo=9FEjE6{)j6QYSo8XH%rk z)k>1KY8ARjkE7S8H=sAHC)bAuk{akT;M-2o{nI`2fj=sd7oazx#!ySB57Zy}02%@f zg+75sL0>`NLNU-}Xeu-f`Wc!BErgastDrSd5|j+3Kv_@@lm`_^bZO>?JH7_6n8)`v5D1HNluLHVoYb6TpNpF-!$t z3SR+V4POV}0RJ0)1bz&D5q<@J4So}@2ZzFq;pT7vZV9)7yTiTVzHondF#Hkx2|NrQ z568l@;JNU8cpR-^mgx0^Ve@h>t57Rf*x72sl_tN*)_tk%(AEF_QwwoIzM191uOpq8L$) zs6pTnWJD{X4Z%im5qv}+Vh|xk{6MG>TEuSy^df`p2D=RQ80E<8oC&|8+sbvH}o-#GR!ipGo%>y7;P{*U<5U?Hwra+Ym{M>Z&YMdY*cDgVN`8I zG9sgmC`L3Rh7rq%eP`7j_#MAH@pmfkknWK0Q0~y~Fzzt#i0|~=>Ay2%tZRJR*wEP6 z7-@Xh7&Nvwb~1J~b~pAi_BM_&E;hy+4;ue4R+}s_*=VxaWShwjlienJO-`DeHaTZ< z!6eQk#U$G#$0XmR$fVe$)C6x*Z$dI5n@~*9G?R7{t?3a{lxehSm1(DGk7>W@kg3dc z)bxkxALI(;TI2@gCgc|60pwBS3FIlHF7g8MGV&_Y0BM7CMFt`tA|E5ekk64($QWcS zG6`9XtVY%%3CMaR6WNUvBYTkp$YHZ9W)L%^8OqGc%+}1o%-zh(%*V{%EYK_zZ5Cmc zW7cTaYQ{8Un{}D-&4$dT%x29N%+zK-&HkAGWxn40Z}TnY|CsME-(|kne80JYxvP1C zd6{{q`MmjWi*^g91>2&_LSP}X=&|Ux7_yLAj9QFaOj^uX%v-1|v=+aC#lR9^Ij{;? z3v2*30b7CXz%F1fZ~!Jd0e6CX!2RGM@F;i!JO!Qw&x4o1tKbdrHV6gvK||0OM1prg5WEN4fcBsh=n8s( z_d#DU01N^jf{(#4FanGOqrq4(0ek}{fjICTmR_d4@4J&U%_u+IameOfOxPT zB!Og*0@6SR$O1Va59|iTU@tfT4uf)V44eR`z*%qsRD(akKd8S@OHnIOt5NGv8&R84 z+fX}DyHWd42T?~*$5AIyXHdGRi>NE8>!@2O2nvoeK;1!^qRdeM$`WObvO_tdTu|<4 zlo!ee<&S!R3PFXUo}!+iVoRUmUz5Vx2+&g*i-aV&#F85yFOSzYNPjqkSp44ii)efs& zR(Gvztn94NR&iDdRuxtRt9q*et1&C|xb;r!L)J&EO|31ht*nEr!>q%tGp+Ni3#=*D zENiy)q_xUgV{_Q%w9Q!?(8k`z(I(2~mCYNQ?>3D#O*XwYa+^`xWwz^WH`?mjUbnqz z3)x593t-6p$hb}&1AJ14vQc0P9Tc38V)v|WWA z!LHs;Vkfne+b^|WXTQPzoc%TX8}^p=j`q&>@%C8zWc%;-jrL9UKkVo17aR^doOU?t zVBuivVDEr-h;vAA$aW}l`0CK&(BZ&xP&qDk)N$PDc*yaH<4s3|qoJdVqmQGXV~XQP z$85(s$7aVCN2#O2ams14({87|PG~(RBPU}gcPD?RK&RJEDNdv|e?>L({2RJ`=e(Id=oa3D5%ypJH_qzP$vf5>>%PE&jE>~PoE)FhEE*O_| zmrR#tmv)y9m*1|-U01rEalPVt&DGx3!_~_bv}aw|VaKJm6{MY2gWaKJ<+6eC}E3 zS?*cs$@lE@9PnD=wbpCB*I6(0Rj=z_j$U3~-d^9lYP{<1FS)<={`&jo_pR^S-p{z7 zdq4mF-2Gqo|9BgFgWi_jx!xt-rQRAJ9iOE>*L~nV2%i|Aw?0We93QbykMBRe`+X1k zdinUnKK}&peVp(Z_c-OT^s(ac)RQ|;fG4OY zRZr@lG(O$%boD%&@$$g0S(h`7q@(vu9S%Y|zj0 zpOro<58oKRBYanQd^k2dIs8||vWOKC&Jo@bz7dTPZ4q?zcJu-CA#^bM89D+@M|07< z=ZBx4et!1(v*$6-W1sV%_dOqoJQH~(@>=A}$izrYWMAY+0?1Z9(uL-|iEqk@%mDww+S2nM5UzNNneWiJ=^LpuP)7O@-tzPH6E`I&(_3t;! z->iItdgJiM=?&pc%NxquU2hM+J^J?P+ZS(R-tyk|zU@!cO}w6XGx2R=YGPU}h(~exuQo`e6gH!PrOGC)j6LG&TwwgN?(!!oI~~u*taV zxLY^~4vsUx-NBjS%y9tD5@(IG!#UzyaPBxSoDa?)_W&1y3&lOfh2x&%Uf^Eh;&HEW zi8w4S1@|78f%}LiTkNL8dxzxRJ1_CEam^Y<^_|4Cbuwk~aB z+U7K;G{3Zfw4k(yX{5A{G*%iXjhB8T{e1ex^egGt({s|x(ks%d(`(cJWUR?pm$5Np zbB1$r%%WwrXEC$b**mh2W*^T!nSCbvadr$kJ2pEZ`%Shado=q;wjz7_ z)2&a&pG-fQe*!+`eX96W^{M6){_~2@TRw05yyNrk&rzQfKVv>8e@@L=o3kTlSI*v? z133XX&vGJiB6Fg1e&?>vU7NchcT;Y9Zb5EQZgFmDt|WIf_eZWGcRKG{o&-{o=X>Y-<_F{l<+tRs^SSx_d|?5yz_!4?z^TBspr)XufKos!U=*4b z+7#LqIu^PVRu+;9n+sbD+lsap9V|Lrbgby#qQ^xsMX^N*MQ@6_i=;*JqOqchFWz55 zzdZT!>e6+ks8W|ww^Gki@6yrIg;G_iw)A(IewjrXSaz?>ri@u8F6$}lFB>X9Q+}iT zRym{`UQR9VDo69nh2@e8`wH(0-->{Wpo)fy_KJ>*&I)ejj>@Bz$16`(o~guCeyq%{ z%&E+;I$3qK>U!0!DoE9Dn`?u~&9i$FkXHa*i&a}?5&brR7&Y{k^&b2P0F0Zb#PFy!!H&Hi-UyNUcUyI*> z--O?a--|zhKa4+$KY>4qzlgt$H^HOuR(M;y1Kt_$jrYR`;)C!H@u7Guz79{tPvTXC zWrR(HT?F)A!U4iz!ZE@*!Ue)*!d1cz!YzUU!JJ@E@F3hL_!0sLL4+_u1R;{}g7A_M zN5Bv=2!(`lLKUHgfG5-wCyOo&)!Wy{)W5CIsL!o0ugBNd z*OThW^^|&6J*S>mFQ^yQOX`&kdm2tQfDQHyo(+Kw;SDbv;u~H!BsO3h&>0OM8$LDU zG~_oFHjo>}8dQz@8jm+#YJ@eKG@3P9G@=@<8l4;68a*5DH~KdEH^w)XH8wQL8Ydgo zq-CV_q`yg9NdJ&_k`9rMl1`9LlFpFMk*<+oBomS~$%W)j@*??={7Iptr=)NaniNHf zCS{Q*q%P9Wrln0An|7j`jy0WYy3lmF=~~mxCPb4_lSvb@>24FyzVX)SB5Y$difwl=r6v{GAXt(;a#>uBpt z>wK%KRonWTvYfJtvX-)*@;7BOWjEz0Qm{80p78F~G1I3x*O7Wn0Q65mj zDA5!QC7tqtl1<5>l)HT%g)Q!~5 z)UDLL)ZTRka)tHK;-lc+6d#V%FmFiCQqIy$qBc`|+LpBa-FB@F)@IUX-R9Ef-saWj)8^k6+V-?9ybawJ)fV0MrY#lS_Nnb# zTTL6jt-g)aMs8!YvD!FoU2TFkVcTHakG6T*U$oVCIrR5UH^Hyyp0zJ$J(zJb1pzJ>k|eFyy@{Ve?k-H2{MN71e5wsZ%&C*7Ow zM-QL}(L?Cr^p|uTJ(HeA|4h%L7t+h=RrDHq9i2#Tpi}8x^a1)9eS$tkpQSI*|Fr+r zzO;RL`>OUe?OWOpw4Z9f)(&e&v>UaXw41eCwcEBkv^$~OUEAH;pSKsZSGV`H%i1T~ ze=?RbRxnmG)-g6Rb})7`_Aw4H4l|B2&N6N=j2IRS6vK*P%Wz>7aFRI(Qx39ion&j=qkO4h?fTa|3e|b1QQ@ za~Jb4^BD7A<|*b`rY_Tz8N!TWeqmNJo0*-=9;S>r${c4-GG~}t=5N+wmJVwfYXxf~ zYbWa%>m2I>>oV&a>n01qGGdvqkgU6C7QnJ&d9Z?6&sbs%OzzTo#`tWJy?ktP$1^mV!0Knq|$ies`|u+}OFN^JwRZ&QqOdJI{CC=)Bzt z?Syw4bQ*P9bUJnVbUyBk?2PV=?M&!=)A_D5tuwRpW9O&NoX&<$Y3D2(y_0>2eU^Ql zZOFdM2HE%6Hf(#g2m3zTm+jAfzz$|VW5=^`>}+-syO>?du3%TQ8`w?k7B+=VW4E)r z*uCr@>^ZiQtzrM-EaI%>tl_NZY~*a_Y~}3b9Oqo(+~zNw4uPEHR;#u?>|b0#@694+TJcQIFo zyNtVnyOFz-dyIRIdx3kIdyRXOi{Kh@O}I$zT`s`2<9cudxX-vT+&Jzl?prQ~o6h~f z&E|gQ=5Y(SWn3bc#^rE%+-|Oz+sl=6$GGST?j(1HJIDRiwY+O{*Y2);T?f04bRF-~ z?Yh`?rR!SP&92*BhFxHneV2DvaMz=*Ctc6F&|Ps|ue#oLC3WGtQo72z1YJ_zTHaRP zA>J9@4W2&FkY~(8^6v6%c=kLeo(s>N=gAA?J>f<15_#`=8N83YPrO`S39pP-iRM-F zYI%4bnaAXbdBZ$8Z;Us=o8qZ?KY4%ni}_3V%lPa0+xZ9hXZTn6*ZH^j5I&r5$~Wf& zd=%e`Z^L)x`|+RhU+`b@P@!=LA?_!@zZ0KGx5LvU1ZR&ZW$NpMwgL!d7(6c`Ik1?B<^fvvz@5F`i_LS-CMf%bf4_L+zszG?KbZQx-Gk{yIs27yS=)-yZyQY zx)Zv~yBoXZ-BaDage!zwgnNYhg@=Skg(rmPg_nd^h1b!-TS7gdkq{+x6#5Du3Lgu@ zgb~6>VS@0DFiD6NrU+Ao*}^Zv8X-wY7E**XAw$R$b_>PA9$~+5Q20YQCt568C0Z-m zAlf9_D%vYLAUZ5MDmo!LDY__vicCb-A{UXn$V=oS@)w1Qo{GXnXi=0XTJ%PgD#{k2 zOGMvAbt0muQPeDI7coU_5m&?)b&Cc>KSV0=V(}93a`7thTJcu#cJVIp9`SzhLGelP zRWVF#F18lii5_<=Y?{7C#n943wyW5n;pdE#&4a&eWoMvNDe#S}43+%9H{ zJH+FoX_xVN`=pm(@e-g|SjZ)xAUzKwmG`?mHS z?K|FgvhPfvZeMuc%RXG+yS}u(%)YF?Pkr@$ls;M?qmS9w*Ei5N+$ZlF>znOgl#1TB zcpLgkzgfRUKdRrV-?rbO-?`td-?QJl->*NgKd2wwAK4$>AKOptr}ek@GyB;C%LX9$zK+!<)K($hHZxJh8>5!hC_y*495(=9WEIDHcTDv z86F#+7@iuQ9iAUnN;gUONe@boNRLbZm7bCsNiC(;Qah=m)LH5(MN3~x6Qx*biWL1` znl8&anqgxpYWFL#o= z$X(?g^84~f@+b0_@_6}cd7>OEPnLg{7s{*UczL~?ByW|s$=l@}@&UPeWY5UKk+UP0 zN3Mc?M>5MHKTRFCRZ1dR8u|s1g$6t>pj=vwzA1@iN8gCkBjg3i-M}4D>@XN3a)~$5Go{!J_UMEAyvo~bBYCpTJdwzeA0f>anfbdeX?S* zak6Q$Ws*9zZffV$?x}rK2d9Fj&{L69(NnQgQ&YdD{!IThy>!}g+I8A}+H2Zpx@Nj% znleqBX3XrIIW}`*=G4sDnb4W&nU^#1Gp}caGqRbHnIAKX*&DM)v&OT?*}Jppvjync zqS@lv(plBq(z)extLE0u-J5fp^O(Co=Q~$7N11DzYoBAz@0dS2e|-Mr{F(Wu^Re^s z^RMR<=f(3Q^JDW9^HU4A7K|567t9xcg`9=5h3bXc1;PSpfxJLjXj@<|@D_R(V=;Rf0Rp<%ayB?Ym|R0cPbAl&neNDlvkBEln^CcX`nPxnklW6&Psn}u=0`ei84YN zsf<>>RK8ZGC_gH{D$A6W%I`{ovO(FTBr9o3j#8`~QBEkQl(R~eQmg!}TBKU0TCe&? zby#&mbxL(sby0OibzOB+1yh-*P%0Odr^;L9rwUR%R6SNbRXtb5qg7Z{mMT|Op!%XJ zRaK~}RW+)56-C8TNmK)>VU=7pu9{TMsOD4}wT^m?db@g$dcXRR`ndX}`i%OV`kET1 zHdmw6R%%Y-qkv2U9}$C`&xhP18s=*kru6u(_*yw+9GYS iwp3f8t=86R3EBp2leR@m(ROQlv_q-4k1XE1So%K)lGMQf delta 8550 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 XL;r&RKZ_RqPyTuAfAW8~VetO}OKj9p diff --git a/Source/DXLookNFeel.cpp b/Source/DXLookNFeel.cpp index e14aa42..f6d8eb5 100644 --- a/Source/DXLookNFeel.cpp +++ b/Source/DXLookNFeel.cpp @@ -146,24 +146,24 @@ void AlgoDisplay::paint(Graphics &g) { String algoTxt; algoTxt << (alg+1); - g.drawText(algoTxt, 0, 0, 21, 14, Justification::left, true); + g.drawText(algoTxt, 5, 1, 21, 14, Justification::left, true); } void AlgoDisplay::drawOp(Graphics &g, int x, int y, int num, bool feedback) { String txt; txt << num; - int offx = 25; - int offy = 18; + int offx = 24; + int offy = 17; g.setColour(Colour(0xFF0FC00F)); - g.fillRect(x*offx+1, y*offy+1, offx-2, offy-1); + g.fillRect(x*offx+4, y*offy+3, offx-2, offy-1); g.setColour(Colour(0xFFFFFFFF)); - g.drawText(txt, x*offx, y*offy, offx, offy, Justification::centred, true); + g.drawText(txt, x*offx+3, y*offy+2, offx+2, offy+2, Justification::centred, true); if ( feedback ) { g.setColour(Colour(0xFFFFFFFF)); - int x1 = (x*offx) + 23; - g.drawLine(x1, y*offy+1, x1, y*offy+offy, 3); + int x1 = (x*offx) + 24; + g.drawLine(x1+1, y*offy+3, x1+1, y*offy+offy+2, 3); } } diff --git a/Source/DXLookNFeel.h b/Source/DXLookNFeel.h index 5352f35..b453fad 100644 --- a/Source/DXLookNFeel.h +++ b/Source/DXLookNFeel.h @@ -33,6 +33,14 @@ public: void paint(Graphics &g); }; +class PitchEnvDisplay : public Component { + Env env; +public: + char *pvalues; + + void paint(Graphics &g); +}; + class AlgoDisplay : public Component { void drawOp(Graphics &g, int x, int y, int num, bool feedback); @@ -44,10 +52,7 @@ public: }; class DXLookNFeel : public LookAndFeel_V3 { - public: - const Colour white; - DXLookNFeel(); }; diff --git a/Source/GlobalEditor.cpp b/Source/GlobalEditor.cpp index 356ed89..dbc5e69 100644 --- a/Source/GlobalEditor.cpp +++ b/Source/GlobalEditor.cpp @@ -240,7 +240,7 @@ void GlobalEditor::resized() lfoDelay->setBounds (672, 64, 24, 24); cutoff->setBounds (8, 40, 48, 48); reso->setBounds (64, 40, 48, 48); - algoDisplay->setBounds (416, 8, 150, 72); + algoDisplay->setBounds (408, 8, 152, 74); pitchRate2->setBounds (776, 64, 32, 24); pitchRate3->setBounds (800, 64, 32, 24); pitchRate4->setBounds (824, 64, 32, 24); @@ -465,7 +465,7 @@ BEGIN_JUCER_METADATA style="Rotary" textBoxPos="NoTextBox" textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>