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

Update GS1 DataBar names

Browse Source 
To reflect changes made in 2011 revision of ISO/IEC 24724
This commit is contained in:
Robin Stuart 2016-02-17 13:01:56 +00:00
parent 0c42a2473e
commit 0f2abd1c64
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/rss.c
View File

@ -49,6 +49,18 @@
*/ */
/* Includes numerous bugfixes thanks to Pablo Orduña @ the PIRAmIDE project */ /* Includes numerous bugfixes thanks to Pablo Orduña @ the PIRAmIDE project */
/* Note: This code reflects the symbol names as used in ISO/IEC 24724:2006. These names
* were updated in ISO/IEC 24724:2011 as follows:
*
* RSS-14 > GS1 DataBar Omnidirectional
* RSS-14 Truncated > GS1 DataBar Truncated
* RSS-14 Stacked > GS1 DataBar Stacked
* RSS-14 Stacked Omnidirectional > GS1 DataBar Stacked Omnidirectional
* RSS Limited > GS1 DataBar Limited
* RSS Expanded > GS1 DataBar Expanded Omnidirectional
* RSS Expanded Stacked > GS1 DataBar Expanded Stacked Omnidirectional
*/
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

16
frontend_qt4/mainwindow.cpp
View File

@ -53,12 +53,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
"Code 49", "Code 49",
"Code 93", "Code 93",
"Code One", "Code One",
"Databar",
"Databar Expanded",
"Databar Expanded Stacked",
"Databar Limited",
"Databar Stacked",
"Databar Stacked Omnidirectional",
"Data Matrix (ISO 16022)", "Data Matrix (ISO 16022)",
"Deutsche Post Identcode", "Deutsche Post Identcode",
"Deutsche Post Leitcode", "Deutsche Post Leitcode",
@ -68,6 +62,12 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
"Facing Identification Mark (FIM)", "Facing Identification Mark (FIM)",
"Flattermarken", "Flattermarken",
"Grid Matrix", "Grid Matrix",
"GS1 DataBar Expanded Omnidirectional",
"GS1 DataBar Expanded Stacked Omnidirectional",
"GS1 DataBar Limited",
"GS1 DataBar Omnidirectional",
"GS1 DataBar Stacked",
"GS1 DataBar Stacked Omnidirectional",
"ITF-14", "ITF-14",
"International Standard Book Number (ISBN)", "International Standard Book Number (ISBN)",
"Japanese Postal Barcode", "Japanese Postal Barcode",
@ -184,7 +184,7 @@ void MainWindow::about()
"EN 797:1996, EN 798:1996, EN 12323:2005, ISO/IEC 15417:2007,<br>" "EN 797:1996, EN 798:1996, EN 12323:2005, ISO/IEC 15417:2007,<br>"
"ISO/IEC 15438:2006, ISO/IEC 16022:2006, ISO/IEC 16023:2000,<br>" "ISO/IEC 15438:2006, ISO/IEC 16022:2006, ISO/IEC 16023:2000,<br>"
"ISO/IEC 16388:2007, ISO/IEC 18004:2006, ISO/IEC 24723:2006,<br>" "ISO/IEC 16388:2007, ISO/IEC 18004:2006, ISO/IEC 24723:2006,<br>"
"ISO/IEC 24724:2006, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>" "ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
"ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000, ANSI/AIM BC12-1998,<br>" "ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000, ANSI/AIM BC12-1998,<br>"
"AIMD014 (v 1.63), USPS-B-3200</small></td></tr></table>" "AIMD014 (v 1.63), USPS-B-3200</small></td></tr></table>"
)); ));
@ -466,7 +466,7 @@ void MainWindow::change_options()
return; return;
m_optionWidget=uiload.load(&file); m_optionWidget=uiload.load(&file);
file.close(); file.close();
tabMain->insertTab(1,m_optionWidget,tr("DataBar Stacked")); tabMain->insertTab(1,m_optionWidget,tr("GS1 DataBar Stacked"));
connect(m_optionWidget->findChild<QObject*>("cmbCols"), SIGNAL(currentIndexChanged ( int )), SLOT(update_preview())); connect(m_optionWidget->findChild<QObject*>("cmbCols"), SIGNAL(currentIndexChanged ( int )), SLOT(update_preview()));
} }

12
frontend_qt4/mainwindow.h
View File

@ -60,12 +60,6 @@ public:
CODE49 =24, CODE49 =24,
CODE93 =25, CODE93 =25,
CODE_ONE =141, CODE_ONE =141,
RSS14 =29,
RSS_EXP =31,
RSS_EXPSTACK =81,
RSS_LTD =30,
RSS14STACK =79,
RSS14STACK_OMNI =80,
DATAMATRIX =71, DATAMATRIX =71,
DPIDENT =22, DPIDENT =22,
DPLEIT =21, DPLEIT =21,
@ -75,6 +69,12 @@ public:
FIM =49, FIM =49,
FLAT =28, FLAT =28,
GRIDMATRIX =142, GRIDMATRIX =142,
RSS_EXP =31,
RSS_EXPSTACK =81,
RSS_LTD =30,
RSS14 =29,
RSS14STACK =79,
RSS14STACK_OMNI =80,
ITF14 =89, ITF14 =89,
ISBNX =69, ISBNX =69,
JAPANPOST =76, JAPANPOST =76,