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

Add dot mode (experimental)

Browse Source 
First step towards solution for ticket #29
This commit is contained in:
Robin Stuart 2016-07-12 15:00:25 +01:00
parent 9011a96134
commit e39d2ff915
3 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
backend/svg.c
View File

@ -307,37 +307,47 @@ int svg_plot(struct zint_symbol *symbol) {
} }
row_posn += yoffset; row_posn += yoffset;
i = 0; if ((symbol->output_options & BARCODE_DOTTY_MODE) != 0) {
if (module_is_set(symbol, this_row, 0)) { /* Use (currently undocumented) dot mode - see SF ticket #29 */
latch = 1; for (i = 0; i < symbol->width; i++) {
} else { if (module_is_set(symbol, this_row, i)) {
latch = 0; fprintf(fsvg, " <circle cx=\"%.2f\" cy=\"%.2f\" r=\"%.2f\" fill=\"#%s\" />\n", ((i + xoffset) * scaler) + (scaler / 2.0), (row_posn * scaler) + (scaler / 2.0), (2.0 / 5.0) * scaler, symbol->fgcolour);
}
do {
block_width = 0;
do {
block_width++;
} while (module_is_set(symbol, this_row, i + block_width) == module_is_set(symbol, this_row, i));
if ((addon_latch == 0) && (r == (symbol->rows - 1)) && (i > main_width)) {
addon_text_posn = (row_posn + 8.0) * scaler;
addon_latch = 1;
}
if (latch == 1) {
/* a bar */
if (addon_latch == 0) {
fprintf(fsvg, " <rect x=\"%.2f\" y=\"%.2f\" width=\"%.2f\" height=\"%.2f\" />\n", (i + xoffset) * scaler, row_posn * scaler, block_width * scaler, row_height * scaler);
} else {
fprintf(fsvg, " <rect x=\"%.2f\" y=\"%.2f\" width=\"%.2f\" height=\"%.2f\" />\n", (i + xoffset) * scaler, (row_posn + 10.0) * scaler, block_width * scaler, (row_height - 5.0) * scaler);
} }
latch = 0;
} else {
/* a space */
latch = 1;
} }
i += block_width; } else {
/* Normal mode, with rectangles */
i = 0;
if (module_is_set(symbol, this_row, 0)) {
latch = 1;
} else {
latch = 0;
}
} while (i < symbol->width); do {
block_width = 0;
do {
block_width++;
} while (module_is_set(symbol, this_row, i + block_width) == module_is_set(symbol, this_row, i));
if ((addon_latch == 0) && (r == (symbol->rows - 1)) && (i > main_width)) {
addon_text_posn = (row_posn + 8.0) * scaler;
addon_latch = 1;
}
if (latch == 1) {
/* a bar */
if (addon_latch == 0) {
fprintf(fsvg, " <rect x=\"%.2f\" y=\"%.2f\" width=\"%.2f\" height=\"%.2f\" />\n", (i + xoffset) * scaler, row_posn * scaler, block_width * scaler, row_height * scaler);
} else {
fprintf(fsvg, " <rect x=\"%.2f\" y=\"%.2f\" width=\"%.2f\" height=\"%.2f\" />\n", (i + xoffset) * scaler, (row_posn + 10.0) * scaler, block_width * scaler, (row_height - 5.0) * scaler);
}
latch = 0;
} else {
/* a space */
latch = 1;
}
i += block_width;
} while (i < symbol->width);
}
} }
} }
/* That's done the actual data area, everything else is human-friendly */ /* That's done the actual data area, everything else is human-friendly */

1
backend/zint.h
View File

@ -200,6 +200,7 @@ extern "C" {
#define SMALL_TEXT 32 #define SMALL_TEXT 32
#define BOLD_TEXT 64 #define BOLD_TEXT 64
#define CMYK_COLOUR 128 #define CMYK_COLOUR 128
#define BARCODE_DOTTY_MODE 256
#define DATA_MODE 0 #define DATA_MODE 0
#define UNICODE_MODE 1 #define UNICODE_MODE 1

4
frontend/main.c
View File

@ -476,6 +476,7 @@ int main(int argc, char **argv) {
{"mirror", 0, 0, 0}, {"mirror", 0, 0, 0},
{"mirroreps", 0, 0, 0}, {"mirroreps", 0, 0, 0},
{"mirrorsvg", 0, 0, 0}, {"mirrorsvg", 0, 0, 0},
{"dotty", 0, 0, 0},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
c = getopt_long(argc, argv, "htb:w:d:o:i:rcmp", long_options, &option_index); c = getopt_long(argc, argv, "htb:w:d:o:i:rcmp", long_options, &option_index);
@ -501,6 +502,9 @@ int main(int argc, char **argv) {
if (!strcmp(long_options[option_index].name, "cmyk")) { if (!strcmp(long_options[option_index].name, "cmyk")) {
my_symbol->output_options += CMYK_COLOUR; my_symbol->output_options += CMYK_COLOUR;
} }
if (!strcmp(long_options[option_index].name, "dotty")) {
my_symbol->output_options += BARCODE_DOTTY_MODE;
}
if (!strcmp(long_options[option_index].name, "directeps")) { if (!strcmp(long_options[option_index].name, "directeps")) {
my_symbol->output_options += BARCODE_STDOUT; my_symbol->output_options += BARCODE_STDOUT;
strncpy(my_symbol->outfile, "dummy.eps", 10); strncpy(my_symbol->outfile, "dummy.eps", 10);