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 Data Matrix Rectangular Extension (DMRE) in regular distribution

Browse Source 
- add define "DM_DMRE	101" to zint.h as option_3 value
- add option "-dmre" to command line
- add ckeckbutton "Activate DMRE in automatic mode" to qzint
- make dmatrix.c/dmatrix.h aware of option_3 value DM_DMRE and include DMRE in automatic mode
- Use version 2.5 everywere (as already started by Robin)
- common test case for DMRE in automatic mode is numeric input data with 48 digits, which should lead to a symbol of size 8x64
This commit is contained in:
Harald Oehlmann
2016-02-27 21:26:52 +01:00
parent 0d7ee10ef5
commit 372994d794
13 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend_qt4/grpDM.ui
View File

@ -207,7 +207,6 @@
<string>16 x 48</string>
</property>
</item>
<!-- DMRE sizes commented out
<item>
<property name="text">
<string>8 x 48</string>
@ -268,7 +267,6 @@
<string>26 x 64</string>
</property>
</item>
-->
</widget>
</item>
</layout>
@ -283,6 +281,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkDMRE">
<property name="text">
<string>Allow DMRE in Automatic Mode</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">

2
frontend_qt4/mainWindow.ui
View File

@ -24,7 +24,7 @@
</size>
</property>
<property name="windowTitle">
<string>Zint Barcode Studio 2.4</string>
<string>Zint Barcode Studio 2.5</string>
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">

9
frontend_qt4/mainwindow.cpp
View File

@ -362,6 +362,7 @@ void MainWindow::change_options()
connect(m_optionWidget->findChild<QObject*>("radDM200HIBC"), SIGNAL(clicked( bool )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("cmbDM200Size"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("chkDMRectangle"), SIGNAL(stateChanged( int )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("chkDMRE"), SIGNAL(stateChanged( int )), SLOT(update_preview()));
}
if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_QRCODE)
@ -718,8 +719,12 @@ void MainWindow::update_preview()
m_bc.bc.setWidth(m_optionWidget->findChild<QComboBox*>("cmbDM200Size")->currentIndex());
if(m_optionWidget->findChild<QCheckBox*>("chkDMRectangle")->isChecked())
m_bc.bc.setOption3(DM_SQUARE);
else
m_bc.bc.setOption3(0);
else {
if(m_optionWidget->findChild<QCheckBox*>("chkDMRE")->isChecked())
m_bc.bc.setOption3(DM_DMRE);
else
m_bc.bc.setOption3(0);
}
break;
case BARCODE_QRCODE: