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

Changed rendering to use strings instead of a characters

Browse Source
This commit is contained in:
Sam Lown 2010-06-11 17:25:41 +02:00
parent e79076a218
commit 2cea2399d9
3 changed files with 56 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/library.c
View File

@ -96,7 +96,7 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
// If there is a rendered version, ensure it's memory is released // If there is a rendered version, ensure it's memory is released
if (symbol->rendered != NULL) { if (symbol->rendered != NULL) {
struct zint_render_line *line, *l; struct zint_render_line *line, *l;
struct zint_render_char *bchar, *bc; struct zint_render_string *string, *s;
// Free lines // Free lines
line = symbol->rendered->lines; line = symbol->rendered->lines;
@ -105,12 +105,13 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
line = line->next; line = line->next;
free(l); free(l);
} }
// Free Chars // Free Strings
bchar = symbol->rendered->chars; string = symbol->rendered->strings;
while (bchar) { while (string) {
bc = bchar; s = string;
bchar = bchar->next; string = string->next;
free(bc); free(s->text);
free(s);
} }
// Free Render // Free Render

117
backend/render.c
View File

@ -34,16 +34,16 @@
struct zint_render_line *render_plot_create_line(float x, float y, float width, float length); struct zint_render_line *render_plot_create_line(float x, float y, float width, float length);
int render_plot_add_line(struct zint_symbol *symbol, struct zint_render_line *line, struct zint_render_line **last_line); int render_plot_add_line(struct zint_symbol *symbol, struct zint_render_line *line, struct zint_render_line **last_line);
int render_plot_add_string(struct zint_symbol *symbol, char *text, float x, float y, float fsize, float scaler, struct zint_render_char **last_bchar); int render_plot_add_string(struct zint_symbol *symbol, char *text, float x, float y, float fsize, float width, struct zint_render_string **last_string);
int render_plot(struct zint_symbol *symbol, unsigned int hide_text) int render_plot(struct zint_symbol *symbol, unsigned int hide_text)
{ {
struct zint_render *render; struct zint_render *render;
struct zint_render_line *line, *last_line = NULL; struct zint_render_line *line, *last_line = NULL;
struct zint_render_char *bchar, *last_bchar = NULL; struct zint_render_string *last_string = NULL;
int i, r, block_width, latch, this_row; int i, r, block_width, latch, this_row;
float textpos, large_bar_height, preset_height, row_height, row_posn = 0.0; float textpos, textwidth, large_bar_height, preset_height, row_height, row_posn = 0.0;
// int error_number = 0; // int error_number = 0;
int textoffset, textheight, xoffset, yoffset, textdone, main_width; int textoffset, textheight, xoffset, yoffset, textdone, main_width;
char addon[6], textpart[10]; char addon[6], textpart[10];
@ -51,13 +51,12 @@ int render_plot(struct zint_symbol *symbol, unsigned int hide_text)
float addon_text_posn; float addon_text_posn;
float default_text_posn; float default_text_posn;
float scaler = symbol->scale; float scaler = symbol->scale;
unsigned char *p;
const char *locale = NULL; const char *locale = NULL;
// 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));
render->lines = NULL; render->lines = NULL;
render->chars = NULL; render->strings = NULL;
locale = setlocale(LC_ALL, "C"); locale = setlocale(LC_ALL, "C");
@ -281,22 +280,25 @@ int render_plot(struct zint_symbol *symbol, unsigned int hide_text)
} }
textpart[4] = '\0'; textpart[4] = '\0';
textpos = 17; textpos = 17;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, scaler, &last_bchar); textwidth = 28.0;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, textwidth * scaler, &last_string);
for(i = 0; i < 4; i++) { for(i = 0; i < 4; i++) {
textpart[i] = symbol->text[i + 4]; textpart[i] = symbol->text[i + 4];
} }
textpart[4] = '\0'; textpart[4] = '\0';
textpos = 50; textpos = 50;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, scaler, &last_bchar); render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, textwidth * scaler, &last_string);
textdone = 1; textdone = 1;
switch(strlen(addon)) { switch(strlen(addon)) {
case 2: case 2:
textpos = xoffset + 86; textpos = xoffset + 86;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, scaler, &last_bchar); textwidth = 2.0 * 7.0;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, textwidth * scaler, &last_string);
break; break;
case 5: case 5:
textpos = xoffset + 100; textpos = xoffset + 100;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, scaler, &last_bchar); textwidth = 5.0 * 7.0;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, textwidth * scaler, &last_string);
break; break;
} }
@ -320,29 +322,33 @@ int render_plot(struct zint_symbol *symbol, unsigned int hide_text)
textpart[0] = symbol->text[0]; textpart[0] = symbol->text[0];
textpart[1] = '\0'; textpart[1] = '\0';
textpos = -5; // 7 textpos = -5; // 7
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, scaler, &last_bchar); textwidth = 7.0;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, textwidth * scaler, &last_string);
for(i = 0; i < 6; i++) { for(i = 0; i < 6; i++) {
textpart[i] = symbol->text[i + 1]; textpart[i] = symbol->text[i + 1];
} }
textpart[6] = '\0'; textpart[6] = '\0';
textpos = 27; textpos = 25;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, scaler, &last_bchar); textwidth = 6.0 * 7.0;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, textwidth * scaler, &last_string);
for(i = 0; i < 6; i++) { for(i = 0; i < 6; i++) {
textpart[i] = symbol->text[i + 7]; textpart[i] = symbol->text[i + 7];
} }
textpart[6] = '\0'; textpart[6] = '\0';
textpos = 74; textpos = 72;
render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, scaler, &last_bchar); render_plot_add_string(symbol, textpart, (textpos + xoffset) * scaler, default_text_posn, 9.0 * scaler, textwidth * scaler, &last_string);
textdone = 1; textdone = 1;
switch(strlen(addon)) { switch(strlen(addon)) {
case 2: case 2:
textpos = xoffset + 114; textpos = xoffset + 114;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, scaler, &last_bchar); textwidth = 2.0 * 7.0;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, textwidth * scaler, &last_string);
break; break;
case 5: case 5:
textpos = xoffset + 128; textpos = xoffset + 128;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, scaler, &last_bchar); textwidth = 5.0 * 7.0;
render_plot_add_string(symbol, addon, textpos * scaler, addon_text_posn * scaler, 9.0 * scaler, textwidth * scaler, &last_string);
break; break;
} }
break; break;
@ -352,34 +358,7 @@ int render_plot(struct zint_symbol *symbol, unsigned int hide_text)
/* Put normal human readable text at the bottom (and centered) */ /* Put normal human readable text at the bottom (and centered) */
if (textdone == 0) { if (textdone == 0) {
// caculate start xoffset to center text // caculate start xoffset to center text
xoffset = symbol->width / 2.0; render_plot_add_string(symbol, (char *) symbol->text, (symbol->width / 2.0) * scaler, default_text_posn, 9.0 * scaler, 0.0, &last_string);
xoffset -= (strlen((char *) symbol->text) / 2) * 5.0;
for (p = symbol->text; *p != 0; p++) {
if (p != symbol->text && *p == '(') xoffset += 3.0;
bchar = malloc(sizeof(struct zint_render_char));
bchar->next = NULL;
bchar->x = (textpos + xoffset) * scaler;
bchar->y = default_text_posn;
bchar->fsize = 9.0 * scaler;
bchar->c = (char) *p;
if (last_bchar)
last_bchar->next = bchar;
else
render->chars = bchar; // First character
last_bchar = bchar;
// Poor mans kerning for next character
if (*p == '(') {
xoffset += 3.0;
} else if (*p == ')') {
xoffset += 3.0;
} else {
xoffset += 5.0;
}
}
} }
} }
@ -426,39 +405,29 @@ int render_plot_add_line(struct zint_symbol *symbol, struct zint_render_line *li
} }
/* /*
* Add the provided string by spliting it into substrings and adding * Add a string structure to the symbol.
* at the provided coordinates. * Coordinates assumed to be from top-center.
* This will center the string at the provided location.
*/ */
int render_plot_add_string(struct zint_symbol *symbol, int render_plot_add_string(struct zint_symbol *symbol,
char *text, float x, float y, float fsize, float scaler, char *text, float x, float y, float fsize, float width,
struct zint_render_char **last_bchar) struct zint_render_string **last_string)
{ {
struct zint_render_char *bchar; struct zint_render_string *string;
char *p;
int xoffset = x;
float width = 0.0;
float char_width = 7.0 * scaler;
width = ustrlen((unsigned char *) text) * char_width; string = malloc(sizeof(struct zint_render_string));
xoffset -= (width / 2.0); // Center string->next = NULL;
string->x = x;
string->y = y;
string->width = width;
string->fsize = fsize;
string->text = malloc(sizeof(char) * (ustrlen((unsigned char *) text) + 1));
strcpy(string->text, text);
for (p = text; *p != 0; p++) { if (*last_string)
bchar = malloc(sizeof(struct zint_render_char)); (*last_string)->next = string;
bchar->next = NULL; else
bchar->x = xoffset; symbol->rendered->strings = string; // First character
bchar->y = y; *last_string = string;
bchar->fsize = fsize;
bchar->c = (char) *p;
if (*last_bchar)
(*last_bchar)->next = bchar;
else
symbol->rendered->chars = bchar; // First character
*last_bchar = bchar;
xoffset += char_width;
}
return 1; return 1;
} }

9
backend/zint.h
View File

@ -30,16 +30,17 @@ struct zint_render_line {
struct zint_render_line *next; /* Pointer to next line */ struct zint_render_line *next; /* Pointer to next line */
}; };
struct zint_render_char { struct zint_render_string {
float x, y, fsize; float x, y, fsize;
char c; float width; /* Suggested string width, may be 0 if none recommended */
struct zint_render_char *next; /* Pointer to next character */ char *text;
struct zint_render_string *next; /* Pointer to next character */
}; };
struct zint_render { struct zint_render {
float width, height; float width, height;
struct zint_render_line *lines; /* Pointer to first line */ struct zint_render_line *lines; /* Pointer to first line */
struct zint_render_char *chars; /* Pointer to first character */ struct zint_render_string *strings; /* Pointer to first string */
}; };
struct zint_symbol { struct zint_symbol {