Skip to content

Fix option -B+n in psscale #8737

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
joa-quim merged 2 commits into from
May 30, 2025
Merged

Fix option -B+n in psscale #8737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7167e2c
Fix option -B+n in psscale
joa-quim May 29, 2025
a4f5627
Merge branch 'master' into fix-psscale-B+n
Esteban82 May 30, 2025
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: 3 additions & 0 deletions src/gmt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4987,6 +4987,9 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
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 */
GMT->current.map.frame.set[no] = true; /* Since we want this axis drawn */
#ifdef B0_IS_NO_FRAME
GMT->current.map.frame.no_frame = true; /* Understand format '0' to mean "NO FRAME AT ALL" */
#endif
continue;
}

Expand Down
28 changes: 16 additions & 12 deletions src/psscale.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,30 +1388,34 @@ GMT_LOCAL void psscale_draw_colorbar (struct GMT_CTRL *GMT, struct PSSCALE_CTRL

PSL_setlinecap (PSL, PSL_SQUARE_CAP); /* Square cap required for box of scale bar */

if (gap == 0.0) {
if ((flip & PSSCALE_FLIP_ANNOT) || !B_set) PSL_plotsegment (PSL, xleft, 0.0, xleft + length, 0.0);
if (!(flip & PSSCALE_FLIP_ANNOT) || !B_set) PSL_plotsegment (PSL, xleft, width, xleft + length, width);
PSL_plotsegment (PSL, xleft, 0.0, xleft, width);
PSL_plotsegment (PSL, xright, 0.0, xright, width);
if (gap == 0.0 && !GMT->current.map.frame.no_frame) {
if ((flip & PSSCALE_FLIP_ANNOT) || !B_set) PSL_plotsegment(PSL, xleft, 0.0, xleft + length, 0.0);
if (!(flip & PSSCALE_FLIP_ANNOT) || !B_set) PSL_plotsegment(PSL, xleft, width, xleft + length, width);
PSL_plotsegment(PSL, xleft, 0.0, xleft, width);
PSL_plotsegment(PSL, xright, 0.0, xright, width);
}

if (B_set) { /* Used -B */
gmt_xy_axis2 (GMT, xleft, y_base, length, start_val, stop_val, A, !(flip & PSSCALE_FLIP_ANNOT), GMT->current.map.frame.side[flip & PSSCALE_FLIP_ANNOT ? N_SIDE : S_SIDE] & PSSCALE_FLIP_LABEL, GMT->current.map.frame.side[flip & PSSCALE_FLIP_ANNOT ? N_SIDE : S_SIDE]);
if (!GMT->current.map.frame.no_frame)
gmt_xy_axis2(GMT, xleft, y_base, length, start_val, stop_val, A, !(flip & PSSCALE_FLIP_ANNOT),
GMT->current.map.frame.side[flip & PSSCALE_FLIP_ANNOT ? N_SIDE : S_SIDE] & PSSCALE_FLIP_LABEL,
GMT->current.map.frame.side[flip & PSSCALE_FLIP_ANNOT ? N_SIDE : S_SIDE]);

if (A->item[GMT_GRID_UPPER].active) {
dx = gmtlib_get_map_interval (GMT, A->type, &A->item[GMT_GRID_UPPER]);
dx = gmtlib_get_map_interval(GMT, A->type, &A->item[GMT_GRID_UPPER]);
gmt_setpen (GMT, &GMT->current.setting.map_grid_pen[GMT_PRIMARY]);
if (A->type == GMT_TIME)
gmt_plot_timex_grid (GMT, PSL, P->data[0].z_low, P->data[P->n_colors-1].z_high, 0.0, width, GMT_GRID_UPPER);
gmt_plot_timex_grid(GMT, PSL, P->data[0].z_low, P->data[P->n_colors-1].z_high, 0.0, width, GMT_GRID_UPPER);
else
gmt_linearx_grid (GMT, PSL, P->data[0].z_low, P->data[P->n_colors-1].z_high, 0.0, width, dx);
gmt_linearx_grid(GMT, PSL, P->data[0].z_low, P->data[P->n_colors-1].z_high, 0.0, width, dx);
}
}
else { /* When no -B we annotate every CPT bound which may be non-equidistant, hence this code (i.e., we cannot fake a call to -B) */
else if (!GMT->current.map.frame.no_frame) { /* When no -B we annotate every CPT bound which may be non-equidistant, hence this code (i.e., we cannot fake a call to -B) */

if (!skip_lines) { /* First draw gridlines, unless skip_lines is true */
gmt_setpen (GMT, &GMT->current.setting.map_grid_pen[GMT_PRIMARY]);
gmt_setpen(GMT, &GMT->current.setting.map_grid_pen[GMT_PRIMARY]);
for (i = 0; i < n_xpos; i++)
PSL_plotsegment (PSL, xpos[i], 0.0, xpos[i], width);
PSL_plotsegment(PSL, xpos[i], 0.0, xpos[i], width);
}

/* Then draw annotation and frame tickmarks */
Expand Down
Loading