mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Height and width correction in render.c

Browse Source 
Correction makes the height and width adjustment in render.c work as expected.
Height and width of a symbol can now be manipulated to any value in gLabels
with Zint adding padding or changing height of the symbol as required.
This commit is contained in:
Robin Stuart 2010-07-06 07:43:13 +01:00
parent 498820cbed
commit 8d4398e1bb
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
backend/render.c
View File

@ -50,10 +50,12 @@ int render_plot(struct zint_symbol *symbol, float width, float height)
int large_bar_count, comp_offset; int large_bar_count, comp_offset;
float addon_text_posn; float addon_text_posn;
float default_text_posn; float default_text_posn;
float scaler = symbol->scale; float scaler;
float w, h;
const char *locale = NULL; const char *locale = NULL;
int hide_text = 0; int hide_text = 0;
float required_aspect;
float symbol_aspect;
float x_spacer, y_spacer;
// Allocate memory for the rendered version // Allocate memory for the rendered version
render = symbol->rendered = malloc(sizeof(struct zint_render)); render = symbol->rendered = malloc(sizeof(struct zint_render));
@ -139,22 +141,7 @@ int render_plot(struct zint_symbol *symbol, float width, float height)
} }
xoffset = symbol->border_width + symbol->whitespace_width; xoffset = symbol->border_width + symbol->whitespace_width;
yoffset = symbol->border_width;
// Calculate the initial scale factor if width provided
w = main_width + (xoffset * 2);
if (width) {
scaler = width / w;
}
// Calculate the height
if (height) {
symbol->height = height / scaler; // starting height
} else if (symbol->height == 0) {
symbol->height = 50;
}
// Update height for texts
symbol->height -= textheight + textoffset;
// Determine if height should be overridden // Determine if height should be overridden
large_bar_count = 0; large_bar_count = 0;
@ -165,23 +152,34 @@ int render_plot(struct zint_symbol *symbol, float width, float height)
large_bar_count++; large_bar_count++;
} }
} }
large_bar_height = (symbol->height - preset_height) / large_bar_count;
if (large_bar_count == 0) { if (large_bar_count == 0) {
required_aspect = width / height;
symbol_aspect = (main_width + (2 * xoffset)) / (preset_height + (2 * yoffset) + textoffset + textheight);
symbol->height = preset_height; symbol->height = preset_height;
} if (required_aspect > symbol_aspect) {
yoffset = symbol->border_width; /* horizontal padding is required */
scaler = height / (preset_height + (2 * yoffset) + textoffset + textheight);
x_spacer = ((width / scaler) - (main_width + (2 * xoffset))) / 2;
y_spacer = 0.0;
} else {
/* vertical padding is required */
scaler = width / (main_width + (2 * xoffset));
y_spacer = ((height / scaler) - (preset_height + (2 * yoffset) + textoffset + textheight)) / 2;
x_spacer = 0.0;
}
} else {
scaler = width / (main_width + (2 * xoffset));
symbol->height = (height / scaler) - ((2 * yoffset) + textoffset + textheight);
// Calculate the scale factor from the height, incase it needs to be lowered for width x_spacer = 0.0;
h = (symbol->height + textheight + textoffset + (yoffset * 2)); y_spacer = 0.0;
if ((h * scaler) > height) {
scaler = height / h;
} }
large_bar_height = (symbol->height - preset_height) / large_bar_count;
// Set initial render dimensions // Set initial render dimensions
render->width = w * scaler; render->width = width;
render->height = h * scaler; render->height = height;
if(((symbol->output_options & BARCODE_BOX) != 0) || ((symbol->output_options & BARCODE_BIND) != 0)) { if(((symbol->output_options & BARCODE_BOX) != 0) || ((symbol->output_options & BARCODE_BIND) != 0)) {
default_text_posn = (symbol->height + textoffset + symbol->border_width + symbol->border_width) * scaler; default_text_posn = (symbol->height + textoffset + symbol->border_width + symbol->border_width) * scaler;
@ -239,13 +237,13 @@ int render_plot(struct zint_symbol *symbol, float width, float height)
line->next = NULL; line->next = NULL;
line->width = block_width * scaler; line->width = block_width * scaler;
line->x = (i + xoffset) * scaler; line->x = (i + xoffset + x_spacer) * scaler;
if(addon_latch == 0) { if(addon_latch == 0) {
line->y = row_posn * scaler; line->y = (row_posn + y_spacer) * scaler;
line->length = row_height * scaler; line->length = row_height * scaler;
} else { } else {
line->y = (row_posn + 10.0) * scaler; line->y = (row_posn + 10.0 + y_spacer) * scaler;
line->length = (row_height - 5.0) * scaler; line->length = (row_height - 5.0) * scaler;
} }
latch = 0; latch = 0;