Skip to content

More consistency with how -B0 is used #4293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 7, 2020
Merged

More consistency with how -B0 is used #4293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4072ecd
Let -B0 only imply x-y map, not z-axis
PaulWessel Oct 6, 2020
0fb503e
Update gmt_init.c
PaulWessel Oct 6, 2020
89df2b1
Update filler.sh
PaulWessel Oct 7, 2020
40e2b69
Update QR.ps
PaulWessel Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/gmt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4263,7 +4263,8 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
if (no == GMT_Z) GMT->current.map.frame.drawz = true;
if (!text[0]) continue; /* Skip any empty format string */
if (text[0] == '0' && !text[1]) { /* Understand format '0' to mean "no annotation, ticks, or gridlines" */
GMT->current.map.frame.draw = GMT->current.map.frame.drawz = true; /* But we do wish to draw the frame */
GMT->current.map.frame.draw = true; /* But we do wish to draw the frame */
if (GMT->common.J.zactive) GMT->current.map.frame.drawz = true; /* Also brings z-axis into contention */
GMT->current.setting.map_frame_type = GMT_IS_PLAIN; /* Since checkerboard without intervals look stupid */
continue;
}
Expand Down
Binary file modified test/psxyz/QR.ps
View file
Open in desktop
Binary file not shown.
13 changes: 6 additions & 7 deletions test/psxyz/filler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ cat << EOF > t.txt
4 4 0
EOF

gmt psxyz -R0/5/0/5/0/1 -JX3i -JZ1i -P -K -p170/35 -Bwesn t.txt -Gred -W2p -L+yb > $ps
gmt psxyz -R -J -JZ -O -K -Bwesn -p t.txt -Gred -W2p -L+yt -X3.5i >> $ps
gmt psxyz -R -J -JZ -O -K -Bwesn -p t.txt -Ggreen -W2p -L+xl -X-3.5i -Y3.2i >> $ps
gmt psxyz -R -J -JZ -O -K -Bwesn -p t.txt -Ggreen -W2p -L+xr -X3.5i >> $ps
gmt psxyz -R -J -JZ -O -K -Bwesn -p t.txt -Gorange -W2p -L+y4 -X-3.5i -Y3.2i >> $ps
gmt psxyz -R -J -JZ -O -K -Bwesn -p t.txt -Gorange -W0.5p,white -L+x4.5+p2p -X3.5i >> $ps
gmt psxy -R0/5/0/5 -J -O -T >> $ps
gmt psxyz -R0/5/0/5/0/1 -JX3i -P -K -p170/35 -B0 t.txt -Gred -W2p -L+yb > $ps
gmt psxyz -R -J -O -K -B0 -p t.txt -Gred -W2p -L+yt -X3.5i >> $ps
gmt psxyz -R -J -O -K -B0 -p t.txt -Ggreen -W2p -L+xl -X-3.5i -Y3.2i >> $ps
gmt psxyz -R -J -O -K -B0 -p t.txt -Ggreen -W2p -L+xr -X3.5i >> $ps
gmt psxyz -R -J -O -K -B0 -p t.txt -Gorange -W2p -L+y4 -X-3.5i -Y3.2i >> $ps
gmt psxyz -R -J -O -B0 -p t.txt -Gorange -W0.5p,white -L+x4.5+p2p -X3.5i >> $ps