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

DATAMATRIX: new algorithm for (near-)minimal encoding, props Alex Geller

Browse Source 
Add FAST_MODE input_mode flag and --fast CLI/Tcl option that selects older
  faster ISO algorithm (may be used by other symbologies in the future)
  and "Fast Encoding" checkbox to Data Matrix GUI
GUI: adds Zint version numbers to DATAMATRIX sizes.
This commit is contained in:
gitlost
2021-12-18 16:22:02 +00:00
parent caadc87f7e
commit b36fba8ba6
28 changed files with 4578 additions and 2298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
frontend_qt/grpDM.ui
View File

@ -50,242 +50,242 @@
</item>
<item>
<property name="text">
<string>10 x 10</string>
<string>10 x 10 (Zint 1)</string>
</property>
</item>
<item>
<property name="text">
<string>12 x 12</string>
<string>12 x 12 (Zint 2)</string>
</property>
</item>
<item>
<property name="text">
<string>14 x 14</string>
<string>14 x 14 (Zint 3)</string>
</property>
</item>
<item>
<property name="text">
<string>16 x 16</string>
<string>16 x 16 (Zint 4)</string>
</property>
</item>
<item>
<property name="text">
<string>18 x 18</string>
<string>18 x 18 (Zint 5)</string>
</property>
</item>
<item>
<property name="text">
<string>20 x 20</string>
<string>20 x 20 (Zint 6)</string>
</property>
</item>
<item>
<property name="text">
<string>22 x 22</string>
<string>22 x 22 (Zint 7)</string>
</property>
</item>
<item>
<property name="text">
<string>24 x 24</string>
<string>24 x 24 (Zint 8)</string>
</property>
</item>
<item>
<property name="text">
<string>26 x 26</string>
<string>26 x 26 (Zint 9)</string>
</property>
</item>
<item>
<property name="text">
<string>32 x 32</string>
<string>32 x 32 (Zint 10)</string>
</property>
</item>
<item>
<property name="text">
<string>36 x 36</string>
<string>36 x 36 (Zint 11)</string>
</property>
</item>
<item>
<property name="text">
<string>40 x 40</string>
<string>40 x 40 (Zint 12)</string>
</property>
</item>
<item>
<property name="text">
<string>44 x 44</string>
<string>44 x 44 (Zint 13)</string>
</property>
</item>
<item>
<property name="text">
<string>48 x 48</string>
<string>48 x 48 (Zint 14)</string>
</property>
</item>
<item>
<property name="text">
<string>52 x 52</string>
<string>52 x 52 (Zint 15)</string>
</property>
</item>
<item>
<property name="text">
<string>64 x 64</string>
<string>64 x 64 (Zint 16)</string>
</property>
</item>
<item>
<property name="text">
<string>72 x 72</string>
<string>72 x 72 (Zint 17)</string>
</property>
</item>
<item>
<property name="text">
<string>80 x 80</string>
<string>80 x 80 (Zint 18)</string>
</property>
</item>
<item>
<property name="text">
<string>88 x 88</string>
<string>88 x 88 (Zint 19)</string>
</property>
</item>
<item>
<property name="text">
<string>96 x 96</string>
<string>96 x 96 (Zint 20)</string>
</property>
</item>
<item>
<property name="text">
<string>104 x 104</string>
<string>104 x 104 (Zint 21)</string>
</property>
</item>
<item>
<property name="text">
<string>120 x 120</string>
<string>120 x 120 (Zint 22)</string>
</property>
</item>
<item>
<property name="text">
<string>132 x 132</string>
<string>132 x 132 (Zint 23)</string>
</property>
</item>
<item>
<property name="text">
<string>144 x 144</string>
<string>144 x 144 (Zint 24)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 18</string>
<string>8 x 18 (Zint 25)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 32</string>
<string>8 x 32 (Zint 26)</string>
</property>
</item>
<item>
<property name="text">
<string>12 x 26</string>
<string>12 x 26 (Zint 27)</string>
</property>
</item>
<item>
<property name="text">
<string>12 x 36</string>
<string>12 x 36 (Zint 28)</string>
</property>
</item>
<item>
<property name="text">
<string>16 x 36</string>
<string>16 x 36 (Zint 29)</string>
</property>
</item>
<item>
<property name="text">
<string>16 x 48</string>
<string>16 x 48 (Zint 30)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 48 (DMRE)</string>
<string>8 x 48 (DMRE) (Zint 31)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 64 (DMRE)</string>
<string>8 x 64 (DMRE) (Zint 32)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 80 (DMRE)</string>
<string>8 x 80 (DMRE) (Zint 33)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 96 (DMRE)</string>
<string>8 x 96 (DMRE) (Zint 34)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 120 (DMRE)</string>
<string>8 x 120 (DMRE) (Zint 35)</string>
</property>
</item>
<item>
<property name="text">
<string>8 x 144 (DMRE)</string>
<string>8 x 144 (DMRE) (Zint 36)</string>
</property>
</item>
<item>
<property name="text">
<string>12 x 64 (DMRE)</string>
<string>12 x 64 (DMRE) (Zint 37)</string>
</property>
</item>
<item>
<property name="text">
<string>12 x 88 (DMRE)</string>
<string>12 x 88 (DMRE) (Zint 38)</string>
</property>
</item>
<item>
<property name="text">
<string>16 x 64 (DMRE)</string>
<string>16 x 64 (DMRE) (Zint 39)</string>
</property>
</item>
<item>
<property name="text">
<string>20 x 36 (DMRE)</string>
<string>20 x 36 (DMRE) (Zint 40)</string>
</property>
</item>
<item>
<property name="text">
<string>20 x 44 (DMRE)</string>
<string>20 x 44 (DMRE) (Zint 41)</string>
</property>
</item>
<item>
<property name="text">
<string>20 x 64 (DMRE)</string>
<string>20 x 64 (DMRE) (Zint 42)</string>
</property>
</item>
<item>
<property name="text">
<string>22 x 48 (DMRE)</string>
<string>22 x 48 (DMRE) (Zint 43)</string>
</property>
</item>
<item>
<property name="text">
<string>24 x 48 (DMRE)</string>
<string>24 x 48 (DMRE) (Zint 44)</string>
</property>
</item>
<item>
<property name="text">
<string>24 x 64 (DMRE)</string>
<string>24 x 64 (DMRE) (Zint 45)</string>
</property>
</item>
<item>
<property name="text">
<string>26 x 40 (DMRE)</string>
<string>26 x 40 (DMRE) (Zint 46)</string>
</property>
</item>
<item>
<property name="text">
<string>26 x 48 (DMRE)</string>
<string>26 x 48 (DMRE) (Zint 47)</string>
</property>
</item>
<item>
<property name="text">
<string>26 x 64 (DMRE)</string>
<string>26 x 64 (DMRE) (Zint 48)</string>
</property>
</item>
</widget>
@ -407,6 +407,20 @@ instead of the preferred FNC1
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkDMFast">
<property name="text">
<string>&amp;Fast encoding</string>
</property>
<property name="toolTip">
<string>Use a faster but less optimal algorithm
for encoding the data</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBoxDMStructApp">
<property name="title">

7
frontend_qt/mainwindow.cpp
View File

@ -1233,6 +1233,7 @@ void MainWindow::change_options()
connect(get_widget(QSL("chkDMRectangle")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkDMRE")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkDMGSSep")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkDMFast")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("cmbDMStructAppCount")), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(get_widget(QSL("cmbDMStructAppCount")), SIGNAL(currentIndexChanged( int )), SLOT(structapp_ui_set()));
connect(get_widget(QSL("cmbDMStructAppIndex")), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
@ -2024,6 +2025,10 @@ void MainWindow::update_preview()
m_bc.bc.setOption3(0);
}
if (get_chk_val(QSL("chkDMFast"))) {
m_bc.bc.setInputMode(FAST_MODE | m_bc.bc.inputMode());
}
if ((item_val = get_cmb_index(QSL("cmbDMStructAppCount"))) != 0) {
QString id;
int id1 = get_spn_val(QSL("spnDMStructAppID"));
@ -2884,6 +2889,7 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology)
settings.setValue(QSL("studio/bc/datamatrix/chk_suppress_rect"), get_chk_val(QSL("chkDMRectangle")));
settings.setValue(QSL("studio/bc/datamatrix/chk_allow_dmre"), get_chk_val(QSL("chkDMRE")));
settings.setValue(QSL("studio/bc/datamatrix/chk_gs_sep"), get_chk_val(QSL("chkDMGSSep")));
settings.setValue(QSL("studio/bc/datamatrix/chk_fast"), get_chk_val(QSL("chkDMFast")));
settings.setValue(QSL("studio/bc/datamatrix/structapp_count"), get_cmb_index(QSL("cmbDMStructAppCount")));
settings.setValue(QSL("studio/bc/datamatrix/structapp_index"), get_cmb_index(QSL("cmbDMStructAppIndex")));
settings.setValue(QSL("studio/bc/datamatrix/structapp_id"), get_spn_val(QSL("spnDMStructAppID")));
@ -3259,6 +3265,7 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
set_chk_from_setting(settings, QSL("studio/bc/datamatrix/chk_suppress_rect"), QSL("chkDMRectangle"));
set_chk_from_setting(settings, QSL("studio/bc/datamatrix/chk_allow_dmre"), QSL("chkDMRE"));
set_chk_from_setting(settings, QSL("studio/bc/datamatrix/chk_gs_sep"), QSL("chkDMGSSep"));
set_chk_from_setting(settings, QSL("studio/bc/datamatrix/chk_fast"), QSL("chkDMFast"));
set_cmb_from_setting(settings, QSL("studio/bc/datamatrix/structapp_count"), QSL("cmbDMStructAppCount"));
set_cmb_from_setting(settings, QSL("studio/bc/datamatrix/structapp_index"), QSL("cmbDMStructAppIndex"));
set_spn_from_setting(settings, QSL("studio/bc/datamatrix/structapp_id"), QSL("spnDMStructAppID"), 1);