From 9194246abe009694c0af01f181c5685f2030f476 Mon Sep 17 00:00:00 2001 From: xiangpin Date: Wed, 2 Apr 2025 15:02:29 +0800 Subject: [PATCH 1/2] add logo --- README.Rmd | 2 ++ README.md | 9 +++++---- man/figures/aplot_logo.png | Bin 0 -> 28870 bytes 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 man/figures/aplot_logo.png diff --git a/README.Rmd b/README.Rmd index 0644dfc..0411313 100644 --- a/README.Rmd +++ b/README.Rmd @@ -10,6 +10,8 @@ html_preview: false # `aplot` for decorating a plot with associated information + + `r badger::badge_license("Artistic-2.0")` `r badger::badge_github_version("YuLab-SMU/aplot", "blue")` `r badger::badge_code_size("YuLab-SMU/aplot")` diff --git a/README.md b/README.md index 4568a47..786d35f 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ # `aplot` for decorating a plot with associated information + + [![License: Artistic-2.0](https://img.shields.io/badge/license-Artistic--2.0-blue.svg)](https://cran.r-project.org/web/licenses/Artistic-2.0) [![](https://img.shields.io/badge/devel%20version-0.2.5-blue.svg)](https://github.com/YuLab-SMU/aplot) @@ -17,10 +19,9 @@ status](https://github.com/YuLab-SMU/aplot/workflows/rworkflows/badge.svg)](http For many times, we are not just aligning plots as what ‘cowplot’ and ‘patchwork’ did. Users would like to align associated information that requires axes to be exactly matched in subplots, e.g. hierarchical -clustering with a heatmap. Inspired by the ‘Method 2’ in ‘ggtree’ (G Yu -(2018) ), ‘aplot’ provides utilities to -aligns associated subplots to a main plot at different sides (left, -right, top and bottom) with axes exactly matched. +clustering with a heatmap. This package provides utilities to aligns +associated subplots to a main plot at different sides (left, right, top +and bottom) with axes exactly matched. ## :writing_hand: Authors diff --git a/man/figures/aplot_logo.png b/man/figures/aplot_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8bf1f4a1a8369e1a2f0254a7883d3668fb25a4cc GIT binary patch literal 28870 zcmc$_Ra9QV5-#}Tgg|f)E&+lC2=4qqaCdhP?iSqL-625m;O_43?hxEC=H7>y zmzi0!0uS`=-CbSvRn=FuJ0Y^tqDTmM2p|v$N$dw$9t48K1%A2VVSy1%_r^~k&<9F0 zAt6~a0|OA~M@T|~iENx2cK_KG_hA4(nqZKuPz(*luXq%7s;Sc7{0AAb!j{1ekY7WC zS%jm7A+R+QNG*ghK8E>1VmbKHLJl?AV#*1q*{tJc+!64#yrsC0Tff@xt=W%1*gy~m z`x$i(yX(t0bu14?;^JV8K(AAUXC-!BTsuIm&o-li%6ip;ZbAEo_8A>TI?RE zeH}pACq{E4;xcNRdBc*(QEy!)Dyo&58%*n}n+M*mClX`rw2!gd$D>+am^O9iQv{lUQpl@Thj1B)Gmy#e7NfU*F(Cx#`5 zgcyKq)PWnS!LUG1Fl)HnxD^YNB z1(>4I@;@E&i=g0F2Yx1I8^A~K70fZE`Y`m%E+<14RS`i+z)=?c`lG|ACdgHP*qopV zb{41?Bu{_TWaw!<7*(jbphZSFrvT5*8yl8%g#C_(b8TR|Aek}Y3u*|QH|7ybLz|;Y&38WSI6I`EHkrOl-ci@bJ z80e#?H^MlUOf31?n7I(g9%nkRF&wu?Qg^RX^$(&loJGJ*N1)zx70iP8iP#Cn35pZi z6QO7i^=7zDWP`3I8a=W~q(z@r57K6#%|{p87S1)uGoPpq>#n2?{PWd&u6wa(NCDpt zQdLxs54QdU{s@9!H}Uks&jWvum!OP>X!odYIqAb(U|hi3rr-O3Da_&;@=@er%@_{Z z519^04v|tM=ZKeM{RR(rT6ZWfl`a)7-M^(KXX41v3RYw8u1kMFlfopoCLd<9qO9ULVMP#pv z`+utxqqF!Iif>Qd|IPRdyYzjDoIuEA()F6%4fVz35u`;fmcWvDoivj8C$WW?+K?C# z2{tOGgGw*mIGmAJocf1tK54=2k6Ljgu~CU(v1M^lacuE=F=Pqvc)cO^fu7-$q{Dbu z(y-Xs#GBaBSRPV$DJSJfdK2pYq_6Q@bay`p6Xz4}64z>3P+O~RHs%hmOPA|`dCOF*Da~5%;=s%YUFBUvWvLOxeKuigP9nb zC7vmsHiWL^OQZ2!yjHSSR4KnOf3G~TbT0Sy2SLS{a+Dlj{#p@lMduX!#6sC*@wd@f z;|o=eKUj0glxou=%t|%dS8Z4#VP%*Vj;hDytbeR>3G%ecJVoK=zRiZra{OU#KxiHE zP?{=vRLW~22k=z*Gwfdjq0qP#gG`0OSwdT?SLLhM3-8M~EG6s*SU^`u#ewvJu7Rt8 z-uPzt7ZD{9|0*aeoHSdl9OsYb`#Aez`b5Ktk|!irq@2>OlRcQeGh-&#rH&;Rrv#+V zCP!2sTFN+mdkW-OS{d_5dvLu%#wx@*#44hDt)8h3ueYpA*X~wFZ!FXs^-l;@N><89 zm`F7vF!!8MH_fv|H&(E|8d08Q?W&t}3eD>c*-qbSsb;Q3U#MLkwWn*)Xh=Fmb^r1t z_yhr0;+G|q(5)bf*>Bp9B^nbKGHqNmJZ5U5vi~xc#|=Z6HQ$5YnA~V-d+12f_}HM_ z$ZJ3Cgx=uT-2IRKAKXg+TuFtL`tl(Jw+kU0ccx1POzvAGZ5Ut>F z*N^F~b~?t9P?ErqkR7WX*UYc45I2+Pbq7SmN9f^?`{xQl38o2QcXM|gb?3ej7=TZ&WsMeCY3 za530S`mhJ$4vN5Nq`IrR9*&K$MeV1iwtKJ*)pm4cS6ObUe3_ljuD+7wtWB+!qeg_s zXlCj|H)>E&zAI_;$peFs^1sW z7x~*==xblx(neBKQ+LxO)Hf2t6I0?yzMQ>UzS*mk{Sf4j4^MaE zS+x)JEWG*ixR~ms?yd(nQ&lW9gF8)qf^dY#y>C}uv|Qc%qSC4pm8HU~<0)_{I4IoJ z`y3{bWJf=$CEdvFPVqPd9`DQSSAnWnJG(g|XxMW*?Q`ruR(WFgO!}$1%I-bAwb!U| zqLEQAW$k>Oc3uBwe5vvD>yW>npoUA!dGyQ)xg58J-H_Q~H}j?S_|Emt8o7di@bd+} zDUSOW{jpW!a`TKIyN94JJ`DU>kpYjlZwiOV}%|@m_qLWkA4? zYQt*Ler&#v7)jfyfTLpx#5T>@oE?^Rjqz zwIIJWHN_`L8{HOXFQo_&Ct`yi@=_p>8zl(z%O3=K1crVcfIyCnAkdL62*jBT0%6;v zH_34W4`B5rM8Tl9_kY=~MRCB$2b&*i_8<^M^nZSp&zFH$5nS99RUPE@oQZAhtc}eq zjffpwZH$Qj!^%_xGLo!f4U3V4-)ayTd}Kb*!9j)_3x0#<49KQ!BcsVkN4)d{&V9}ZRAqzd}{w^R^?IeTQT{3v+0%L0W#;e=@jpa z4^EzhFE;ys-Cl`=h@xKmA0(O(t)|)@E>EG4Li~)%miXSVGjte^6e$EBo~~|2r4Qwe z-Yz`u&c@LO5(dOhBZtn=00 zUVfsb?0OP=O!J5DSK5pSPp$O~5~*L4x0WOox5gXR>^sYQb}pRuUV62bdV73WzCPx9 zd`_g`CEy!Kt%?ajuwHm|y`Hx^6%Q1V63MPTh^4?TP()_<2^I@eQP}s@etCBg^a>C5c{luA)0^5e2>)&Mb^!zNME@0 z^&_mX#1xZb-14jXqT0375iK4!jtiUWRppl})KAo|q6(hEaNHl3di+9soYA^}>2)wx zGFG}YFjgLOk^6lg!!wDnM&#LJr{%=a)oy!kd)odk*}br{`$D}Po!ZAJvLg@YcZU=u zo)$hV=L%niS*>l;uA2uR7T`R@)k2R>=As$S;i8c}=UZfijcDbyp>NxUydHEme7DP` ziW0VEi5L{fwJpog1uw`osHkVdQj*ds;Z!jsWJI!9dbMXRN#5_MXIPVrRBCOKb-rwBRhFB9<{T5on4k%i&l`)g9rV@qCU<@6ZT#aye-iSCwy87Iq$aWSNPV-J1;RA}iIHzihYQ^6uCYoHmi0N5plVy)#+he{cF*fgTC_|30 z$*>!4{nPxYd&L*FH_Hu?2cZq+()TSQLeh=3)-rCLcn!Y6HQ(|?pH{VCr?(0#la9EG zeJa-y3q{q?6g4a$^^c3|9srv&76Xsi9h<&w61VjIO?VGWg`X*O1Z~a= zXfLSPy+K#M@E{f8szO&~w+C!>T+s`}VL8LUrt8=)vi`h!KG0C5+UeP7hVyV2PthJC zRsUJAGPwCyR;A!puH;(qFuqB>c&s7%f$VySe;#2A9)b}o`4$2dQCva1=-iDB?3Tdm ze0a?NDT#+9NPgJVK~M;x8ba+vv5z-Eq1F7W1H7;*?Ut}H#v-PuD^@AhOm-_qfrdS|yEsV}oVOJgFHnASRaeI4^5vzp%aAg1+Zh52E3Hq#8jZkoXE`Q2(RR#W`fK zR-67;)4X_eglWD1dD?zeUXRv|P(e>-S7`^g59bf4YBD91jhzY0_Ta+xp%V4dIZlzX zxU8?{JaD6Gm}@0AN>+0gSE=S<{fTn!d=6-leWy#~ZnH{oaY2mHkDKBAgU1T?eKYed zN{w;PTQN?hC5pJP*X&15N0tItaF$q+>Ds3ubRr+PbKPky1ur&;tw!|ogdcOZe}T&58&?&2nb|eJeplci)@(CZE$);f z)h%b$WeByFYc)}T<8O@P6;xzhm&0!>P%fx7$6q^(NGTH-lgg{*(I7J-&^e4zuU~#l zabPM#x_6a)WUjF4$zf;tF6Z0+GtMGd*!mIN-Eug|Dq+n+Y$a_yy>Fq+E5^iHJ=zJ? z)IBnli6<(omTS9J2cud(dz)dXh;OB1AGuRst6-6*j>m4rDA`OkWi%Z|+DRVr9FHZL zt!8ffb!g%D;w#l<3~~-kfS@n~TmiPXERAM`JBlm?;Yof_IabKgfL;;7sl6l3a}2D! zh!7HWl>On9g*Q*mpH+%z*4+Fi9|E)>T`BTrg#k~&D3RS{lxd?3>A)6K9XHO%Youqk zi#41z7pWJ=*d@=3Px+iR@_Zspk#`d4HoH#Q=LHFWhkB~}T?LW#zG7Fs{3a~nN67IL z(EG&CNRxyoTLh(!zk{l$<@YOMtxDWralCM74`)aq!`w#&#w@|ekKPp}JVz0YCbJLP zS7AK4EvS=;5_XfsRjprtQ9T^T0KL{KJZ!Y@SI_eRyNkO+q3sIn3`_Za!xJJE5ex$q zMD}dg2l_wo_+#wP!)Y)PTdEYfvkg1h8&Ned4q`$Yj}lFehx7c%8o0t)_iMYmV~nP~vg6 zPcWQl+^=b~eiXOIM2VjukE)z&c=BX(ZFWJp#bD?gIKij+)u}-=L!tfh9?Dkx;*JwE zO+GVU2R3NfoQ)>l6idfqsinY=7PeL7RV*A@o6f5r;Fa2(WS|HC((uHk3N36BKgYFVTyCCpA3XlgEGF_+5jZ30>0rOnf2?egvzh1g zX#r5aX2&4&2CoW6!-;ebLUTC(9KpbUi(1%!KYwbX^Tm=ewH}vrfDiqPa6QJThQbms z&QHyyB%Gq~%RZu4`!5Z&t`DxP6Sj6)NVMeAHcTf|uc@&I9hgX1Esbe;KH5P?`il!^ zE4;ebWMtS0-}Ba_mot}mY`H~&6n^!vKqY7B8KWoJ?XjKU(ai6isoUhRSH$*N)*je{ zy*_;Lv`gL<|EyBA z`?N)s*lhwIbnjWeTuAu&*Ye06) z&z4OgaTvBG0@63vFIpzOl(#JHD}o;MOBLy#n4@j@{&IgYMb@{i5um@?v)ymnzGj2M z<--569MDY9WarMV1V6fO-%GA_zXb^*k73p2;=x+rBgc@}!k+TiWW5MfXYf4Z*>m`C z6+4elrNi!dogDJd9h{>>g?i28pRdX$#`l3Q0Zbv;y*VO3*KMP^W8$sAkJzU%&;t@>p|v28hME{yK+$FCbk*HKao>~v z)nr`QUVwQD9-;|UO>O`M`31E)O@A6)BU*5ZJmMRL*tXEr5R2osraG1M>SOx0KNiFE z?finRg`{*>Nt(ZIETx&RJ%1hgGPy0ktrheFIJOafkeFpEoCSN-=a=R5<#EVK3Qs!c;q2@?!vmcuZ@{8cunBMRa!DLFzd+b1RURKQ^hHsuV> z{R2}8)v-kVdiImNtB;Pu{rDJL^_2Wh)4*vOUg8%kM3n=bj2%B}dtap(e=qc!JH_VMk1^?{^ z#`9x0_2JMq1+fyrA)z=zuyQet(kTjw+dtA5b;aU;2QwO?V1^i`*nj<{gcms(aUnrX z8-j+(9*CF=nMiA2*d@$rB(0{3MnMCKhzo}KA(B$FX3)#?Rr8<$N6=k`f2YAc`oN0O z5(N|I{T0%@k;SEho<2(KCH0}HEQ>P)-Lopa&nMSmpR*|Bav|R(0vX10D0Jr5PI8>i zU%QaGoD>M0@UYTe9#)czD-r_=LX-q{DJwu+o>$CXGsw6(yMQ%Vc&WyAk3#Ck4-df$ zppYZ=GZ-Ld!of9?j_MAtOJuTa?uLr$PQTf9@%#4qEI+kUmgMisG{V$42=%h7CV%==>8n6gCAN03#?a09r(Qs021Q3kTMKVj4;x{eJ7v zz*ury4svSerg9S=f*_~Q12hwF0tn!$XbOl!o&b&lv3JB$$-M&B+ZD)3;xLL)Mf1c6 z>F8X8jR6A_V=)X;6y8l99s;b(n8>lKFBU(*4k#B|FNL`sIQtYIV6V>L}sx7Bw} zOp4MX?{6e6t|u06>V(7eo0xn!y|@i#I6WR4(8(xZHAE@p|DY8=O;eqZhY21~O<`ZO zKp=T3u;yTI0%?3Lp*3_=D@(9n1{v^<5AaH$ku;O9qL^Y=XuP7eAB7wfbRgmsPa?b;&emETr_&)+* z)ZK&;rv1J``M{4f@W5+1x&zrQKLW!DP&D^e7IwD8QE60ZLt-bt8AdAt_$<~17Q_6Q z2p;?mEEf9T$dOAJ2W;x}K8?{ZnvvEXZ8wMwr@M0uH4!X!hr>i=0t}g%{5KQ~Q-$yj zRSGof4`lzT8WGDU`tKQnDddJe2*DZw4oCVTo&bia_`wm`V}y|irY1wgWw8KOzzyn& zH7%*{jHS}T7J?n6QhP_%vRBQBSUexFcOnjxsraBx%#jBCSNpo!_?)tW@J-(zP{5(u zz8OxC|4;8C-u_nq(@%ai{^Bf*_sXnHw8#uV>qA$x0BFi+tn7y-9x4!>LadwtG?>{W z%6LJEzZ`{o>+B4(S@5`R)-?M>GaRpv#ZnFSMa%8H`#nkn0Ftq;uIL=TP!rS=AdL>2Wj7B`lg98sPEkE@uZxrybcGFec}w@{?o75H|ChI;1nck zDE1ekgC4|%A*?6%_s2Iw4Aex9knrJ|7Tmo#s}KqDSV?YG6jd~-mld%9q(pESypRa0 zZc5xhL;T~cT9UPW%;W1%Am-i;`{gR}Ch{h%jwQndAfA|R>JL!yzw24G#Cfts?WiC|a@PHi%Vqb+N>3@6TS9y+B{Zpk z2m%nHFsV%?xjH`%69O~n6l7CMt=u*F6A6aNC)SpU;hz!d~C&Ho)!NLec^h^C;qeaMNnMX_xWZx`# z5*V4d>N$Zz4oZK3F&O|II&?XPUP@drI9d^H6IwMa}h}|M&s=}fXFQEy$O4w zsWSLW0PGq^6Vmq3>&E@C36ndPSty?C7n;kRa8evIb}kth`My#>B*o+wU~(uxV{%o1 zz1SHIO@jgSzB>XIYak*LFsr6OkqzRO={JvPEn)9D<*5)V9+p#@1Db)pn8V$$Hn)4% zc&sU)oB?z-F8j5bt^g}%m+(gBqE#e?ZgZ;Hub^hG)`UyNG&CuXIHlHopJ-%r#s`sa z4!jo}e#~?_$OUdN@kfPbY{v3WoH=geLZ@61H#7Dy7cIgPtzP0c2vnKE^R4b?N8fuV zTzi_Mm?q3dwiylfo5X>0hP3tvUMxuXk#>nZ?ps&acV>XEz;a4T$G8aU)gz6VzTE+G z!|CFV=#s;1{AzXDCoi~yZP)nV=N%H_oj9iUo3pi%gX7uEykOp|!$Tcp09>hTCZ5c+ zwH4?WkuSl{CrOtc5FM9;)`qqCMu7K7q#c?U?jGmNR0Ntm1g==qU|o`UUCLgrPuUCZ zvj9G6cH`;lt|fo@;7sDT5ojuo2Iwe zA4}&ikzhv@7J1R0YU)hkN{`Dl7;Ki2vSqZSpO?0SR(Rqs=Bh-dY}W(|AH_<@Q#oPQVCA$SGL#u0P0=IhB{P?3u^R94o9sU%?Sgx`m7V z{eVA>G#FbUNPCOwmPvT<6k=e(CrF|F0u9#ia@G5_;HvkgA9 zn~t($VO6#y?YgnRVF0f74E)$VBmMh5mpYS#dlz46y&i+vy&=8k*NY>(yvu?pPD62=yE zKUq}c#XR89KW=8!@U{52)M&2EpV50ukv8XNmhaYMu8#7BT#l*A>q!S=J2dn^JoglEt=!Aq#>pN>itN|c)Y*plDaLTl7NP)sF}sy*iDrrHT+F3AU$cx* z5T@qWPNvX@00}#UHiVG=Hr8}9AlxwJ3I{rY!{_2=aeYlw%f@JI5im(L0z%d8Duy2={&sRH2mZz5T52wdD!jLKG7VB7#A}eE@sMoTlXT$ zZP9AU5u*tyWElP8j_)3tL#{qSB4nImZ=hf{85CyW?;-0RN$NC|4>VU-(VI-s=N)@B zf`{Yp@w;}^qJ1SPs!#v^3?+lIX*H0)2MyEb^8s%zEbO3Zp-Gkfpk9bI6>wxSOya<0 zq|#uz{Vgj)Fm!YWgs-L*b4|6x)dDoNCvPC<*0lXCxcm3fD2ifo1Oq$(lo0noLS!s! zV>o6j^gwq^G0b&wzKtq=Ku9ayA0)XSpaq#cEr>hD?QylnYSM;`Md~pm0VRP){1Ihx zqV>R|dSha~!O^ACoEGAlYcYQ5F4`w4q*6zXN(x(5w2YKZLD=DR zVf`-g1Wg1VH1`5@kL|?fntR2yd*Ac*P3E{cZz~K(EFhuSG-nJ=$UlHitTMO*;efHFQ?(p94HyDNH^pzwJ~nDgsgRHXT;0DX zdL*ig&?oAQp;K>=-6 zcmSwI6xRh+Qt=1u1qa_$x-sK1tj3_Z&|y%gtVuX}I4} z#KzL36RoS8jt!w}zBZ=dDU)*6vQ4f63Y4{HeV)wcb4V;sB+_M~E`WmS!%l2pP5_L}8ilu1KI_F(=lT{l zd6-Et#ra^AwWCLdFqRd4auzV;v`&M-&XY+A`BDMZP`M!{sR3>P;9J~-e3mF33MiH8 z+algoIy%fE$|2LKS+6@vD4?DDev5N@kgC?W$23$25)V zJ=rXtapRY6jmp;507=^#GhSF#%MzYC#@D6yW?;IN7<~LD#G5%tJX%{DznPS!M%(06 zi5XIPv1*8X)ntqatoD<+m&d9Nh>NbBg}dDeHzw71(Ym@ARjJ)9vr;YFd|ZgUEpMD1A&BhK)B>MLO!_7 z!+vf%HL*e_z4jZB{?R8}o%gSCnBJ_6p3X8t6{6TkEx$~r*I~*O5INC>s+9al9^U=< z9+d$Az~ic{5^5-W3)(i=%gpEQRtDVM^k^>{1lQnD1EL5NuUm&JypRy-!|`QZbptv2 z``JfSh;52VAQb`qR2%8~v~ibynM965^IYj(noQwCq-eWEcr#`1#2&7^qlhJYmWr>0 z;E>w0xij(P_-N!w6JClPrjU_+^XpIOW

whdC0m_e7CjYUW7C`Ng%t-6S>81V!=8 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 Date: Fri, 20 Jun 2025 16:23:26 +0800 Subject: [PATCH 2/2] consistency with upcoming ggplot2 version --- R/axis.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/axis.R b/R/axis.R index 73ccdab..f6eb88f 100644 --- a/R/axis.R +++ b/R/axis.R @@ -37,7 +37,7 @@ alab_ <- function(label, axis, fontsize=11, ...) { ##' @importFrom ggplot2 element_blank ##' @importFrom ggplot2 margin ##' @export -ggplot_add.alab <- function(object, plot, object_name) { +ggplot_add.alab <- function(object, plot, object_name, ...) { label <- object$label object$label <- NULL axis <- object$axis @@ -113,7 +113,7 @@ axis_align <- function(gg, limits = NULL, axis) { ##' @importFrom ggplot2 scale_y_continuous ##' @importFrom methods is ##' @export -ggplot_add.axisAlign <- function(object, plot, object_name) { +ggplot_add.axisAlign <- function(object, plot, object_name, ...) { limits <- object$limits ## expand_limits <- object$expand_limits @@ -181,7 +181,7 @@ ggplot_add.axisAlign <- function(object, plot, object_name) { } ## } } - ggplot_add(scale_lim, plot, object_name) + ggplot_add(scale_lim, plot, object_name, ...) } set_scale_limits <- function(scales, limits, expand){