Skip to content
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

Jump to bottom

d.vect: label vertical alignment workaround #2857

Merged
merged 3 commits into from
Nov 21, 2023
Merged

d.vect: label vertical alignment workaround #2857

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49bb61d
d.vect: label vertical alignment workaround
marisn Feb 24, 2023
8df7bc9
d.vect: fix label horizontal alignment
marisn Mar 23, 2023
9f87e51
Merge branch 'main' into d_vect_label
marisn Nov 21, 2023
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
32 changes: 21 additions & 11 deletions display/d.vect/label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,26 @@ int process_line(int ltype, const struct line_pnts *Points,
void show_label(double *px, double *py, LATTR *lattr, const char *text)
{
double X = *px, Y = *py;
int Xoffset, Yoffset;
double Xoffset;
double xarr[5], yarr[5];
double T, B, L, R;
double ysize;

/* Vertical alignment has to be performed in advance as returned box
* height will depend on letters in use. Shifting of Y location
* ensures that text baseline is aligned instead of just bounding box.
* This logic will break down for any vertical texts.
* A proper fix would be to obtain baseline and shift it around. */
ysize = D_get_d_to_u_yconv() * lattr->size;
if (lattr->yref == LBOTTOM)
Y = Y - ysize * 0.6;
else if (lattr->yref == LCENTER)
Y = Y + ysize * 0.35;
else
Y = Y + ysize * 1.4;

X = X + D_get_d_to_u_xconv() * 0.5 * lattr->size;
Y = Y + D_get_d_to_u_yconv() * 1.5 * lattr->size;
if (lattr->xref != LRIGHT)
X = X + D_get_d_to_u_xconv() * 0.5 * lattr->size;

D_pos_abs(X, Y);
D_get_text_box(text, &T, &B, &L, &R);
Expand All @@ -168,21 +182,17 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
R = R + D_get_d_to_u_xconv() * lattr->size / 2;

Xoffset = 0;
Yoffset = 0;

if (lattr->xref == LCENTER)
Xoffset = -(R - L) / 2;
if (lattr->xref == LRIGHT)
Xoffset = -(R - L);
if (lattr->yref == LCENTER)
Yoffset = -(B - T) / 2;
if (lattr->yref == LBOTTOM)
Yoffset = -(B - T);

if (lattr->has_bgcolor || lattr->has_bcolor) {
xarr[0] = xarr[1] = xarr[4] = L + Xoffset;
xarr[2] = xarr[3] = R + Xoffset;
yarr[0] = yarr[3] = yarr[4] = B + Yoffset;
yarr[1] = yarr[2] = T + Yoffset;
yarr[0] = yarr[3] = yarr[4] = B;
yarr[1] = yarr[2] = T;

if (lattr->has_bgcolor) {
D_RGB_color(lattr->bgcolor.R, lattr->bgcolor.G, lattr->bgcolor.B);
Expand All @@ -196,7 +206,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
}

D_pos_abs(X + Xoffset, Y + Yoffset);
D_pos_abs(X + Xoffset, Y);
D_text(text);
}

Expand Down
Loading