mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-16 08:04:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

UPC/EAN: Add guard_bar descent (guard_descent)

Browse source 
zint.h: Adjust field order to improve alignments; encoded_data 143 -> 144
This commit is contained in:
gitlost 2021-09-22 00:04:15 +01:00
parent 9bae0b86f9
commit 4009c86c5f
18 changed files with 791 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

50
backend_qt/qzint.cpp
View file

@ -37,27 +37,26 @@ namespace Zint {
static const int fontSizeError = 14; /* Point size */
QZint::QZint() {
m_zintSymbol = NULL;
m_symbol = BARCODE_CODE128;
m_height = 0.0f;
m_borderType = 0;
m_borderWidth = 0;
m_fontSetting = 0;
m_option_1 = -1;
m_option_2 = 0;
m_option_3 = 0;
m_fgColor = Qt::black;
m_bgColor = Qt::white;
m_cmyk = false;
m_zintSymbol = NULL;
m_error = 0;
m_input_mode = UNICODE_MODE;
m_scale = 1.0f;
m_option_3 = 0;
m_show_hrt = 1;
m_eci = 0;
m_dotty = false;
m_dot_size = 4.0f / 5.0f;
target_size_horiz = 0;
target_size_vert = 0;
m_option_2 = 0;
m_guardDescent = 5.0f;
m_whitespace = 0;
m_vwhitespace = 0;
m_gs1parens = false;
@ -66,6 +65,9 @@ namespace Zint {
m_reader_init = false;
m_rotate_angle = 0;
m_debug = false;
target_size_horiz = 0; /* Legacy */
target_size_vert = 0; /* Legacy */
}
QZint::~QZint() {
@ -86,15 +88,16 @@ namespace Zint {
m_zintSymbol->whitespace_height = m_vwhitespace;
m_zintSymbol->border_width = m_borderWidth;
m_zintSymbol->option_1 = m_option_1;
m_zintSymbol->input_mode = m_input_mode;
m_zintSymbol->option_2 = m_option_2;
m_zintSymbol->option_3 = m_option_3;
m_zintSymbol->input_mode = m_input_mode;
if (m_dotty) {
m_zintSymbol->output_options |= BARCODE_DOTTY_MODE;
}
m_zintSymbol->dot_size = m_dot_size;
m_zintSymbol->guard_descent = m_guardDescent;
m_zintSymbol->show_hrt = m_show_hrt ? 1 : 0;
m_zintSymbol->eci = m_eci;
m_zintSymbol->option_3 = m_option_3;
m_zintSymbol->scale = m_scale;
if (m_gs1parens) {
m_zintSymbol->input_mode |= GS1PARENS_MODE;
@ -183,6 +186,14 @@ namespace Zint {
m_height = height;
}
int QZint::option1() const {
return m_option_1;
}
void QZint::setOption1(int option_1) {
m_option_1 = option_1;
}
int QZint::option2() const {
return m_option_2;
}
@ -219,6 +230,14 @@ namespace Zint {
m_dot_size = dot_size;
}
float QZint::guardDescent() const {
return m_guardDescent;
}
void QZint::setGuardDescent(float guardDescent) {
m_guardDescent = guardDescent;
}
QColor QZint::fgColor() const {
return m_fgColor;
}
@ -271,14 +290,6 @@ namespace Zint {
m_vwhitespace = vwhitespace;
}
int QZint::option1() const {
return m_option_1;
}
void QZint::setOption1(int option_1) {
m_option_1 = option_1;
}
void QZint::setFontSetting(int fontSettingIndex) {
if (fontSettingIndex == 1) {
m_fontSetting = BOLD_TEXT;
@ -295,11 +306,6 @@ namespace Zint {
m_show_hrt = show;
}
void QZint::setTargetSize(int width, int height) {
target_size_horiz = width;
target_size_vert = height;
}
void QZint::setGSSep(bool gssep) {
m_gssep = gssep;
}
@ -358,6 +364,10 @@ namespace Zint {
void QZint::setPdf417CodeWords(int /*pdf417CodeWords*/) {}
int QZint::pdf417CodeWords() const { return 0; }
void QZint::setHideText(bool hide) { setShowText(!hide); }
void QZint::setTargetSize(int width, int height) {
target_size_horiz = width;
target_size_vert = height;
}
bool QZint::hasHRT(int symbology) const {
return ZBarcode_Cap(symbology ? symbology : m_symbol, ZINT_CAP_HRT);

22
backend_qt/qzint.h
View file

@ -52,6 +52,9 @@ public:
float height() const;
void setHeight(float height);
int option1() const;
void setOption1(int option_1);
int option2() const;
void setOption2(int option);
@ -66,6 +69,9 @@ public:
void setDotSize(float dot_size);
float guardDescent() const;
void setGuardDescent(float guardDescent);
QColor fgColor() const;
void setFgColor(const QColor& fgColor);
@ -80,9 +86,6 @@ public:
int borderWidth() const;
void setBorderWidth(int boderWidth);
int option1() const;
void setOption1(int option_1);
void setWhitespace(int whitespace);
void setVWhitespace(int vwhitespace);
@ -91,8 +94,6 @@ public:
void setShowText(bool show);
void setTargetSize(int width, int height);
void setGSSep(bool gssep);
int rotateAngle() const;
@ -116,6 +117,7 @@ public:
void setPdf417CodeWords(int pdf417CodeWords); /* no op */
int pdf417CodeWords() const;
void setHideText(bool hide); /* setShowText(!hide) */
void setTargetSize(int width, int height);
/* Test capabilities - ZBarcode_Cap() */
bool hasHRT(int symbology = 0) const;
@ -156,8 +158,9 @@ private:
int m_borderType;
int m_borderWidth;
int m_fontSetting;
int m_option_2;
int m_option_1;
int m_option_2;
int m_option_3;
int m_input_mode;
QColor m_fgColor;
QColor m_bgColor;
@ -168,19 +171,20 @@ private:
int m_vwhitespace;
zint_symbol * m_zintSymbol;
float m_scale;
int m_option_3;
bool m_show_hrt;
int m_eci;
int m_rotate_angle;
bool m_dotty;
float m_dot_size;
int target_size_horiz;
int target_size_vert;
float m_guardDescent;
bool m_gs1parens;
bool m_gs1nocheck;
bool m_gssep;
bool m_reader_init;
bool m_debug;
int target_size_horiz; /* Legacy */
int target_size_vert; /* Legacy */
};
}