From 6bdd7e8509a6c3dd03b9ea7b1c182e6311496b31 Mon Sep 17 00:00:00 2001 From: gitlost Date: Tue, 27 Oct 2020 15:21:50 +0000 Subject: [PATCH] GUI: Retab data/export/sequencewindow.cpp (no code changes) --- frontend_qt/datawindow.cpp | 40 +++---- frontend_qt/exportwindow.cpp | 165 ++++++++++++++-------------- frontend_qt/sequencewindow.cpp | 193 ++++++++++++++++----------------- 3 files changed, 198 insertions(+), 200 deletions(-) diff --git a/frontend_qt/datawindow.cpp b/frontend_qt/datawindow.cpp index 6fe2c8b8..5d7dd72b 100644 --- a/frontend_qt/datawindow.cpp +++ b/frontend_qt/datawindow.cpp @@ -1,6 +1,6 @@ /* Zint Barcode Generator - the open source barcode generator - Copyright (C) 2009-2017 Robin Stuart + Copyright (C) 2009 - 2020 Robin Stuart This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,9 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* vim: set ts=4 sw=4 et : */ -#include +//#include #include #include #include @@ -25,27 +26,26 @@ #include #include "datawindow.h" -#include DataWindow::DataWindow() { - setupUi(this); + setupUi(this); - connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); - connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data())); - connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay())); + connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); + connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data())); + connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay())); } DataWindow::DataWindow(const QString &input) { - setupUi(this); - txtDataInput->setPlainText(input); - txtDataInput->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); + setupUi(this); + txtDataInput->setPlainText(input); + txtDataInput->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); - connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); - connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data())); - connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay())); - connect(btnFromFile, SIGNAL( clicked( bool )), SLOT(from_file())); + connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); + connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data())); + connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay())); + connect(btnFromFile, SIGNAL( clicked( bool )), SLOT(from_file())); } DataWindow::~DataWindow() @@ -54,20 +54,20 @@ DataWindow::~DataWindow() void DataWindow::quit_now() { - Valid = 0; - close(); + Valid = 0; + close(); } void DataWindow::clear_data() { - txtDataInput->clear(); + txtDataInput->clear(); } void DataWindow::okay() { - Valid = 1; - DataOutput = txtDataInput->toPlainText(); - close(); + Valid = 1; + DataOutput = txtDataInput->toPlainText(); + close(); } void DataWindow::from_file() diff --git a/frontend_qt/exportwindow.cpp b/frontend_qt/exportwindow.cpp index 42ceda95..dbfaf558 100644 --- a/frontend_qt/exportwindow.cpp +++ b/frontend_qt/exportwindow.cpp @@ -1,6 +1,6 @@ /* Zint Barcode Generator - the open source barcode generator - Copyright (C) 2009-2017 Robin Stuart + Copyright (C) 2009 - 2020 Robin Stuart This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,15 +16,15 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* vim: set ts=4 sw=4 et : */ -#include +//#include #include #include #include #include #include "exportwindow.h" -#include ExportWindow::ExportWindow() { @@ -55,7 +55,7 @@ ExportWindow::~ExportWindow() void ExportWindow::quit_now() { - close(); + close(); } void ExportWindow::get_directory() @@ -80,103 +80,102 @@ void ExportWindow::get_directory() void ExportWindow::process() { - QString fileName; - QString dataString; - QString suffix; - QString Feedback; + QString fileName; + QString dataString; + QString suffix; + QString Feedback; int lines, i, j, inputpos; - lines = output_data.count(QChar('\n'), Qt::CaseInsensitive); - inputpos = 0; + lines = output_data.count(QChar('\n'), Qt::CaseInsensitive); + inputpos = 0; - switch(cmbFileFormat->currentIndex()) { + switch(cmbFileFormat->currentIndex()) { #ifdef NO_PNG - case 0: suffix = ".eps"; break; - case 1: suffix = ".gif"; break; + case 0: suffix = ".eps"; break; + case 1: suffix = ".gif"; break; case 2: suffix = ".svg"; break; case 3: suffix = ".bmp"; break; case 4: suffix = ".pcx"; break; - case 5: suffix = ".emf"; break; - case 6: suffix = ".tif"; break; + case 5: suffix = ".emf"; break; + case 6: suffix = ".tif"; break; #else case 0: suffix = ".png"; break; - case 1: suffix = ".eps"; break; - case 2: suffix = ".gif"; break; + case 1: suffix = ".eps"; break; + case 2: suffix = ".gif"; break; case 3: suffix = ".svg"; break; case 4: suffix = ".bmp"; break; case 5: suffix = ".pcx"; break; - case 6: suffix = ".emf"; break; - case 7: suffix = ".tif"; break; + case 6: suffix = ".emf"; break; + case 7: suffix = ".tif"; break; #endif } - txtFeedback->clear(); - Feedback = ""; + txtFeedback->clear(); + Feedback = ""; - for(i = 0; i < lines; i++) { + for(i = 0; i < lines; i++) { int datalen = 0; - for(j = inputpos; ((j < output_data.length()) && (output_data[j] != '\n') ); j++) { - datalen++; - } - dataString = output_data.mid(inputpos, datalen); - switch(cmbFileName->currentIndex()) { - case 0: { /* Same as Data (URL Escaped) */ - QString url_escaped; - int m; - QChar name_qchar; + for(j = inputpos; ((j < output_data.length()) && (output_data[j] != '\n') ); j++) { + datalen++; + } + dataString = output_data.mid(inputpos, datalen); + switch(cmbFileName->currentIndex()) { + case 0: { /* Same as Data (URL Escaped) */ + QString url_escaped; + int m; + QChar name_qchar; - for(m = 0; m < dataString.length(); m++) { - name_qchar = dataString[m]; + for(m = 0; m < dataString.length(); m++) { + name_qchar = dataString[m]; char name_char = name_qchar.toLatin1(); - switch(name_char) { - case '\\': url_escaped += "%5C"; break; - case '/': url_escaped += "%2F"; break; - case ':': url_escaped += "%3A"; break; - case '*': url_escaped += "%2A"; break; - case '?': url_escaped += "%3F"; break; - case '"': url_escaped += "%22"; break; - case '<': url_escaped += "%3C"; break; - case '>': url_escaped += "%3E"; break; - case '|': url_escaped += "%7C"; break; - case '%': url_escaped += "%25"; break; - default: url_escaped += name_qchar; break; - } - } - fileName = linDestPath->text() + QDir::separator() + linPrefix->text() + url_escaped + suffix; - } - break; - case 1: { /* Formatted Serial Number */ - QString biggest, this_val, outnumber; - int number_size, val_size, m; - - biggest = QString::number(lines + 1); - number_size = biggest.length(); - this_val = QString::number(i + 1); - val_size = this_val.length(); - - for(m = 0; m < (number_size - val_size); m++) { - outnumber += QChar('0'); - } - - outnumber += this_val; - - fileName = linDestPath->text() + QDir::separator() + linPrefix->text() + outnumber + suffix; - } - break; - } - barcode->bc.setText(dataString.toLatin1().data()); - barcode->bc.save_to_file(fileName.toLatin1().data()); - Feedback += "Line "; - Feedback += QString::number(i + 1); - Feedback += ": "; - if (barcode->bc.hasErrors()) { - Feedback += barcode->bc.error_message(); - Feedback += "\n"; - } else { - Feedback += "Success\n"; + switch(name_char) { + case '\\': url_escaped += "%5C"; break; + case '/': url_escaped += "%2F"; break; + case ':': url_escaped += "%3A"; break; + case '*': url_escaped += "%2A"; break; + case '?': url_escaped += "%3F"; break; + case '"': url_escaped += "%22"; break; + case '<': url_escaped += "%3C"; break; + case '>': url_escaped += "%3E"; break; + case '|': url_escaped += "%7C"; break; + case '%': url_escaped += "%25"; break; + default: url_escaped += name_qchar; break; + } + } + fileName = linDestPath->text() + QDir::separator() + linPrefix->text() + url_escaped + suffix; } - txtFeedback->document()->setPlainText(Feedback); - inputpos += datalen + 1; - } -} + break; + case 1: { /* Formatted Serial Number */ + QString biggest, this_val, outnumber; + int number_size, val_size, m; + biggest = QString::number(lines + 1); + number_size = biggest.length(); + this_val = QString::number(i + 1); + val_size = this_val.length(); + + for(m = 0; m < (number_size - val_size); m++) { + outnumber += QChar('0'); + } + + outnumber += this_val; + + fileName = linDestPath->text() + QDir::separator() + linPrefix->text() + outnumber + suffix; + } + break; + } + barcode->bc.setText(dataString.toLatin1().data()); + barcode->bc.save_to_file(fileName.toLatin1().data()); + Feedback += "Line "; + Feedback += QString::number(i + 1); + Feedback += ": "; + if (barcode->bc.hasErrors()) { + Feedback += barcode->bc.error_message(); + Feedback += "\n"; + } else { + Feedback += "Success\n"; + } + txtFeedback->document()->setPlainText(Feedback); + inputpos += datalen + 1; + } +} diff --git a/frontend_qt/sequencewindow.cpp b/frontend_qt/sequencewindow.cpp index 60e2ec74..8fbc9127 100644 --- a/frontend_qt/sequencewindow.cpp +++ b/frontend_qt/sequencewindow.cpp @@ -1,6 +1,6 @@ /* Zint Barcode Generator - the open source barcode generator - Copyright (C) 2009-2017 Robin Stuart + Copyright (C) 2009 - 2020 Robin Stuart This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,9 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* vim: set ts=4 sw=4 et : */ -#include +//#include #include #include #include @@ -26,29 +27,28 @@ #include "sequencewindow.h" #include "exportwindow.h" -#include SequenceWindow::SequenceWindow() { - setupUi(this); + setupUi(this); QSettings settings; settings.setIniCodec("UTF-8"); - QValidator *intvalid = new QIntValidator(this); + QValidator *intvalid = new QIntValidator(this); - linStartVal->setText(settings.value("studio/sequence/start_value", "1").toString()); - linEndVal->setText(settings.value("studio/sequence/end_value", "10").toString()); - linIncVal->setText(settings.value("studio/sequence/increment", "1").toString()); - linFormat->setText(settings.value("studio/sequence/format", "$$$$$$").toString()); + linStartVal->setText(settings.value("studio/sequence/start_value", "1").toString()); + linEndVal->setText(settings.value("studio/sequence/end_value", "10").toString()); + linIncVal->setText(settings.value("studio/sequence/increment", "1").toString()); + linFormat->setText(settings.value("studio/sequence/format", "$$$$$$").toString()); - linStartVal->setValidator(intvalid); - linEndVal->setValidator(intvalid); - linIncVal->setValidator(intvalid); - connect(btnClose, SIGNAL( clicked( bool )), SLOT(quit_now())); - connect(btnReset, SIGNAL( clicked( bool )), SLOT(reset_preview())); - connect(btnCreate, SIGNAL( clicked( bool )), SLOT(create_sequence())); - connect(txtPreview, SIGNAL( textChanged()), SLOT(check_generate())); - connect(btnImport, SIGNAL( clicked( bool )), SLOT(import())); - connect(btnExport, SIGNAL( clicked( bool )), SLOT(generate_sequence())); + linStartVal->setValidator(intvalid); + linEndVal->setValidator(intvalid); + linIncVal->setValidator(intvalid); + connect(btnClose, SIGNAL( clicked( bool )), SLOT(quit_now())); + connect(btnReset, SIGNAL( clicked( bool )), SLOT(reset_preview())); + connect(btnCreate, SIGNAL( clicked( bool )), SLOT(create_sequence())); + connect(txtPreview, SIGNAL( textChanged()), SLOT(check_generate())); + connect(btnImport, SIGNAL( clicked( bool )), SLOT(import())); + connect(btnExport, SIGNAL( clicked( bool )), SLOT(generate_sequence())); } SequenceWindow::~SequenceWindow() @@ -64,107 +64,107 @@ SequenceWindow::~SequenceWindow() void SequenceWindow::quit_now() { - close(); + close(); } void SequenceWindow::reset_preview() { - txtPreview->clear(); + txtPreview->clear(); } QString SequenceWindow::apply_format(QString raw_number) { - QString adjusted, reversed; - QString format; - int format_len, input_len, i, inpos; - QChar format_qchar; + QString adjusted, reversed; + QString format; + int format_len, input_len, i, inpos; + QChar format_qchar; - format = linFormat->text(); - input_len = raw_number.length(); - format_len = format.length(); + format = linFormat->text(); + input_len = raw_number.length(); + format_len = format.length(); - inpos = input_len; + inpos = input_len; - for(i = format_len; i > 0; i--) { - format_qchar = format[i - 1]; + for(i = format_len; i > 0; i--) { + format_qchar = format[i - 1]; char format_char = format_qchar.toLatin1(); - switch(format_char) { - case '#': - if (inpos > 0) { - adjusted += raw_number[inpos - 1]; - inpos--; - } else { - adjusted += ' '; - } - break; - case '$': - if (inpos > 0) { - adjusted += raw_number[inpos - 1]; - inpos--; - } else { - adjusted += '0'; - } - break; - case '*': - if (inpos > 0) { - adjusted += raw_number[inpos - 1]; - inpos--; - } else { - adjusted += '*'; - } - break; - default: - adjusted += format_char; - break; - } - } + switch(format_char) { + case '#': + if (inpos > 0) { + adjusted += raw_number[inpos - 1]; + inpos--; + } else { + adjusted += ' '; + } + break; + case '$': + if (inpos > 0) { + adjusted += raw_number[inpos - 1]; + inpos--; + } else { + adjusted += '0'; + } + break; + case '*': + if (inpos > 0) { + adjusted += raw_number[inpos - 1]; + inpos--; + } else { + adjusted += '*'; + } + break; + default: + adjusted += format_char; + break; + } + } - for(i = format_len; i > 0; i--) { - reversed += adjusted[i - 1]; - } + for(i = format_len; i > 0; i--) { + reversed += adjusted[i - 1]; + } - return reversed; + return reversed; } void SequenceWindow::create_sequence() { - QString startval, endval, incval, part, outputtext; - int start, stop, step, i; - bool ok; + QString startval, endval, incval, part, outputtext; + int start, stop, step, i; + bool ok; - startval = linStartVal->text(); - endval = linEndVal->text(); - incval = linIncVal->text(); - start = startval.toInt(&ok, 10); - stop = endval.toInt(&ok, 10); - step = incval.toInt(&ok, 10); + startval = linStartVal->text(); + endval = linEndVal->text(); + incval = linIncVal->text(); + start = startval.toInt(&ok, 10); + stop = endval.toInt(&ok, 10); + step = incval.toInt(&ok, 10); - if((stop <= start) || (step <= 0)) { - QMessageBox::critical(this, tr("Sequence Error"), tr("One or more of the input values is incorrect.")); - return; - } + if((stop <= start) || (step <= 0)) { + QMessageBox::critical(this, tr("Sequence Error"), tr("One or more of the input values is incorrect.")); + return; + } - for(i = start; i <= stop; i += step) { - part = apply_format(QString::number(i, 10)); - part += '\n'; - outputtext += part; - } + for(i = start; i <= stop; i += step) { + part = apply_format(QString::number(i, 10)); + part += '\n'; + outputtext += part; + } - txtPreview->setPlainText(outputtext); + txtPreview->setPlainText(outputtext); } void SequenceWindow::check_generate() { - QString preview_copy; + QString preview_copy; - preview_copy = txtPreview->toPlainText(); - if(preview_copy.isEmpty()) { - btnExport->setEnabled(false); - lblExport->setEnabled(false); - } else { - btnExport->setEnabled(true); - lblExport->setEnabled(true); - } + preview_copy = txtPreview->toPlainText(); + if(preview_copy.isEmpty()) { + btnExport->setEnabled(false); + lblExport->setEnabled(false); + } else { + btnExport->setEnabled(true); + lblExport->setEnabled(true); + } } void SequenceWindow::import() @@ -201,9 +201,8 @@ void SequenceWindow::import() void SequenceWindow::generate_sequence() { - ExportWindow dlg; - dlg.barcode = barcode; - dlg.output_data = txtPreview->toPlainText(); - dlg.exec(); + ExportWindow dlg; + dlg.barcode = barcode; + dlg.output_data = txtPreview->toPlainText(); + dlg.exec(); } -