diff --git a/backend_qt4/qzint.cpp b/backend_qt4/qzint.cpp
index 25bd72ae..93dd956f 100644
--- a/backend_qt4/qzint.cpp
+++ b/backend_qt4/qzint.cpp
@@ -488,7 +488,7 @@ namespace Zint {
for (int c = 0; c < m_zintSymbol->width; c++) {
if (module_set(r, c)) {
- painter.drawEllipse(QPointF((r + 1.0), (c + 1.0)), 0.5, 0.5);
+ painter.drawEllipse(QPointF((c + 1.0), (r + 1.0)), 0.5, 0.5);
}
}
}
diff --git a/frontend_qt4/frontend_qt4.pro b/frontend_qt4/frontend_qt4.pro
index 6715cfe2..c2eefa36 100644
--- a/frontend_qt4/frontend_qt4.pro
+++ b/frontend_qt4/frontend_qt4.pro
@@ -1,66 +1,67 @@
-######################################################################
-# Automatically generated by qmake (2.01a) sub 29. kol 22:15:57 2009
-######################################################################
-
-
-TEMPLATE = app
-TARGET = qtZint
-DEPENDPATH += . debug release
-INCLUDEPATH += .
-
-# Input
-HEADERS += barcodeitem.h \
- datawindow.h \
- exportwindow.h \
- mainwindow.h \
- sequencewindow.h
-
-FORMS += extData.ui \
- extExport.ui \
- extSequence.ui \
- grpAztec.ui \
- grpC128.ui \
- grpC16k.ui \
- grpC39.ui \
- grpC49.ui \
- grpChannel.ui \
- grpCodeOne.ui \
- grpDBExtend.ui \
- grpDM.ui \
- grpGrid.ui \
- grpMaxicode.ui \
- grpMicroPDF.ui \
- grpMQR.ui \
- grpMSICheck.ui \
- grpPDF417.ui \
- grpQR.ui \
- grpHX.ui \
- mainWindow.ui
-
-SOURCES += barcodeitem.cpp \
- datawindow.cpp \
- exportwindow.cpp \
- main.cpp \
- mainwindow.cpp \
- sequencewindow.cpp
-
-TRANSLATIONS = frontend_de.ts
-
-RESOURCES += resources.qrc
-
-# Static target following http://qt-project.org/wiki/Build_Standalone_Qt_Application_for_Windows
-CONFIG += static
-
-CONFIG += warn_on thread qt uitools
-
-INCLUDEPATH += ../backend_qt4 ../backend
-
-LIBS += -lqtzint -lQtCore
-QMAKE_LIBDIR += ../backend_qt4/release
-
-!contains(DEFINES, NO_PNG) {
- LIBS += -llibpng -lzlib
- QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release ../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release\zlib
-# LIBS += -llibpng16 -lzlib1
-# QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_DLL_Release ../../lpng\projects\visualc71_converted_to_9\Win32_DLL_Release\zlib
-}
+######################################################################
+# Automatically generated by qmake (2.01a) sub 29. kol 22:15:57 2009
+######################################################################
+
+
+TEMPLATE = app
+TARGET = qtZint
+DEPENDPATH += . debug release
+INCLUDEPATH += .
+
+# Input
+HEADERS += barcodeitem.h \
+ datawindow.h \
+ exportwindow.h \
+ mainwindow.h \
+ sequencewindow.h
+
+FORMS += extData.ui \
+ extExport.ui \
+ extSequence.ui \
+ grpAztec.ui \
+ grpC128.ui \
+ grpC16k.ui \
+ grpC39.ui \
+ grpC49.ui \
+ grpChannel.ui \
+ grpCodeOne.ui \
+ grpDBExtend.ui \
+ grpDM.ui \
+ grpGrid.ui \
+ grpMaxicode.ui \
+ grpMicroPDF.ui \
+ grpMQR.ui \
+ grpMSICheck.ui \
+ grpPDF417.ui \
+ grpQR.ui \
+ grpHX.ui \
+ mainWindow.ui \
+ grpDotCode.ui
+
+SOURCES += barcodeitem.cpp \
+ datawindow.cpp \
+ exportwindow.cpp \
+ main.cpp \
+ mainwindow.cpp \
+ sequencewindow.cpp
+
+TRANSLATIONS = frontend_de.ts
+
+RESOURCES += resources.qrc
+
+# Static target following http://qt-project.org/wiki/Build_Standalone_Qt_Application_for_Windows
+CONFIG += static
+
+CONFIG += warn_on thread qt uitools
+
+INCLUDEPATH += ../backend_qt4 ../backend
+
+LIBS += -lqtzint -lQtCore
+QMAKE_LIBDIR += ../backend_qt4/release
+
+!contains(DEFINES, NO_PNG) {
+ LIBS += -llibpng -lzlib
+ QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release ../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release\zlib
+# LIBS += -llibpng16 -lzlib1
+# QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_DLL_Release ../../lpng\projects\visualc71_converted_to_9\Win32_DLL_Release\zlib
+}
diff --git a/frontend_qt4/grpDotCode.ui b/frontend_qt4/grpDotCode.ui
new file mode 100644
index 00000000..b39cc75c
--- /dev/null
+++ b/frontend_qt4/grpDotCode.ui
@@ -0,0 +1,353 @@
+
+
+ grpDotCode
+
+
+
+ 0
+ 0
+ 390
+ 223
+
+
+
+ Form
+
+
+ -
+
+
-
+
+
+ 11
+
+
-
+
+ Automatic
+
+
+ -
+
+ 1
+
+
+ -
+
+ 2
+
+
+ -
+
+ 3
+
+
+ -
+
+ 4
+
+
+ -
+
+ 5
+
+
+ -
+
+ 6
+
+
+ -
+
+ 7
+
+
+ -
+
+ 8
+
+
+ -
+
+ 9
+
+
+ -
+
+ 10
+
+
+ -
+
+ 11
+
+
+ -
+
+ 12
+
+
+ -
+
+ 13
+
+
+ -
+
+ 14
+
+
+ -
+
+ 15
+
+
+ -
+
+ 16
+
+
+ -
+
+ 17
+
+
+ -
+
+ 18
+
+
+ -
+
+ 19
+
+
+ -
+
+ 20
+
+
+ -
+
+ 21
+
+
+ -
+
+ 22
+
+
+ -
+
+ 23
+
+
+ -
+
+ 24
+
+
+ -
+
+ 25
+
+
+ -
+
+ 26
+
+
+ -
+
+ 27
+
+
+ -
+
+ 28
+
+
+ -
+
+ 29
+
+
+ -
+
+ 30
+
+
+ -
+
+ 31
+
+
+ -
+
+ 32
+
+
+ -
+
+ 33
+
+
+ -
+
+ 34
+
+
+ -
+
+ 35
+
+
+ -
+
+ 36
+
+
+ -
+
+ 37
+
+
+ -
+
+ 38
+
+
+ -
+
+ 39
+
+
+ -
+
+ 40
+
+
+ -
+
+ 41
+
+
+ -
+
+ 42
+
+
+ -
+
+ 43
+
+
+ -
+
+ 44
+
+
+ -
+
+ 45
+
+
+ -
+
+ 46
+
+
+ -
+
+ 47
+
+
+ -
+
+ 48
+
+
+ -
+
+ 49
+
+
+ -
+
+ 50
+
+
+
+
+ -
+
+
+ false
+
+
+ Dot Size:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+ &Number of Data Columns:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+ cmbDotCols
+
+
+
+ -
+
+
+ false
+
+
+ 1.0
+
+
+
+ -
+
+
+ Standard &Mode
+
+
+ true
+
+
+
+ -
+
+
+ GS-&1 Data Mode
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 52
+
+
+
+
+
+
+
+
+
diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp
index 4b041e74..6ea3c158 100644
--- a/frontend_qt4/mainwindow.cpp
+++ b/frontend_qt4/mainwindow.cpp
@@ -56,7 +56,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
"Data Matrix (ISO 16022)",
"Deutsche Post Identcode",
"Deutsche Post Leitcode",
- "DotCode",
+ "DotCode",
"Dutch Post KIX",
"EAN-14",
"European Article Number (EAN)",
@@ -286,6 +286,19 @@ void MainWindow::change_options()
connect(m_optionWidget->findChild("radMPDFStand"), SIGNAL(toggled( bool )), SLOT(update_preview()));
}
+ if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_DOTCODE)
+ {
+ QFile file(":/grpDotCode.ui");
+ if (!file.open(QIODevice::ReadOnly))
+ return;
+ m_optionWidget=uiload.load(&file);
+ file.close();
+ tabMain->insertTab(1,m_optionWidget,tr("DotCode"));
+ connect(m_optionWidget->findChild("cmbDotCols"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
+ connect(m_optionWidget->findChild("radDotStan"), SIGNAL(clicked( bool )), SLOT(update_preview()));
+ connect(m_optionWidget->findChild("radDotGs1"), SIGNAL(clicked( bool )), SLOT(update_preview()));
+ }
+
if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_AZTEC)
{
QFile file(":/grpAztec.ui");
@@ -679,6 +692,13 @@ void MainWindow::update_preview()
m_bc.bc.setSymbol(BARCODE_HIBC_MICPDF);
break;
+ case BARCODE_DOTCODE:
+ m_bc.bc.setSymbol(BARCODE_DOTCODE);
+ m_bc.bc.setWidth(m_optionWidget->findChild("cmbDotCols")->currentIndex());
+ if(m_optionWidget->findChild("radDotGs1")->isChecked())
+ m_bc.bc.setInputMode(GS1_MODE);
+ break;
+
case BARCODE_AZTEC:
m_bc.bc.setSymbol(BARCODE_AZTEC);
if(m_optionWidget->findChild("radAztecSize")->isChecked())
diff --git a/frontend_qt4/resources.qrc b/frontend_qt4/resources.qrc
index 455ead70..9882f077 100644
--- a/frontend_qt4/resources.qrc
+++ b/frontend_qt4/resources.qrc
@@ -22,5 +22,6 @@
grpDBExtend.ui
images/zint.png
grpHX.ui
+ grpDotCode.ui