Skip to content

Do not let -Bz trigger x-y basemap #4290

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 2 commits into from
Oct 6, 2020
Merged

Do not let -Bz trigger x-y basemap #4290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77d2c93
Do not let -Bz trigger x-y basemap
PaulWessel Oct 6, 2020
95d7a76
Update gmt_init.c
PaulWessel Oct 6, 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
18 changes: 12 additions & 6 deletions src/gmt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3624,8 +3624,10 @@ GMT_LOCAL int gmtinit_set_titem (struct GMT_CTRL *GMT, struct GMT_PLOT_AXIS *A,
break;
}

GMT->current.map.frame.draw = true;
if (axis == 'z') GMT->current.map.frame.drawz = true;
if (axis == 'z')
GMT->current.map.frame.drawz = true;
else
GMT->current.map.frame.draw = true;

return (GMT_NOERROR);
}
Expand Down Expand Up @@ -3656,8 +3658,10 @@ GMT_LOCAL int gmtinit_decode_tinfo (struct GMT_CTRL *GMT, int axis, char flag, c
if (n_int[1]) A->item[GMT_ANNOT_UPPER+!GMT->current.map.frame.primary].special = true; /* custom interval annotations */
if (n_int[2]) A->item[GMT_TICK_UPPER+!GMT->current.map.frame.primary].special = true; /* custom tick annotations */
if (n_int[3]) A->item[GMT_GRID_UPPER+!GMT->current.map.frame.primary].special = true; /* custom gridline annotations */
GMT->current.map.frame.draw = true;
if (axis == GMT_Z) GMT->current.map.frame.drawz = true;
if (axis == GMT_Z)
GMT->current.map.frame.drawz = true;
else
GMT->current.map.frame.draw = true;
}
else
GMT_Report (GMT->parent, GMT_MSG_ERROR, "Cannot access custom file in -B string %c-component %s\n", str[axis], &in[1]);
Expand Down Expand Up @@ -3785,8 +3789,10 @@ GMT_LOCAL int gmtinit_parse4_B_option (struct GMT_CTRL *GMT, char *in) {

if (!info[i][0]) continue; /* Skip empty format string */
if (info[i][0] == '0' && !info[i][1]) { /* Skip format '0' */
GMT->current.map.frame.draw = true;
if (i == GMT_Z) GMT->current.map.frame.drawz = true;
if (i == GMT_Z)
GMT->current.map.frame.drawz = true;
else
GMT->current.map.frame.draw = true;
continue;
}

Expand Down