Skip to content

Make sure only low and high contributes to decimal count in colorb -S+r #7730

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
PaulWessel merged 1 commit into from
Aug 16, 2023
Merged

Make sure only low and high contributes to decimal count in colorb -S+r #7730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/psscale.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,10 +864,13 @@ GMT_LOCAL void psscale_draw_colorbar (struct GMT_CTRL *GMT, struct PSSCALE_CTRL
ndec = gmt_get_format (GMT, GMT->current.map.frame.axis[GMT_X].item[GMT_ANNOT_UPPER].interval, GMT->current.map.frame.axis[GMT_X].unit, GMT->current.map.frame.axis[GMT_X].prefix, format);
}
else { /* Do annotations explicitly, one by one. Try automatic guessing of decimals if equidistant cpt */
bool const_interval = true, exp_notation = false;
bool const_interval = true, exp_notation = false, do_this_lower;
bool do_last_lower = (P->n_colors == 1 || !Ctrl->S.range); /* Make sure to annotate the lower bounds of a single slice and not if -S+r */
for (i = 0; i < P->n_colors; i++) {
if (Ctrl->S.range && (i > 0 && i < (P->n_colors - 1))) continue;
do_this_lower = (i == (P->n_colors - 1)) ? do_last_lower : true;
if (P->data[i].label) n_use_labels++;
if (P->data[i].annot & GMT_CPT_L_ANNOT) {
if (P->data[i].annot & GMT_CPT_L_ANNOT && do_this_lower) {
z = P->data[i].z_low;
if ((dec = gmt_get_format (GMT, z, NULL, NULL, text)) > ndec) {
strncpy (format, text, GMT_LEN256-1);
Expand Down