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

CODE16K fixes; separator default 1; raster/vector.c quiet_zones, output.c; #191

Browse source
This commit is contained in:
gitlost 2020-05-21 18:22:28 +01:00
parent 9f56a1c35e
commit 7be63a00b6
36 changed files with 1791 additions and 675 deletions
Download patch file Download diff file Expand all files Collapse all files

64
frontend_qt/grpC16k.ui
View file

@ -17,24 +17,70 @@
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QRadioButton" name="radC16kStand">
<widget class="QLabel" name="labelRowSeparatorHeight">
<property name="text">
<string>S&amp;tandard Mode</string>
<string>Row Separator Height:</string>
</property>
<property name="checked">
<bool>true</bool>
<property name="buddy">
<cstring>cmbC16kRowSepHeight</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radC16kGS1">
<property name="text">
<string>&amp;GS-1 Data Mode</string>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="cmbC16kRowSepHeight">
<item>
<property name="text">
<string>Default (1 X)</string>
</property>
</item>
<item>
<property name="text">
<string>2 X</string>
</property>
</item>
<item>
<property name="text">
<string>3 X</string>
</property>
</item>
<item>
<property name="text">
<string>4 X</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBoxEncodingMode">
<property name="title">
<string>Encoding Mode</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="QRadioButton" name="radC16kStand">
<property name="text">
<string>S&amp;tandard Mode</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radC16kGS1">
<property name="text">
<string>&amp;GS-1 Data Mode</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">

68
frontend_qt/grpC49.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>grpC16k</class>
<widget class="QWidget" name="grpC16k">
<class>grpC49</class>
<widget class="QWidget" name="grpC49">
<property name="geometry">
<rect>
<x>0</x>
@ -17,24 +17,70 @@
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QRadioButton" name="radC49Stand">
<widget class="QLabel" name="labelRowSeparatorHeight">
<property name="text">
<string>S&amp;tandard Mode</string>
<string>Row Separator Height:</string>
</property>
<property name="checked">
<bool>true</bool>
<property name="buddy">
<cstring>cmbC49RowSepHeight</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radC49GS1">
<property name="text">
<string>&amp;GS-1 Data Mode</string>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="cmbC49RowSepHeight">
<item>
<property name="text">
<string>Default (1 X)</string>
</property>
</item>
<item>
<property name="text">
<string>2 X</string>
</property>
</item>
<item>
<property name="text">
<string>3 X</string>
</property>
</item>
<item>
<property name="text">
<string>4 X</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBoxEncodingMode">
<property name="title">
<string>Encoding Mode</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="QRadioButton" name="radC49Stand">
<property name="text">
<string>S&amp;tandard Mode</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radC49GS1">
<property name="text">
<string>&amp;GS-1 Data Mode</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">

17
frontend_qt/grpCodablockF.ui
View file

@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QLabel" name="labelWidth">
<property name="text">
<string>S&amp;ymbol Width (Columns)</string>
<string>S&amp;ymbol Width (Columns):</string>
</property>
<property name="buddy">
<cstring>cmbCbfWidth</cstring>
@ -30,7 +30,7 @@
<widget class="QComboBox" name="cmbCbfWidth">
<item>
<property name="text">
<string>Default</string>
<string>Automatic</string>
</property>
</item>
<item>
@ -333,7 +333,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelHeight">
<property name="text">
<string>Symbo&amp;l Height (Rows)</string>
<string>Symbo&amp;l Height (Rows):</string>
</property>
<property name="buddy">
<cstring>cmbCbfHeight</cstring>
@ -344,7 +344,7 @@
<widget class="QComboBox" name="cmbCbfHeight">
<item>
<property name="text">
<string>Default</string>
<string>Automatic</string>
</property>
</item>
<item>
@ -572,7 +572,7 @@
<item row="2" column="0">
<widget class="QLabel" name="labelRowSeparatorHeight">
<property name="text">
<string>Row Separator Height</string>
<string>Row Separator Height:</string>
</property>
<property name="buddy">
<cstring>cmbCbfRowSepHeight</cstring>
@ -583,12 +583,7 @@
<widget class="QComboBox" name="cmbCbfRowSepHeight">
<item>
<property name="text">
<string>Default (2 X)</string>
</property>
</item>
<item>
<property name="text">
<string>1 X</string>
<string>Default (1 X)</string>
</property>
</item>
<item>

14
frontend_qt/mainwindow.cpp
View file

@ -516,6 +516,7 @@ void MainWindow::change_options()
m_optionWidget=uiload.load(&file);
file.close();
tabMain->insertTab(1,m_optionWidget,tr("Code 16K"));
connect(m_optionWidget->findChild<QObject*>("cmbC16kRowSepHeight"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("radC16kStand"), SIGNAL(toggled( bool )), SLOT(update_preview()));
}
@ -674,6 +675,7 @@ void MainWindow::change_options()
m_optionWidget=uiload.load(&file);
file.close();
tabMain->insertTab(1,m_optionWidget,tr("Code 49"));
connect(m_optionWidget->findChild<QObject*>("cmbC49RowSepHeight"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("radC49GS1"), SIGNAL(toggled( bool )), SLOT(update_preview()));
}
@ -946,6 +948,11 @@ void MainWindow::update_preview()
m_bc.bc.setInputMode(UNICODE_MODE);
else
m_bc.bc.setInputMode(GS1_MODE);
// Row separator height selection uses option 3 in zint_symbol
item_val = m_optionWidget->findChild<QComboBox*>("cmbC16kRowSepHeight")->currentIndex();
if (item_val) {
m_bc.bc.setOption3(item_val + 1); // Zero-based
}
break;
case BARCODE_CODABLOCKF:
@ -966,7 +973,7 @@ void MainWindow::update_preview()
// Row separator height selection uses option 3 in zint_symbol
item_val = m_optionWidget->findChild<QComboBox*>("cmbCbfRowSepHeight")->currentIndex();
if (item_val) {
m_bc.bc.setOption3(item_val);
m_bc.bc.setOption3(item_val + 1); // Zero-based
}
break;
@ -1078,6 +1085,11 @@ void MainWindow::update_preview()
m_bc.bc.setSymbol(BARCODE_CODE49);
if(m_optionWidget->findChild<QRadioButton*>("radC49GS1")->isChecked())
m_bc.bc.setInputMode(GS1_MODE);
// Row separator height selection uses option 3 in zint_symbol
item_val = m_optionWidget->findChild<QComboBox*>("cmbC49RowSepHeight")->currentIndex();
if (item_val) {
m_bc.bc.setOption3(item_val + 1); // Zero-based
}
break;
case BARCODE_HANXIN: