From 452600d1594089669a16508e899fa9141878eb50 Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Thu, 18 Mar 2021 12:58:46 -0400 Subject: [PATCH 1/3] Set max auto intervals at 60 for misc projections --- src/gmt_map.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gmt_map.c b/src/gmt_map.c index 051195b07c1..124e119a913 100644 --- a/src/gmt_map.c +++ b/src/gmt_map.c @@ -6782,7 +6782,13 @@ void gmt_auto_frame_interval (struct GMT_CTRL *GMT, unsigned int axis, unsigned } if (n) { while (i < n && maj[i] < d) i++; /* Wind up to largest reasonable interval */ - d = maj[i] * p, f = sub[i] * p; /* Scale up intervals in multiple of unit */ + if ((GMT->current.proj.projection == GMT_MOLLWEIDE || \ + GMT->current.proj.projection == GMT_HAMMER || \ + GMT->current.proj.projection == GMT_ECKERT4) && \ + fabs (GMT->common.R.wesn[YHI] - GMT->common.R.wesn[YLO]) == 180 && i == 6) /* Certain global projections */ + d = maj[i-1] * p; /* Annotation interval needs to be less than 90 */ + else d = maj[i] * p; /* Scale up intervals in multiple of unit */ + f = sub[i] * p; } if (is_time) { /* Last check to change a 12 month unit to 1 year and 24 hours to 1 day */ if (unit == 'O' && d == 12.0) d = 1.0, f /= 12.0, unit = 'Y'; From 1794dda6a983bf24f1e761652c89e4e5906271e7 Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Thu, 18 Mar 2021 13:12:49 -0400 Subject: [PATCH 2/3] Use max limit even if not global --- src/gmt_map.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gmt_map.c b/src/gmt_map.c index 124e119a913..40d96fe0519 100644 --- a/src/gmt_map.c +++ b/src/gmt_map.c @@ -6784,8 +6784,7 @@ void gmt_auto_frame_interval (struct GMT_CTRL *GMT, unsigned int axis, unsigned while (i < n && maj[i] < d) i++; /* Wind up to largest reasonable interval */ if ((GMT->current.proj.projection == GMT_MOLLWEIDE || \ GMT->current.proj.projection == GMT_HAMMER || \ - GMT->current.proj.projection == GMT_ECKERT4) && \ - fabs (GMT->common.R.wesn[YHI] - GMT->common.R.wesn[YLO]) == 180 && i == 6) /* Certain global projections */ + GMT->current.proj.projection == GMT_ECKERT4) && i == 6) /* Certain global projections */ d = maj[i-1] * p; /* Annotation interval needs to be less than 90 */ else d = maj[i] * p; /* Scale up intervals in multiple of unit */ f = sub[i] * p; From 501e48d00c55edd51165724fec19e589bf1d82c6 Mon Sep 17 00:00:00 2001 From: Meghan Jones Date: Thu, 18 Mar 2021 13:34:39 -0400 Subject: [PATCH 3/3] Update PS files --- doc/examples/ex01/ex01.ps | Bin 385717 -> 389317 bytes doc/examples/ex36/ex36.ps | Bin 229953 -> 233393 bytes src/gmt_map.c | 5 ++--- test/psxy/repeat2.ps | Bin 64127 -> 71860 bytes 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/examples/ex01/ex01.ps b/doc/examples/ex01/ex01.ps index 084010baf348140be53ac2f41e8aefead2bdc99e..4beebad6cea1b2a0cf27791a1ef2fb448530a85b 100644 GIT binary patch delta 6222 zcmeH~zlvr>5XG5KU6?Nr5n(|C8y2Ibm)m{+Z(tykPBag&iGgo%1%pl9$hXi)<_T6X zH(u~f{GC(X!@h!WgPE^y-|G5v>QvS3Ki@xp|L^l(fBJHo>oN>KzNtekuZHne+1~wp zT(?xl*JXY^PruyWyuH1-dAz;3{Qm7R?R%QmbbrldUDCLwJ602`*{fwv)8ti|`(D}8 zxNC1mEM6irFWTB_liIg-a9x|$6$P7BjU}x$lpbSRtgDnIt??RHL+g&u5?lAQ6fNc< zOclSWu0iK!hF41S@dJK4oY_1QKr0Wgde|C>ebU=m6kANO)VCECvVQ zSuFI*93os$k}Otp|cKC&Z+XXlMQM zV3M>FBotE;gj}vXxX6gZ$AHA#!=4+*yro&8ui!7(Ad_*#8B$^jJJIV`W7r246ApoC z{q6eV^7S$995H7)Wy}~(cfNGG(3+fXJhxY!E1fExDV-=-vUMVFbdMZ%ZkQTkW@knx z1_lf-0w!Ze4Z25#HgYs>G-`kdVSw$Fs7bJGJqzt7N@ZVQku*0B5G6vG*}2iEF-3zc zor!5PQIIw>NvSDCrIo>NP!wHK3(+Iv^=|f3T~4I?o+(L}DT6qoE{kSW24%$n(1N@N zaT_o4Q*TDtr#dBa=S1EyW05!Kd9z2_H!Tco4MB=J&RYF1&0Y17bcovy|ypTe&<)%{@ zdoFiIlN7W^28wNH^*rTWM;7Z-iT=^zWK zWm8E)PjIC-SbXcO*&Y7GSGS- z-+g!a{@GDB>b62ySV&5-3S#^R2+LCFa)oyS6gzC(UFC%t2ADddVvX5KBk;VWrQ0dh zBdJ3K_<1QE%tI;B;&7hy&Uy=Ul-@#TmuzL4D_I4&vKE!#NrnzD3GB3@HEK4pqBRh& zS9)uYsf27#s6Y)>#Bf98VO0*~pgc6>t-T_TA1w^Uz>f5jUlEFP?D$a1UBJMO9j$~28Ayu}6laVLs4;1NnZ3T}VXCc`UlCZXWKrKirj5R;# zNJ>iu?rd>6!g;sgnmswm=a{yzhECZXpNNSXzuW9+;QJYrE~)%NVdNH z@bbdnCyyUqe){)c=Vjo$44jvN^D;p1aqFPh(Q;`v=Vd_cxm^>_%fNXVVE&$$f%7tu f`Q$t=1O6O6F9ZMk%K(>v%l5_Nv(G>K=P)%x4xCFejT(zD5N@{}@d(c(fWXe(yQskaj4Sy}<1SQ;r( z@Y0A9TpBe{tkPiLsOX}aDd`-(gYK_Lql+?AT>8F9SsP^@job*+hy-mtZ6VzhDuuqZ z_bX|S1F`BHeJE*NBxGw*$XT=|6kL1$O!J~cDN)m*h&dgJo|@K%3X5h4k(%n~NL5pn zQEVF%NGW^ar^Kp+(zjFUi{Ov$7OPmM5m)M3rqHNH3`B&L?TM*M9+;Iy0lrjj9M-_# zB=d-(?!#9tFu^g6gEJ6$-H7g5#gD{hKZ-zYY6ibxgm0Ka7n!$HgI}_=A)KV2nGhL$ zoTG+-S49egy^xIGx#!~uXk_IKU-;(y$@UJ1I!yF~Z0P40OrQ(BPySW(F!x@PoP2GX6 zB4*?2=%Jw|{lx`=parLh4Wdvml4Iw&2gd2Kmz|B^7shFp0-OyyoT?;r29D#wi3@q4 z9m2R8ARp#qu`%R2M942gS?-ad`XWR1R<7;q4oLo`<(jFU0sG L{jc7>Uw{4qCz;c6 diff --git a/doc/examples/ex36/ex36.ps b/doc/examples/ex36/ex36.ps index 7e66fd53fde31c47f3e4726362a54a88acb16b34..113e68ef8701bd79ea3c3feeb75a2e39e6243695 100644 GIT binary patch delta 292 zcmX@u!nbig--HYy6H_BI1A~-!BLgEtJp*GsLyL(G^;{MThQ?NgrdFn=n>iUb1y7%N zicuU)Oui5zJbk|)lj!vRQ;h7>y-qU8sB%=o7_Ldop8kMBm+zzyPdzd8i9zSwzJShO z88-z_Un0RII(_~{Mqy4}LjzNwq^ZgD_YzE%oEiojG!=4-6r#5KUuOKy)+`yjT{4#O zu;KO@+ZoN6rn60E6x}X-fYFU6b54W29+`?GzY RBGdMLip+<737LMG9{{@{P0IiP diff --git a/src/gmt_map.c b/src/gmt_map.c index 40d96fe0519..cd6e3aeba5c 100644 --- a/src/gmt_map.c +++ b/src/gmt_map.c @@ -6782,9 +6782,8 @@ void gmt_auto_frame_interval (struct GMT_CTRL *GMT, unsigned int axis, unsigned } if (n) { while (i < n && maj[i] < d) i++; /* Wind up to largest reasonable interval */ - if ((GMT->current.proj.projection == GMT_MOLLWEIDE || \ - GMT->current.proj.projection == GMT_HAMMER || \ - GMT->current.proj.projection == GMT_ECKERT4) && i == 6) /* Certain global projections */ + if ((GMT->current.proj.projection == GMT_MOLLWEIDE || GMT->current.proj.projection == GMT_HAMMER || \ + GMT->current.proj.projection == GMT_ECKERT4) && i == 6) /* Rounded misc. projections */ d = maj[i-1] * p; /* Annotation interval needs to be less than 90 */ else d = maj[i] * p; /* Scale up intervals in multiple of unit */ f = sub[i] * p; diff --git a/test/psxy/repeat2.ps b/test/psxy/repeat2.ps index d3ec62c7b85dfde448f265f37be55f91684dbdea..6539539d9e717ce6c0975d2ddb74a453ae398e39 100644 GIT binary patch delta 11486 zcmeHNO^jT{5!QOWUgrTuN>~d6ipxSEN2a~q?{8+f`G-X^SubL2qXa3-;GJbRtY?;) zSum`ems<{wl)xm1a3F~U5-5shi!7$HDCJ8b9bIv+oHwJfLxPY z@}SEfv>CBQIX6XnibvZ&T|Tk+Z^=?nm@WY8GHWNk%@@&XFKxEJD+cNN2l%{bb7iYNM}e~j0Rg>8Etk(YqUC~)4HV2 zOPwiDm1X8)G33u1nBr`esk3n^wlbJ7E@$uGH}iu43(@$%p*!yJBr!L~PA!kR=SLgs zy>8&HeCW`=z2AA#PaL^0b<0GZjXym4z}-X@!`Igp*6+J-d10wCs0Ni~s06m$wY;}T73U$f=9MBSb& zXCFDZYueJ0^2uNQaYvD+lq9qmnI=@HNyj7OY>VQIN3CWU@Kh4>RHK@58Kq9F8kDqn zkjE4^WG1In95hoW{Tj-15;XXka?|evS8-#=~0A#Y#j^Zpv3Nf>agGjChNhJakkdQ1* zZYfO)>@;b@HGlzv$_Wi_HU2V|2>~4p;HV)pFvfu~18n8^2JkwWY2mpgo3wzC64GE> z5b1X}2sHBy25=1iv4+E73g>D1{aOevrKT{MQ!dFXGk!YI+4L|o%R-CwbOAX23V7H% zR|hAFGL`~jQsJ_QfU*FtDS~CGIcGft;ZQIWAW>^lt*BIqrT{VNd_q*76nG2-nHHQ= zE(Md%>j)$H02&5uI?Chmr*G~rz=<%XgehN2m#~HX%9T>3OlcmDS!13`fw&R5t`a$Mj>sR_&kVvMT@Ln7cbaKkksa2XulU-CeY@%*3;lp&)OnZOZB zBycoQM}Z}%Rj5=gJ|)U1Q%0%!s+g55qimT%`QpM1DyDj(l$pSpC>5RPA&CL!`46loN$f_#z3y3DU(tWfM0~ib@p(>r#ZOm@1g6m#RprmMWI2 zl?*i(qbg;K3QWoO=xyT z1ry=~9pu|$R5Oi=ramb6xfEm*quk3TMw(+KoGfCf0r*nsWM874M#a;pdcpzdM&#Wr zbu6Ie$A9~HXWF&oJdV8ldbY{I+nAKm3w+7Yf(5|8it=ys1moFc4%5L~pv4!~gK!2}#k z0D>} zfAQ5@%GW<_PnDy=)tMRDP+ooSpHpS)#e+NR=8!K^-5l1jKbphnhJ7I(ahAq^|73x?zVU%Ce)jT} ztL1Bdy0$A^|Lgv`E397`)~^ifSB7|l8D8qvU18l7;(b&7%CLTASids-c3v5N&$`0+ z@^ji1zJ2BMUDbQSf6vsf2E7Vl&&xQcDyuOwS(_Xm6t!evh#lx)cE=U delta 4560 zcmeH~OKTKC5XYIAH98R!q6QyG3Lg-KPP*r{vmOLVj0c~vQ6ZPOZYJ4Cva{@Nd=TRv zM8$)sjDmNVWex?lji**18EV0e@x7j&R9&(id%eVK{f_hjf z6esJa3R9I*0Zx>HY5=p9umWoB=u}W1n-0eUJ^I~qZq|h8Q^&fs!O3C?`UiG^HpXTu z&|fU*LBu-Ot~4Qzh7spray*!-1#@y=XKBU8VyRGtS}8n%F6xiNv6))^6qJJr*cH#o z`Azp)WP5LSX7kbm`8}fp!=u&Ucu=hcl|sE_(p)__S)ZCLW8e|CraO8#v{m*D9x$R; zJJ&~dcDBiZq4i7T{r%mG<>@(Do&}X0yMPI3DTbv2u|QhokxN{^-n25#5>Sl{Y7@8_Sr$ zjKan+dm(ysF6_WZI>gOhet8Q_S7AgNU!P^V95`$qGG_&942OX^7|KTr;T8Gz*6nt= z?)1L4jCPRav!64mL?F0SB2tM^ulawF2>JTf-S&TUV#8lLfj@}ZsvrD7qRZA!(6Zt7dA$E|guXoT##6S;_@4Y{q2%KH;$MiCpKkyF