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

Change default borderwidth to 0 in Qt front end

Browse Source 
Also correctly draw boxes and binding for Code 49, ITF-14 etc.
Fixes #67, Bug reported by Jim R
This commit is contained in:
Robin Stuart 2017-06-17 15:17:24 +01:00
parent c0e95684a9
commit 3a24230cd0
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backend_qt/qzint.cpp
View File

@ -30,7 +30,7 @@ namespace Zint {
m_symbol = BARCODE_CODE128; m_symbol = BARCODE_CODE128;
m_height = 50; m_height = 50;
m_border = NO_BORDER; m_border = NO_BORDER;
m_borderWidth = 1; m_borderWidth = 0;
m_securityLevel = -1; m_securityLevel = -1;
m_pdf417CodeWords = 928; m_pdf417CodeWords = 928;
m_fgColor = Qt::black; m_fgColor = Qt::black;
@ -94,7 +94,7 @@ namespace Zint {
case 4: m_border = BOX; case 4: m_border = BOX;
break; break;
} }
m_borderWidth = (BorderType) m_zintSymbol->border_width; m_borderWidth = m_zintSymbol->border_width;
m_whitespace = m_zintSymbol->whitespace_width; m_whitespace = m_zintSymbol->whitespace_width;
} }
@ -194,8 +194,8 @@ namespace Zint {
} }
void QZint::setBorderWidth(int boderWidth) { void QZint::setBorderWidth(int boderWidth) {
if (boderWidth < 1 || boderWidth > 16) if (boderWidth < 0 || boderWidth > 16)
boderWidth = 1; boderWidth = 0;
m_borderWidth = boderWidth; m_borderWidth = boderWidth;
} }
@ -347,8 +347,8 @@ namespace Zint {
qreal gwidth = m_zintSymbol->width; qreal gwidth = m_zintSymbol->width;
qreal gheight = m_zintSymbol->height; qreal gheight = m_zintSymbol->height;
if (m_zintSymbol->symbology == BARCODE_MAXICODE) { if (m_zintSymbol->symbology == BARCODE_MAXICODE) {
gwidth = (33.0 * maxi_width) + xoffset + xoffset; gwidth = (33.0 * maxi_width);
gheight = (32.0 * maxi_width) + yoffset + yoffset; gheight = (32.0 * maxi_width);
} }
if (m_zintSymbol->output_options & BARCODE_DOTTY_MODE) { if (m_zintSymbol->output_options & BARCODE_DOTTY_MODE) {
@ -394,19 +394,19 @@ namespace Zint {
switch (m_border) { switch (m_border) {
case BOX: case BOX:
painter.fillRect(0, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor)); painter.fillRect(0, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor));
painter.fillRect(m_zintSymbol->width + xoffset + xoffset + m_borderWidth, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor)); painter.fillRect(m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width + m_borderWidth, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor));
painter.fillRect(0, 0, m_zintSymbol->width + xoffset + xoffset + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor)); painter.fillRect(0, 0, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor));
painter.fillRect(0, m_zintSymbol->height + m_borderWidth, m_zintSymbol->width + xoffset + xoffset + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor)); painter.fillRect(0, m_zintSymbol->height + m_borderWidth, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor));
painter.translate(m_borderWidth + m_zintSymbol->whitespace_width, m_borderWidth); painter.translate(m_borderWidth + m_zintSymbol->whitespace_width, m_borderWidth);
yoffset = m_borderWidth; yoffset = m_borderWidth;
break; break;
case BIND: case BIND:
if (m_zintSymbol->symbology != BARCODE_CODABLOCKF) { if (m_zintSymbol->symbology != BARCODE_CODABLOCKF) {
painter.fillRect(0, 0, m_zintSymbol->width + xoffset + xoffset, m_borderWidth, QBrush(m_fgColor)); painter.fillRect(0, 0, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width, m_borderWidth, QBrush(m_fgColor));
painter.fillRect(0, m_zintSymbol->height, m_zintSymbol->width + xoffset + xoffset, m_borderWidth, QBrush(m_fgColor)); painter.fillRect(0, m_zintSymbol->height, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width, m_borderWidth, QBrush(m_fgColor));
} else { } else {
painter.fillRect(xoffset, 0, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor)); painter.fillRect(m_zintSymbol->whitespace_width, 0, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor));
painter.fillRect(xoffset, m_zintSymbol->height, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor)); painter.fillRect(m_zintSymbol->whitespace_width, m_zintSymbol->height, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor));
} }
painter.translate(m_zintSymbol->whitespace_width, m_borderWidth); painter.translate(m_zintSymbol->whitespace_width, m_borderWidth);
yoffset = m_borderWidth; yoffset = m_borderWidth;
@ -415,7 +415,6 @@ namespace Zint {
default: default:
painter.translate(m_zintSymbol->whitespace_width, 0); painter.translate(m_zintSymbol->whitespace_width, 0);
break; break;
;
} }
} }