From 29b9b58759829db4863762f77a9507e4c3d9cedf Mon Sep 17 00:00:00 2001 From: leca Date: Sun, 9 Mar 2025 16:05:37 +0300 Subject: [PATCH 1/8] rework of mainwindow in progress --- CMakeLists.txt | 9 + assets/icons/OCR.svg | 131 ++++++++++ assets/icons/email-text.svg | 285 +++++++++++++++++++++ main.cpp | 3 + mainwindow.cpp | 223 +---------------- mainwindow.cpp.old | 219 +++++++++++++++++ mainwindow.h | 33 +-- mainwindow.h.old | 44 ++++ mainwindow.ui | 478 +++++++----------------------------- mainwindow.ui.old | 57 +++++ media.qrc | 6 + translations/en_US.ts | 126 ++++------ translations/ru_RU.ts | 124 ++++------ 13 files changed, 971 insertions(+), 767 deletions(-) create mode 100644 assets/icons/OCR.svg create mode 100644 assets/icons/email-text.svg create mode 100644 mainwindow.cpp.old create mode 100644 mainwindow.h.old create mode 100644 mainwindow.ui.old create mode 100644 media.qrc diff --git a/CMakeLists.txt b/CMakeLists.txt index be87240..7e4040b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,16 @@ if (BUILD_TRANSLATIONS) add_dependencies(resources translations) endif() +# Media QRC +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/media.qrc ${CMAKE_CURRENT_BINARY_DIR}/media.qrc COPYONLY) +file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +qt5_add_resources(MEDIAQRC ${CMAKE_CURRENT_BINARY_DIR}/media.qrc) +add_custom_target(mediaresource ALL DEPENDS ${MEDIAQRC}) + set(SOURCES "") + +list(APPEND SOURCES ${MEDIAQRC}) + if (BUILD_TRANSLATIONS) list(APPEND SOURCES ${TRANSLATIONQRC}) endif() diff --git a/assets/icons/OCR.svg b/assets/icons/OCR.svg new file mode 100644 index 0000000..2157b4d --- /dev/null +++ b/assets/icons/OCR.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + Receipt + + diff --git a/assets/icons/email-text.svg b/assets/icons/email-text.svg new file mode 100644 index 0000000..8018c7c --- /dev/null +++ b/assets/icons/email-text.svg @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Receipt + + + diff --git a/main.cpp b/main.cpp index de82bd9..06d6201 100644 --- a/main.cpp +++ b/main.cpp @@ -16,6 +16,8 @@ #include #include +#include + int main(int argc, char *argv[]) { curl_global_init(CURL_GLOBAL_ALL); @@ -61,6 +63,7 @@ int main(int argc, char *argv[]) { a.installTranslator(&translator); MainWindow w; + // MainWindow w; w.update(); w.show(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 59474c7..c398761 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,219 +1,16 @@ #include "mainwindow.h" -#include "./ui_mainwindow.h" -#include "check/check.h" -#include "exceptions/ofdrequestexception.h" -#include "goods/goods.h" -#include "outputdialog.h" -#include "adjustpicturedialog.h" -#include "settingsdialog.h" -#include "solvecaptchadialog.h" -#include -#include -#include "image/checkimage.h" -#include "utils/utils.h" -#include -#include -#include -#include -#include +#include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), ui(new Ui::MainWindow) { - ui->setupUi(this); - this->setupStoresList(); -} - -MainWindow::~MainWindow() { delete ui; } - -void MainWindow::setupStoresList() { - parser = *(new Parser()); - - std::vector modules_names = parser.search_modules(); - - for (std::string name : modules_names) { - StoreModule m(name); - std::wstring module_name = m.get_name(); - - QString s = QString::fromStdWString(module_name); - ui->storeType->addItem(s); - } -} - -std::string MainWindow::makeRequestToOfd(std::string captcha) { - std::string checkContent = Net().fetch_check_data_from_ofdru( - ui->fn_edit->text().toStdString(), - ui->fd_edit->text().toStdString(), - ui->fi_edit->text().toStdString(), - ui->dateTimeEdit->dateTime().toString(Qt::ISODate).toStdString(), - ui->fundIncomeCombo->currentIndex() + 1, - // In the request to ofd.ru, total is in a strange format, like a string of a format where 2 last digits represent decimal part of a number. - ui->total_edit->text().toDouble() * 100, - captcha); - - return checkContent; -} - -void MainWindow::on_parseButton_clicked() { - QString s; - switch (ui->tabWidget->currentIndex()) { - case 0: - s = ui->checkContent->toPlainText(); - break; - case 1: - s = ui->checkContentFromImage->toPlainText(); - break; - case 2: - Net().get_captcha_from_ofdru(); - - std::string solved_captcha = ""; - bool success = true; - bool is_captcha_solved = true; - - do { - SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha); - dialog.exec(); - is_captcha_solved = true; - - try { - std::string check_content = makeRequestToOfd(solved_captcha); - check = parseOfdRuAnswer(check_content); - } catch(OfdRequestException e) { - success = false; - if (!strcmp(e.what(), "Incorrect captcha")) { - is_captcha_solved = false; - QMessageBox infoDialog; - infoDialog.setText(tr("Captcha was not solved correctly!")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Captcha is incorrect")); - infoDialog.exec(); - break; - } else if (!strcmp(e.what(), "Internal server error")) { - QMessageBox infoDialog; - infoDialog.setText(tr("Internal server error. Please, try again later.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Internal server error")); - infoDialog.exec(); - return; - } else if (!strcmp(e.what(), "Does not exist")) { - QMessageBox infoDialog; - infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Check was not found")); - infoDialog.exec(); - return; - } - } - } while (!is_captcha_solved); - - if (success) { - OutputDialog d = OutputDialog(this, check); - d.exec(); - } - - return; - } - - std::wstring check_plaintext = s.toStdWString(); - parser.set_module(parser.search_modules()[0]); - - std::vector c = parser.parse(check_plaintext); - - if (c.size() == 0) { - QMessageBox infoDialog; - infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Error in parsing")); - infoDialog.exec(); - return; - } - - for (auto& g : c) { - check.add_goods(g); - } - - OutputDialog d = OutputDialog(this, check); - d.show(); - d.exec(); -} - -void MainWindow::on_storeType_currentIndexChanged(int index) { - std::string module = parser.search_modules()[index]; - parser.set_module(module); -} - - -void MainWindow::on_preferencesButton_clicked() { - SettingsDialog s = SettingsDialog(); - s.show(); - s.exec(); -} - -void MainWindow::on_chooseImageButton_ofd_clicked() { - QString filename = QFileDialog::getOpenFileName(); - - if (filename == "") { - QMessageBox infoDialog; - infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Picture was not selected")); - infoDialog.exec(); - return; - } - - std::string new_text = "Selected: " + filename.toStdString(); - ui->pathLabel_ofd->setText(QString::fromStdString(new_text)); - - AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString()); - connect(&dialog, &AdjustPictureDialog::decodedData, this, &MainWindow::onDecodedData); - dialog.exec(); - - ui->picture_ofd->setPixmap(QPixmap(filename)); - ui->picture_ofd->setScaledContents(true); -} - -void MainWindow::onDecodedData(std::string data) { - std::string delimiter = "&"; - std::vector dataSplit = split(data, delimiter); - - std::cout << data << std::endl; - - ui->fn_edit->setText(QString::fromStdString(dataSplit[2])); - ui->fd_edit->setText(QString::fromStdString(dataSplit[3])); - ui->fi_edit->setText(QString::fromStdString(dataSplit[4])); - - QString extractedDateTime = QString::fromStdString(split(dataSplit[0], "=")[1]); - QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm"); - ui->dateTimeEdit->setDateTime(datetime); - - int type = std::stoi(split(dataSplit[5], "=")[1]); - ui->fundIncomeCombo->setCurrentIndex(type - 1); - - std::string total = split(dataSplit[1], "=")[1]; - - ui->total_edit->setText(QString::fromStdString(total)); -} - -void MainWindow::on_chooseImageButton_ocr_clicked() + : QWidget(parent) + , ui(new Ui::MainWindow) { - QString filename = QFileDialog::getOpenFileName(); - - if (filename == "") { - QMessageBox infoDialog; - infoDialog.setText(tr("Please, select a picture to scan")); - infoDialog.setIcon(QMessageBox::Critical); - infoDialog.setWindowTitle(tr("Picture was not selected")); - infoDialog.exec(); - return; - } - - std::string new_text = "Selected: " + filename.toStdString(); - ui->pathLabel_ocr->setText(QString::fromStdString(new_text)); - - CheckImage i(filename.toStdString()); - std::string parsed = i.parse_text(); - - ui->picture_ocr->setPixmap(QPixmap(filename)); - ui->picture_ocr->setScaledContents(true); - ui->checkContentFromImage->setPlainText(QString::fromStdString(parsed)); + ui->setupUi(this); } +MainWindow::~MainWindow() +{ + delete ui; +} + + diff --git a/mainwindow.cpp.old b/mainwindow.cpp.old new file mode 100644 index 0000000..62e5fd9 --- /dev/null +++ b/mainwindow.cpp.old @@ -0,0 +1,219 @@ +#include "mainwindow.h" +#include "./ui_mainwindow.h" +#include "check/check.h" +#include "exceptions/ofdrequestexception.h" +#include "goods/goods.h" +#include "outputdialog.h" +#include "adjustpicturedialog.h" +#include "settingsdialog.h" +#include "solvecaptchadialog.h" +#include +#include +#include "image/checkimage.h" +#include "utils/utils.h" +#include +#include +#include +#include +#include + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent), ui(new Ui::MainWindow) { + ui->setupUi(this); + // this->setupStoresList(); +} + +MainWindow::~MainWindow() { delete ui; } + +// void MainWindow::setupStoresList() { +// parser = *(new Parser()); + +// std::vector modules_names = parser.search_modules(); + +// for (std::string name : modules_names) { +// StoreModule m(name); +// std::wstring module_name = m.get_name(); + +// QString s = QString::fromStdWString(module_name); +// ui->storeType->addItem(s); +// } +// } + +// std::string MainWindow::makeRequestToOfd(std::string captcha) { +// std::string checkContent = Net().fetch_check_data_from_ofdru( +// ui->fn_edit->text().toStdString(), +// ui->fd_edit->text().toStdString(), +// ui->fi_edit->text().toStdString(), +// ui->dateTimeEdit->dateTime().toString(Qt::ISODate).toStdString(), +// ui->fundIncomeCombo->currentIndex() + 1, +// // In the request to ofd.ru, total is in a strange format, like a string of a format where 2 last digits represent decimal part of a number. +// ui->total_edit->text().toDouble() * 100, +// captcha); + +// return checkContent; +// } + +// void MainWindow::on_parseButton_clicked() { +// QString s; +// switch (ui->tabWidget->currentIndex()) { +// case 0: +// s = ui->checkContent->toPlainText(); +// break; +// case 1: +// s = ui->checkContentFromImage->toPlainText(); +// break; +// case 2: +// Net().get_captcha_from_ofdru(); + +// std::string solved_captcha = ""; +// bool success = true; +// bool is_captcha_solved = true; + +// do { +// SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha); +// dialog.exec(); +// is_captcha_solved = true; + +// try { +// std::string check_content = makeRequestToOfd(solved_captcha); +// check = parseOfdRuAnswer(check_content); +// } catch(OfdRequestException e) { +// success = false; +// if (!strcmp(e.what(), "Incorrect captcha")) { +// is_captcha_solved = false; +// QMessageBox infoDialog; +// infoDialog.setText(tr("Captcha was not solved correctly!")); +// infoDialog.setIcon(QMessageBox::Critical); +// infoDialog.setWindowTitle(tr("Captcha is incorrect")); +// infoDialog.exec(); +// break; +// } else if (!strcmp(e.what(), "Internal server error")) { +// QMessageBox infoDialog; +// infoDialog.setText(tr("Internal server error. Please, try again later.")); +// infoDialog.setIcon(QMessageBox::Critical); +// infoDialog.setWindowTitle(tr("Internal server error")); +// infoDialog.exec(); +// return; +// } else if (!strcmp(e.what(), "Does not exist")) { +// QMessageBox infoDialog; +// infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data.")); +// infoDialog.setIcon(QMessageBox::Critical); +// infoDialog.setWindowTitle(tr("Check was not found")); +// infoDialog.exec(); +// return; +// } +// } +// } while (!is_captcha_solved); + +// if (success) { +// OutputDialog d = OutputDialog(this, check); +// d.exec(); +// } + +// return; +// } + +// std::wstring check_plaintext = s.toStdWString(); +// parser.set_module(parser.search_modules()[0]); + +// std::vector c = parser.parse(check_plaintext); + +// if (c.size() == 0) { +// QMessageBox infoDialog; +// infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.")); +// infoDialog.setIcon(QMessageBox::Critical); +// infoDialog.setWindowTitle(tr("Error in parsing")); +// infoDialog.exec(); +// return; +// } + +// for (auto& g : c) { +// check.add_goods(g); +// } + +// OutputDialog d = OutputDialog(this, check); +// d.show(); +// d.exec(); +// } + +// void MainWindow::on_storeType_currentIndexChanged(int index) { +// std::string module = parser.search_modules()[index]; +// parser.set_module(module); +// } + + +// void MainWindow::on_preferencesButton_clicked() { +// SettingsDialog s = SettingsDialog(); +// s.show(); +// s.exec(); +// } + +// void MainWindow::on_chooseImageButton_ofd_clicked() { +// QString filename = QFileDialog::getOpenFileName(); + +// if (filename == "") { +// QMessageBox infoDialog; +// infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present")); +// infoDialog.setIcon(QMessageBox::Critical); +// infoDialog.setWindowTitle(tr("Picture was not selected")); +// infoDialog.exec(); +// return; +// } + +// std::string new_text = "Selected: " + filename.toStdString(); +// ui->pathLabel_ofd->setText(QString::fromStdString(new_text)); + +// AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString()); +// connect(&dialog, &AdjustPictureDialog::decodedData, this, &MainWindow::onDecodedData); +// dialog.exec(); + +// ui->picture_ofd->setPixmap(QPixmap(filename)); +// ui->picture_ofd->setScaledContents(true); +// } + +// void MainWindow::onDecodedData(std::string data) { +// std::string delimiter = "&"; +// std::vector dataSplit = split(data, delimiter); + +// std::cout << data << std::endl; + +// ui->fn_edit->setText(QString::fromStdString(dataSplit[2])); +// ui->fd_edit->setText(QString::fromStdString(dataSplit[3])); +// ui->fi_edit->setText(QString::fromStdString(dataSplit[4])); + +// QString extractedDateTime = QString::fromStdString(split(dataSplit[0], "=")[1]); +// QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm"); +// ui->dateTimeEdit->setDateTime(datetime); + +// int type = std::stoi(split(dataSplit[5], "=")[1]); +// ui->fundIncomeCombo->setCurrentIndex(type - 1); + +// std::string total = split(dataSplit[1], "=")[1]; + +// ui->total_edit->setText(QString::fromStdString(total)); +// } + +// void MainWindow::on_chooseImageButton_ocr_clicked() +// { +// QString filename = QFileDialog::getOpenFileName(); + +// if (filename == "") { +// QMessageBox infoDialog; +// infoDialog.setText(tr("Please, select a picture to scan")); +// infoDialog.setIcon(QMessageBox::Critical); +// infoDialog.setWindowTitle(tr("Picture was not selected")); +// infoDialog.exec(); +// return; +// } + +// std::string new_text = "Selected: " + filename.toStdString(); +// ui->pathLabel_ocr->setText(QString::fromStdString(new_text)); + +// CheckImage i(filename.toStdString()); +// std::string parsed = i.parse_text(); + +// ui->picture_ocr->setPixmap(QPixmap(filename)); +// ui->picture_ocr->setScaledContents(true); +// ui->checkContentFromImage->setPlainText(QString::fromStdString(parsed)); +// } + diff --git a/mainwindow.h b/mainwindow.h index 14386a7..e985a8a 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,44 +1,23 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include +#include +#include -#include "check/check.h" -#include "parser/parser.h" - -QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } -QT_END_NAMESPACE -class MainWindow : public QMainWindow { +class MainWindow : public QWidget +{ Q_OBJECT - Check check; - Parser parser; - public: - MainWindow(QWidget *parent = nullptr); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); - void setupStoresList(); - - Check get_check(); - void onDecodedData(std::string); - - std::string makeRequestToOfd(std::string captcha); -private slots: - void on_parseButton_clicked(); - - void on_storeType_currentIndexChanged(int index); - - void on_preferencesButton_clicked(); - - void on_chooseImageButton_ofd_clicked(); - - void on_chooseImageButton_ocr_clicked(); private: Ui::MainWindow *ui; }; + #endif // MAINWINDOW_H diff --git a/mainwindow.h.old b/mainwindow.h.old new file mode 100644 index 0000000..ed77ada --- /dev/null +++ b/mainwindow.h.old @@ -0,0 +1,44 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +#include "check/check.h" +#include "parser/parser.h" + +QT_BEGIN_NAMESPACE +namespace Ui { +class MainWindow; +} +QT_END_NAMESPACE + +class MainWindow : public QMainWindow { + Q_OBJECT + + Check check; + Parser parser; + +public: + MainWindow(QWidget *parent = nullptr); + ~MainWindow(); + // void setupStoresList(); + + // Check get_check(); + // void onDecodedData(std::string); + + // std::string makeRequestToOfd(std::string captcha); +private slots: + // void on_parseButton_clicked(); + + // void on_storeType_currentIndexChanged(int index); + + // void on_preferencesButton_clicked(); + + // void on_chooseImageButton_ofd_clicked(); + + // void on_chooseImageButton_ocr_clicked(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui index f4ebd1e..7864a56 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1,400 +1,110 @@ MainWindow - + 0 0 - 817 - 659 + 971 + 616 - - MainWindow + + + 0 + 0 + - - - - - 90 - 10 - 211 - 31 - - - - - - - 10 - 10 - 81 - 31 - - - - Store type - - - - - - 30 - 560 - 80 - 26 - - - - Parse - - - - - - 730 - 0 - 81 - 31 - - - - Preferences - - - - - - 10 - 50 - 801 - 511 - - - - 2 - - - - Text - - - - - 0 - 0 - 101 - 18 - - - - Check content - - - - - - 0 - 30 - 611 - 441 - - - + + + 971 + 0 + + + + Form + + + + + + PushButton + - - - OCR - - - - - 10 - 0 - 80 - 26 - - - - Choose - - - - - - 0 - 60 - 511 - 401 - - - - - - - 100 - 0 - 381 - 18 - - - - Path to image: - - - - - - 0 - 30 - 571 - 18 - - - - Here is recognised check text. Please, edit it if something's wrong: - - - - - - 490 - 10 - 291 - 421 - - - - - - + + + + + PushButton + - - - OFD - - - - - 490 - 10 - 291 - 421 - - - - - - - - - - 100 - 0 - 381 - 18 - - - - Path to image: - - - - - - 10 - 0 - 80 - 26 - - - - Choose - - - - - - 180 - 50 - 261 - 26 - - - - 0000000000000000 - - - - - - 10 - 50 - 161 - 21 - - - - - 0 - 0 - - - - FN (Fiscal Number) - - - - - - 10 - 90 - 161 - 21 - - - - - 0 - 0 - - - - FD (Fiscal Document) - - - - - - 180 - 90 - 261 - 26 - - - - 0000000000 - - - - - - 10 - 130 - 161 - 21 - - - - - 0 - 0 - - - - FI (Fiscal Identifier) - - - - - - 180 - 130 - 261 - 26 - - - - 0000000000 - - - - - - 10 - 170 - 194 - 27 - - - - - - - 10 - 210 - 191 - 26 - - - - - Funds income - - - - - Funds return - - - - - Funds spend - - - - - Spends return - - - - - - - 90 - 250 - 113 - 26 - - - - - - - - - - 10 - 250 - 66 - 18 - - - - Total - - + + + + + Optical Character Recognition + + + + + + + :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg + + + + 128 + 128 + + - - - - - - 0 - 0 - 817 - 23 - - - - - checks parser - - - - - + + + + + + 0 + 0 + + + + Text from E-Mail + + + false + + + + + + + :/icons/assets/icons/email-text.svg:/icons/assets/icons/email-text.svg + + + + 128 + 128 + + + + false + + + false + + + false + + + false + + + false + + + + diff --git a/mainwindow.ui.old b/mainwindow.ui.old new file mode 100644 index 0000000..a2bffa9 --- /dev/null +++ b/mainwindow.ui.old @@ -0,0 +1,57 @@ + + + MainWindow + + + + 0 + 0 + 817 + 659 + + + + MainWindow + + + + + + 0 + -10 + 821 + 621 + + + + + + + Preferences + + + + + + + + + + 0 + 0 + 817 + 33 + + + + + checks parser + + + + + + + + + diff --git a/media.qrc b/media.qrc new file mode 100644 index 0000000..8f5066a --- /dev/null +++ b/media.qrc @@ -0,0 +1,6 @@ + + + assets/icons/email-text.svg + assets/icons/OCR.svg + + diff --git a/translations/en_US.ts b/translations/en_US.ts index 8e79468..fca89a6 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -27,182 +27,162 @@ MainWindow - MainWindow - Главное окно + Главное окно - Store type - Store type + Store type - Parse - Parse + Parse - Preferences - Preferences + Preferences - Text - Text + Text - Check content - Check content + Check content - OCR OCR = Optical Character Recognition - OCR + OCR - - Choose - Choose + Choose - - Path to image: - Path to image: + Path to image: - Here is recognised check text. Please, edit it if something's wrong: - Here is recognised check text. Please, edit it if something's wrong: + Here is recognised check text. Please, edit it if something's wrong: - OFD OFD = Оператор Фискальных Данных - OFD + OFD - 0000000000000000 - 0000000000000000 + 0000000000000000 - FN (Fiscal Number) FN = Фискальный Номер - FN (Fiscal Number) + FN (Fiscal Number) - FD (Fiscal Document) FD = Фискальный Документ - FD (Fiscal Document) + FD (Fiscal Document) - - 0000000000 - 000000000 + 000000000 - FI (Fiscal Identifier) FI = Фискальный Признак - FI (Fiscal Identifier) + FI (Fiscal Identifier) - Funds income Приход средств - Funds income + Funds income - Funds return Возврат средств - Funds return + Funds return - Funds spend Расход средств - Funds spend + Funds spend - Spends return Возврат расхода - Spends return + Spends return - Total - Total + Total - checks parser - checks parser + checks parser - Captcha was not solved correctly! - Captcha was not solved correctly! + Captcha was not solved correctly! - Captcha is incorrect - Captcha is incorrect + Captcha is incorrect - Internal server error. Please, try again later. - Internal server error. Please, try again later. + Internal server error. Please, try again later. - Internal server error - Internal server error + Internal server error - Check not found. Please, ensure correctness of entered data. - Check not found. Please, ensure correctness of entered data. + Check not found. Please, ensure correctness of entered data. - - Check was not found - - - - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Error in parsing - Error in parsing + Error in parsing - Please, select a picture where QR code that contains info about check is present - Please, select a picture where QR code that contains info about check is present + Please, select a picture where QR code that contains info about check is present - - Picture was not selected - Picture was not selected + Picture was not selected - Please, select a picture to scan - Please, select a picture to scan + Please, select a picture to scan + + + + Form + + + + + + PushButton + + + + + Optical Character Recognition + + + + + Text from E-Mail + diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index a2bf595..6f0b667 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -27,178 +27,162 @@ MainWindow - MainWindow - ГлавноеОкно + ГлавноеОкно - Store type - Магазин + Магазин - Parse - Парсить + Парсить - Preferences - Настройки + Настройки - Text - Текст + Текст - Check content - Контент чека + Контент чека - OCR Оптическое Распознавание Символов - ОРС + ОРС - - Choose - Выбрать + Выбрать - - Path to image: - Путь к изображению: + Путь к изображению: - Here is recognised check text. Please, edit it if something's wrong: - Ниже приведён распознанный текст. Пожалуйста, отредактируйте его: + Ниже приведён распознанный текст. Пожалуйста, отредактируйте его: - OFD Оператор Фискальных Данных - ОФД + ОФД - 0000000000000000 - 0000000000000000 + 0000000000000000 - FN (Fiscal Number) Фискальный Норма - ФН + ФН - FD (Fiscal Document) Фискальный Документ - ФД + ФД - - 0000000000 - 000000000 + 000000000 - FI (Fiscal Identifier) Фискальный Признак - ФП + ФП - Funds income - Приход средств + Приход средств - Funds return - Возврат средств + Возврат средств - Funds spend - Расход средств + Расход средств - Spends return - Возврат расхода + Возврат расхода - Total - Итого + Итого - checks parser - Парсер чеков + Парсер чеков - Captcha was not solved correctly! - Капча была решена неверно! + Капча была решена неверно! - Captcha is incorrect - Капча введена неверно + Капча введена неверно - Internal server error. Please, try again later. - Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. + Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. - Internal server error - Внутренняя ошибка сервера + Внутренняя ошибка сервера - Check not found. Please, ensure correctness of entered data. - Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. + Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. - Check was not found - Чек не найден + Чек не найден - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. - Error in parsing - Ошибка в парсинге + Ошибка в парсинге - Please, select a picture where QR code that contains info about check is present - Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке + Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке - - Picture was not selected - Изображение не было выбрано + Изображение не было выбрано - Please, select a picture to scan - Пожалуйста, выберете изображение для сканирования + Пожалуйста, выберете изображение для сканирования + + + + Form + + + + + + PushButton + + + + + Optical Character Recognition + + + + + Text from E-Mail + From 4f75e88b69585f845850dc66b75bc63ca688f363 Mon Sep 17 00:00:00 2001 From: leca Date: Sun, 9 Mar 2025 17:11:34 +0300 Subject: [PATCH 2/8] staging --- assets/icons/OFD.svg | 189 ++++++++++++++++++++++++++++++++++++++++++ main.cpp | 5 ++ mainwindow.cpp | 7 +- mainwindow.ui | 63 ++++++++------ media.qrc | 3 +- translations/en_US.ts | 7 +- translations/ru_RU.ts | 7 +- 7 files changed, 242 insertions(+), 39 deletions(-) create mode 100644 assets/icons/OFD.svg diff --git a/assets/icons/OFD.svg b/assets/icons/OFD.svg new file mode 100644 index 0000000..998bcc5 --- /dev/null +++ b/assets/icons/OFD.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ofd.ru + ФНС + + + + + Checks parser + + diff --git a/main.cpp b/main.cpp index 06d6201..0c71376 100644 --- a/main.cpp +++ b/main.cpp @@ -12,6 +12,7 @@ # include using namespace std::filesystem; #endif +#include #include #include #include @@ -19,6 +20,10 @@ #include int main(int argc, char *argv[]) { + QDateTime datetime = QDateTime::fromString("20171112T153500", "yyyyMMddThhmmss"); + std::cout << datetime.toString().toStdString() << std::endl; + return 0; + curl_global_init(CURL_GLOBAL_ALL); std::string program_data_path = get_path_relative_to_home(".local/share/checks_parser"); diff --git a/mainwindow.cpp b/mainwindow.cpp index c398761..e2c8851 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3,14 +3,11 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) - , ui(new Ui::MainWindow) -{ + , ui(new Ui::MainWindow) { ui->setupUi(this); } -MainWindow::~MainWindow() -{ +MainWindow::~MainWindow() { delete ui; } - diff --git a/mainwindow.ui b/mainwindow.ui index 7864a56..89f1549 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 971 - 616 + 1039 + 693 @@ -29,7 +29,17 @@ - PushButton + + + + + :/icons/assets/icons/OFD.svg:/icons/assets/icons/OFD.svg + + + + 128 + 128 + @@ -40,26 +50,6 @@ - - - - Optical Character Recognition - - - - - - - :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg - - - - 128 - 128 - - - - @@ -78,7 +68,7 @@ - + :/icons/assets/icons/email-text.svg:/icons/assets/icons/email-text.svg @@ -104,8 +94,31 @@ + + + + Optical Character Recognition + + + + + + + :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg + + + + 128 + 128 + + + + - + + + + diff --git a/media.qrc b/media.qrc index 8f5066a..99e4a07 100644 --- a/media.qrc +++ b/media.qrc @@ -1,6 +1,7 @@ assets/icons/email-text.svg - assets/icons/OCR.svg + assets/icons/OCR.svg + assets/icons/OFD.svg diff --git a/translations/en_US.ts b/translations/en_US.ts index fca89a6..5712fdf 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -169,18 +169,17 @@ - - + PushButton - + Optical Character Recognition - + Text from E-Mail diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 6f0b667..cb96b68 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -169,18 +169,17 @@ - - + PushButton - + Optical Character Recognition - + Text from E-Mail From cb3d6c2a3f090b87aacb386c5bd66664e696d9ed Mon Sep 17 00:00:00 2001 From: leca Date: Sun, 9 Mar 2025 21:23:36 +0300 Subject: [PATCH 3/8] rework ui, add text from email scene --- CMakeLists.txt | 33 +-- assets/icons/OFD.svg | 8 - assets/icons/using_binary_eye.svg | 219 ++++++++++++++++ emailtextscene.cpp | 14 ++ emailtextscene.h | 22 ++ main.cpp | 107 +++++++- mainwindow.cpp | 1 - mainwindow.h | 6 +- mainwindow.ui | 124 --------- mainwindow.ui.old | 57 ----- mainwindow_old.ui | 401 ++++++++++++++++++++++++++++++ ocrscene.cpp | 12 + ocrscene.h | 22 ++ scenes.qrc | 7 + scenes/emailtextscene.ui | 60 +++++ scenes/mainwindow.ui | 121 +++++++++ scenes/ocrscene.ui | 19 ++ translations/en_US.ts | 199 +++++++-------- translations/ru_RU.ts | 199 +++++++-------- 19 files changed, 1194 insertions(+), 437 deletions(-) create mode 100644 assets/icons/using_binary_eye.svg create mode 100644 emailtextscene.cpp create mode 100644 emailtextscene.h delete mode 100644 mainwindow.ui delete mode 100644 mainwindow.ui.old create mode 100644 mainwindow_old.ui create mode 100644 ocrscene.cpp create mode 100644 ocrscene.h create mode 100644 scenes.qrc create mode 100644 scenes/emailtextscene.ui create mode 100644 scenes/mainwindow.ui create mode 100644 scenes/ocrscene.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e4040b..38e0773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOUIC_SEARCH_PATHS Designer) +set(CMAKE_AUTOUIC_SEARCH_PATHS scenes) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -17,39 +17,34 @@ find_package(Qt5Core REQUIRED) find_package(Qt5 REQUIRED COMPONENTS LinguistTools) find_package(Qt5Gui REQUIRED) find_package(Qt5Widgets REQUIRED) +find_package(Qt5UiTools REQUIRED) set(PROJECT_SOURCES main.cpp - mainwindow.cpp - mainwindow.h - mainwindow.ui + mainwindow.h mainwindow.cpp scenes/mainwindow.ui goods/goods.h goods/goods.cpp check/check.h check/check.cpp parser/parser.h parser/parser.cpp parser/module.h parser/module.cpp - outputdialog.h outputdialog.cpp outputdialog.ui output/output_options.h output/output_options.cpp utils/utils.h utils/utils.cpp image/checkimage.h image/checkimage.cpp net/net.h net/net.cpp settings/settings.h settings/settings.cpp - settingsdialog.h settingsdialog.cpp settingsdialog.ui - adjustpicturedialog.h adjustpicturedialog.cpp adjustpicturedialog.ui - image_redactor/imageredactor.h image_redactor/imageredactor.cpp - solvecaptchadialog.h solvecaptchadialog.cpp solvecaptchadialog.ui exceptions/ofdrequestexception.h exceptions/ofdrequestexception.cpp + + emailtextscene.h emailtextscene.cpp scenes/emailtextscene.ui + ocrscene.h ocrscene.cpp scenes/ocrscene.ui ) set(TRANSLATION_SOURCES main.cpp - mainwindow.cpp mainwindow.h mainwindow.ui - outputdialog.cpp outputdialog.h outputdialog.ui - settingsdialog.cpp settingsdialog.h settingsdialog.ui - solvecaptchadialog.cpp solvecaptchadialog.h solvecaptchadialog.ui - adjustpicturedialog.cpp adjustpicturedialog.h adjustpicturedialog.ui + mainwindow.cpp mainwindow.h scenes/mainwindow.ui + emailtextscene.cpp emailtextscene.h scenes/emailtextscene.ui + ocrscene.cpp ocrscene.h scenes/ocrscene.ui ) set(TS_FILES @@ -72,9 +67,16 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_ qt5_add_resources(MEDIAQRC ${CMAKE_CURRENT_BINARY_DIR}/media.qrc) add_custom_target(mediaresource ALL DEPENDS ${MEDIAQRC}) +#Scenes QRC +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scenes.qrc ${CMAKE_CURRENT_BINARY_DIR}/scenes.qrc COPYONLY) +file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/scenes DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +qt5_add_resources(SCENESQRC ${CMAKE_CURRENT_BINARY_DIR}/scenes.qrc) +add_custom_target(scenessource ALL DEPENDS ${SCENESQRC}) + set(SOURCES "") list(APPEND SOURCES ${MEDIAQRC}) +list(APPEND SOURCES ${SCENESQRC}) if (BUILD_TRANSLATIONS) list(APPEND SOURCES ${TRANSLATIONQRC}) @@ -92,7 +94,7 @@ else() ) endif() -target_link_libraries(checks-parser PRIVATE Qt5::Widgets) +target_link_libraries(checks-parser PRIVATE Qt5::Widgets Qt5::UiTools) target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/image_redactor) @@ -113,7 +115,6 @@ install(TARGETS checks-parser RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) - if(WIN32) #???? set(OpenCV_DIR /usr/local/lib/cmake/opencv4) diff --git a/assets/icons/OFD.svg b/assets/icons/OFD.svg index 998bcc5..1d3f058 100644 --- a/assets/icons/OFD.svg +++ b/assets/icons/OFD.svg @@ -108,14 +108,6 @@ x="49.959942" y="161.32069" ry="0.60356212" /> - + + +Checks parser diff --git a/emailtextscene.cpp b/emailtextscene.cpp new file mode 100644 index 0000000..221a010 --- /dev/null +++ b/emailtextscene.cpp @@ -0,0 +1,14 @@ +#include "emailtextscene.h" +#include "ui_emailtextscene.h" + +EmailTextScene::EmailTextScene(QWidget *parent) + : QWidget(parent) + , ui(new Ui::EmailTextScene) +{ + ui->setupUi(this); +} + +EmailTextScene::~EmailTextScene() +{ + delete ui; +} diff --git a/emailtextscene.h b/emailtextscene.h new file mode 100644 index 0000000..7b55eea --- /dev/null +++ b/emailtextscene.h @@ -0,0 +1,22 @@ +#ifndef EMAILTEXTSCENE_H +#define EMAILTEXTSCENE_H + +#include + +namespace Ui { +class EmailTextScene; +} + +class EmailTextScene : public QWidget +{ + Q_OBJECT + +public: + explicit EmailTextScene(QWidget *parent = nullptr); + ~EmailTextScene(); + +private: + Ui::EmailTextScene *ui; +}; + +#endif // EMAILTEXTSCENE_H diff --git a/main.cpp b/main.cpp index 0c71376..c1afbf0 100644 --- a/main.cpp +++ b/main.cpp @@ -14,16 +14,118 @@ #endif #include #include +#include #include #include +#include #include +static QWidget *loadUI(QWidget *parent, std::string filename) { + QUiLoader loader; + + QFile file(QString::fromStdString(filename)); + file.open(QIODevice::ReadOnly); + + return loader.load(&file, parent); +} + int main(int argc, char *argv[]) { - QDateTime datetime = QDateTime::fromString("20171112T153500", "yyyyMMddThhmmss"); - std::cout << datetime.toString().toStdString() << std::endl; + QUiLoader loader; + QApplication app(argc, argv); + + QWidget *window = new QWidget(); + QStackedLayout *sceneLayout = new QStackedLayout; + + // Main Window setup + QWidget *mainwindowscene = loadUI(window, ":/scenes/scenes/mainwindow.ui"); + + // Main Window buttons setup + QPushButton *text_from_email_button = ((MainWindow *)mainwindowscene)->findChild("text_from_email_button"); + QPushButton *ocr_button = ((MainWindow *)mainwindowscene)->findChild("ocr_button"); + QPushButton *ofd_button = ((MainWindow *)mainwindowscene)->findChild("ofd_button"); + + QObject::connect(text_from_email_button, &QPushButton::clicked, [&]() { + // Text from email scene + sceneLayout->setCurrentIndex(1); + }); + + QObject::connect(ocr_button, &QPushButton::clicked, [&]() { + // OCR scene + sceneLayout->setCurrentIndex(2); + }); + + QObject::connect(ofd_button, &QPushButton::clicked, [&]() { + // OCR scene + sceneLayout->setCurrentIndex(3); + }); + + // Text from email setup + QWidget *emailtextscene = loadUI(window, ":/scenes/scenes/emailtextscene.ui"); + + //OCR scene + QWidget *ocrscene = loadUI(window, ":/scenes/scenes/ocrscene.ui"); + + sceneLayout->addWidget(mainwindowscene); + sceneLayout->addWidget(emailtextscene); + sceneLayout->addWidget(ocrscene); + + //Setting all back buttons + for (uint32_t sceneIndex = 0; sceneIndex < sceneLayout->count(); sceneIndex ++) { + auto scene = sceneLayout->widget(sceneIndex); + + QPushButton *back_button = scene->findChild("back_button"); + if (back_button == nullptr) continue; + + QObject::connect(back_button, &QPushButton::clicked, [&]() { + sceneLayout->setCurrentIndex(0); + }); + } + + window->setLayout(sceneLayout); + window->show(); + + app.exec(); + return 0; + // QApplication app(argc, argv); + + // QWidget *window = new QWidget; + // QStackedLayout *stackedLayout = new QStackedLayout; + + // QWidget *scene1 = new QWidget; + // QWidget *scene2 = new QWidget; + + // // Add some widgets to each scene + // QPushButton *button1 = new QPushButton("Switch to Scene 2"); + // scene1->setLayout(new QVBoxLayout); + // scene1->layout()->addWidget(button1); + + // QPushButton *button2 = new QPushButton("Switch to Scene 1"); + // scene2->setLayout(new QVBoxLayout); + // scene2->layout()->addWidget(button2); + + // // Add the scenes to the stacked layout + // stackedLayout->addWidget(scene1); + // stackedLayout->addWidget(scene2); + + // // Set the layout of the window + // window->setLayout(stackedLayout); + + // // Connect the buttons to switch scenes + // QObject::connect(button1, &QPushButton::clicked, [&]() { + // stackedLayout->setCurrentIndex(1); + // }); + + // QObject::connect(button2, &QPushButton::clicked, [&]() { + // stackedLayout->setCurrentIndex(0); + // }); + + // window->show(); + // app.exec(); + + // return 0; curl_global_init(CURL_GLOBAL_ALL); std::string program_data_path = get_path_relative_to_home(".local/share/checks_parser"); @@ -68,7 +170,6 @@ int main(int argc, char *argv[]) { a.installTranslator(&translator); MainWindow w; - // MainWindow w; w.update(); w.show(); diff --git a/mainwindow.cpp b/mainwindow.cpp index e2c8851..ebbb084 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -10,4 +10,3 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { delete ui; } - diff --git a/mainwindow.h b/mainwindow.h index e985a8a..84bf578 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -3,6 +3,7 @@ #include #include +#include namespace Ui { class MainWindow; @@ -15,9 +16,10 @@ class MainWindow : public QWidget public: explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); - -private: Ui::MainWindow *ui; +private slots: +private: + }; #endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui deleted file mode 100644 index 89f1549..0000000 --- a/mainwindow.ui +++ /dev/null @@ -1,124 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 1039 - 693 - - - - - 0 - 0 - - - - - 971 - 0 - - - - Form - - - - - - - - - - :/icons/assets/icons/OFD.svg:/icons/assets/icons/OFD.svg - - - - 128 - 128 - - - - - - - - PushButton - - - - - - - - 0 - 0 - - - - Text from E-Mail - - - false - - - - - - - :/icons/assets/icons/email-text.svg:/icons/assets/icons/email-text.svg - - - - 128 - 128 - - - - false - - - false - - - false - - - false - - - false - - - - - - - Optical Character Recognition - - - - - - - :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg - - - - 128 - 128 - - - - - - - - - - - - diff --git a/mainwindow.ui.old b/mainwindow.ui.old deleted file mode 100644 index a2bffa9..0000000 --- a/mainwindow.ui.old +++ /dev/null @@ -1,57 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 817 - 659 - - - - MainWindow - - - - - - 0 - -10 - 821 - 621 - - - - - - - Preferences - - - - - - - - - - 0 - 0 - 817 - 33 - - - - - checks parser - - - - - - - - - diff --git a/mainwindow_old.ui b/mainwindow_old.ui new file mode 100644 index 0000000..f4ebd1e --- /dev/null +++ b/mainwindow_old.ui @@ -0,0 +1,401 @@ + + + MainWindow + + + + 0 + 0 + 817 + 659 + + + + MainWindow + + + + + + 90 + 10 + 211 + 31 + + + + + + + 10 + 10 + 81 + 31 + + + + Store type + + + + + + 30 + 560 + 80 + 26 + + + + Parse + + + + + + 730 + 0 + 81 + 31 + + + + Preferences + + + + + + 10 + 50 + 801 + 511 + + + + 2 + + + + Text + + + + + 0 + 0 + 101 + 18 + + + + Check content + + + + + + 0 + 30 + 611 + 441 + + + + + + + OCR + + + + + 10 + 0 + 80 + 26 + + + + Choose + + + + + + 0 + 60 + 511 + 401 + + + + + + + 100 + 0 + 381 + 18 + + + + Path to image: + + + + + + 0 + 30 + 571 + 18 + + + + Here is recognised check text. Please, edit it if something's wrong: + + + + + + 490 + 10 + 291 + 421 + + + + + + + + + + OFD + + + + + 490 + 10 + 291 + 421 + + + + + + + + + + 100 + 0 + 381 + 18 + + + + Path to image: + + + + + + 10 + 0 + 80 + 26 + + + + Choose + + + + + + 180 + 50 + 261 + 26 + + + + 0000000000000000 + + + + + + 10 + 50 + 161 + 21 + + + + + 0 + 0 + + + + FN (Fiscal Number) + + + + + + 10 + 90 + 161 + 21 + + + + + 0 + 0 + + + + FD (Fiscal Document) + + + + + + 180 + 90 + 261 + 26 + + + + 0000000000 + + + + + + 10 + 130 + 161 + 21 + + + + + 0 + 0 + + + + FI (Fiscal Identifier) + + + + + + 180 + 130 + 261 + 26 + + + + 0000000000 + + + + + + 10 + 170 + 194 + 27 + + + + + + + 10 + 210 + 191 + 26 + + + + + Funds income + + + + + Funds return + + + + + Funds spend + + + + + Spends return + + + + + + + 90 + 250 + 113 + 26 + + + + + + + + + + 10 + 250 + 66 + 18 + + + + Total + + + + + + + + + 0 + 0 + 817 + 23 + + + + + checks parser + + + + + + + + + diff --git a/ocrscene.cpp b/ocrscene.cpp new file mode 100644 index 0000000..6d3821e --- /dev/null +++ b/ocrscene.cpp @@ -0,0 +1,12 @@ +#include "ocrscene.h" +#include "ui_ocrscene.h" + +OCRScene::OCRScene(QWidget *parent) + : QWidget(parent) + , ui(new Ui::OCRScene) { + ui->setupUi(this); +} + +OCRScene::~OCRScene() { + delete ui; +} diff --git a/ocrscene.h b/ocrscene.h new file mode 100644 index 0000000..64ede02 --- /dev/null +++ b/ocrscene.h @@ -0,0 +1,22 @@ +#ifndef OCRSCENE_H +#define OCRSCENE_H + +#include + +namespace Ui { +class OCRScene; +} + +class OCRScene : public QWidget +{ + Q_OBJECT + +public: + explicit OCRScene(QWidget *parent = nullptr); + ~OCRScene(); + +private: + Ui::OCRScene *ui; +}; + +#endif // OCRSCENE_H diff --git a/scenes.qrc b/scenes.qrc new file mode 100644 index 0000000..2178ed4 --- /dev/null +++ b/scenes.qrc @@ -0,0 +1,7 @@ + + + scenes/emailtextscene.ui + scenes/ocrscene.ui + scenes/mainwindow.ui + + diff --git a/scenes/emailtextscene.ui b/scenes/emailtextscene.ui new file mode 100644 index 0000000..4414ecc --- /dev/null +++ b/scenes/emailtextscene.ui @@ -0,0 +1,60 @@ + + + EmailTextScene + + + + 0 + 0 + 927 + 603 + + + + Form + + + + + + + + + + 0 + 0 + + + + Check content + + + Qt::AlignmentFlag::AlignCenter + + + + + + + Parse + + + + + + + + 0 + 0 + + + + Back + + + + + + + + diff --git a/scenes/mainwindow.ui b/scenes/mainwindow.ui new file mode 100644 index 0000000..11127a6 --- /dev/null +++ b/scenes/mainwindow.ui @@ -0,0 +1,121 @@ + + + MainWindow + + + + 0 + 0 + 1039 + 693 + + + + + 0 + 0 + + + + + 971 + 0 + + + + Form + + + + + + 6 + + + + + Optical Character Recognition + + + + + + + :/icons/assets/icons/OCR.svg:/icons/assets/icons/OCR.svg + + + + 128 + 128 + + + + + + + + + 0 + 0 + + + + Text from E-Mail + + + false + + + + + + + :/icons/assets/icons/email-text.svg:/icons/assets/icons/email-text.svg + + + + 128 + 128 + + + + false + + + false + + + false + + + false + + + false + + + + + + + + + + + :/icons/assets/icons/OFD.svg:/icons/assets/icons/OFD.svg + + + + 128 + 128 + + + + + + + + + + + diff --git a/scenes/ocrscene.ui b/scenes/ocrscene.ui new file mode 100644 index 0000000..d36066e --- /dev/null +++ b/scenes/ocrscene.ui @@ -0,0 +1,19 @@ + + + OCRScene + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + diff --git a/translations/en_US.ts b/translations/en_US.ts index 5712fdf..5df8de0 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -4,24 +4,43 @@ AdjustPictureDialog - Dialog - Dialog + Dialog - Please, zoom to qr code and adjust contrast so that qr code looks sharp - Please, zoom to qr code and adjust contrast so that qr code looks sharp + Please, zoom to qr code and adjust contrast so that qr code looks sharp - QR code was not detected on that image. Please edit it again or enter data manually - QR code was not detected on that image. Please edit it again or enter data manually + QR code was not detected on that image. Please edit it again or enter data manually - No QR code - No QR code + No QR code + + + + EmailTextScene + + + Form + + + + + Check content + Check content + + + + Parse + Parse + + + + Back + @@ -164,277 +183,231 @@ Please, select a picture to scan - + Form - - PushButton - - - - + Optical Character Recognition - + Text from E-Mail + + OCRScene + + + Form + + + OutputDialog - Dialog - Dialog + Dialog - Path to export: - Path to export: + Path to export: - Choose - Choose + Choose - Print header - Print header + Print header - Goods name - Goods name + Goods name - Goods price - Goods price + Goods price - Goods quantity - Goods quality + Goods quality - Goods net weight - Goods net weight + Goods net weight - Goods total - Goods total + Goods total - position - position + position - name - name + name - 1 - 1 + 1 - Name - Name + Name - 2 - 2 + 2 - Price - Price + Price - 3 - 3 + 3 - Quantity - Quantity + Quantity - 4 - 4 + 4 - Net weight - Net Weight + Net Weight - 5 - 5 + 5 - Total price - Total price + Total price - Print total - Print total + Print total SettingsDialog - You need to restart program to apply language changes - You need to restart program to apply language changes + You need to restart program to apply language changes - Restart required - Restart required + Restart required SolveCaptchaDialog - Dialog - Dialog + Dialog - Please, enter a valid captcha - Please, enter a valid captcha + Please, enter a valid captcha - No captcha - No captcha + No captcha settingsdialog - Dialog - Dialog + Dialog - Goods name position - Goods name position + Goods name position - Goods price per unit alias - Goods price per unit alias + Goods price per unit alias - TextLabel - Language + Language - en_US - en_US + en_US - ru_RU - ru_RU + ru_RU - - Choose - Choose + Choose - Print header - Print header + Print header - Goods net weight alias - Goods net weight alias + Goods net weight alias - Stores modules url - Stores modules url + Stores modules url - Goods total alias - Goods total alias + Goods total alias - Goods name alias - Goods name alias + Goods name alias - Goods quantity alias - Goods quantity alias + Goods quantity alias - Stores modules directory - Stores modules directory + Stores modules directory - OFD modules directory - OFD modules directory + OFD modules directory - Goods price per unit position - Goods price per unit position + Goods price per unit position - Goods net weight position - Goods net weight position + Goods net weight position - OFD modules url - OFD modules url + OFD modules url - Goods total position - Goods total position + Goods total position - Goods quantity position - Goods quantity position + Goods quantity position - Print total - Print total + Print total diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index cb96b68..dcaa91f 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -4,24 +4,43 @@ AdjustPictureDialog - Dialog - Диалог + Диалог - Please, zoom to qr code and adjust contrast so that qr code looks sharp - Пожалуйста, приблизьте QR код и настройте контраст, чтобы он читался + Пожалуйста, приблизьте QR код и настройте контраст, чтобы он читался - QR code was not detected on that image. Please edit it again or enter data manually - QR код не найден на этом изображении. Пожалуйста, попытайтесь снова или введите данные вручную + QR код не найден на этом изображении. Пожалуйста, попытайтесь снова или введите данные вручную - No QR code - QR код не найден + QR код не найден + + + + EmailTextScene + + + Form + + + + + Check content + Контент чека + + + + Parse + Парсить + + + + Back + @@ -164,277 +183,231 @@ Пожалуйста, выберете изображение для сканирования - + Form - - PushButton - - - - + Optical Character Recognition - + Text from E-Mail + + OCRScene + + + Form + + + OutputDialog - Dialog - Диалог + Диалог - Path to export: - Путь для экспорта: + Путь для экспорта: - Choose - Выбрать + Выбрать - Print header - Печатать заголовок + Печатать заголовок - Goods name - Имя товара + Имя товара - Goods price - Цена товара + Цена товара - Goods quantity - Количество товара + Количество товара - Goods net weight - Масса нетто товара + Масса нетто товара - Goods total - Всего за товар + Всего за товар - position - позиция + позиция - name - алиас + алиас - 1 - 1 + 1 - Name - Имя + Имя - 2 - 2 + 2 - Price - Цена + Цена - 3 - 3 + 3 - Quantity - Количество + Количество - 4 - 4 + 4 - Net weight - Масса нетто + Масса нетто - 5 - 5 + 5 - Total price - Всего + Всего - Print total - Печатать Итого + Печатать Итого SettingsDialog - You need to restart program to apply language changes - Требуется перезагрузить программу, чтобы применить изменения языка + Требуется перезагрузить программу, чтобы применить изменения языка - Restart required - Требуется перезагрузка + Требуется перезагрузка SolveCaptchaDialog - Dialog - Диалог + Диалог - Please, enter a valid captcha - Пожалуйста, введите верную капчу + Пожалуйста, введите верную капчу - No captcha - Нет капчи + Нет капчи settingsdialog - Dialog - Диалог + Диалог - Goods name position - Позиция имени товара + Позиция имени товара - Goods price per unit alias - Алиас цены товара + Алиас цены товара - TextLabel - Язык + Язык - en_US - en_US + en_US - ru_RU - ru_RU + ru_RU - - Choose - Выбрать + Выбрать - Print header - Печатать заголовок + Печатать заголовок - Goods net weight alias - Алиас массы нетто товара + Алиас массы нетто товара - Stores modules url - URL модулей магазина + URL модулей магазина - Goods total alias - Алиас всего за продукт + Алиас всего за продукт - Goods name alias - Алиас имени товара + Алиас имени товара - Goods quantity alias - Алиас количества товара + Алиас количества товара - Stores modules directory - Директория модулей магазина + Директория модулей магазина - OFD modules directory - Директория модулей ОФД + Директория модулей ОФД - Goods price per unit position - Позиция центы товара + Позиция центы товара - Goods net weight position - Позиция массы нетто товара + Позиция массы нетто товара - OFD modules url - URL модулей ОФД + URL модулей ОФД - Goods total position - Позиция всего за товар + Позиция всего за товар - Goods quantity position - Позиция количества товара + Позиция количества товара - Print total - Печатать Итого + Печатать Итого From 4c7a25c53e3d0d92c18a349642c2f886b3da67ee Mon Sep 17 00:00:00 2001 From: leca Date: Tue, 11 Mar 2025 19:37:58 +0300 Subject: [PATCH 4/8] added ui for ofd --- CMakeLists.txt | 2 + main.cpp | 6 + ofdscene.cpp | 12 ++ ofdscene.h | 22 +++ mainwindow_old.ui => old_mainwindow.ui | 4 +- scenes.qrc | 3 +- scenes/emailtextscene.ui | 33 ++--- scenes/ocrscene.ui | 89 +++++++++++- scenes/ofdscene.ui | 190 +++++++++++++++++++++++++ translations/en_US.ts | 116 ++++++++++++++- translations/ru_RU.ts | 116 ++++++++++++++- 11 files changed, 562 insertions(+), 31 deletions(-) create mode 100644 ofdscene.cpp create mode 100644 ofdscene.h rename mainwindow_old.ui => old_mainwindow.ui (99%) create mode 100644 scenes/ofdscene.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index 38e0773..071ed1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ set(PROJECT_SOURCES emailtextscene.h emailtextscene.cpp scenes/emailtextscene.ui ocrscene.h ocrscene.cpp scenes/ocrscene.ui + ofdscene.h ofdscene.cpp scenes/ofdscene.ui ) set(TRANSLATION_SOURCES @@ -45,6 +46,7 @@ set(TRANSLATION_SOURCES mainwindow.cpp mainwindow.h scenes/mainwindow.ui emailtextscene.cpp emailtextscene.h scenes/emailtextscene.ui ocrscene.cpp ocrscene.h scenes/ocrscene.ui + ofdscene.cpp ofdscene.h scenes/ofdscene.ui ) set(TS_FILES diff --git a/main.cpp b/main.cpp index c1afbf0..c516e06 100644 --- a/main.cpp +++ b/main.cpp @@ -66,9 +66,15 @@ int main(int argc, char *argv[]) { //OCR scene QWidget *ocrscene = loadUI(window, ":/scenes/scenes/ocrscene.ui"); + //OFD scene + QWidget *ofdscene = loadUI(window, ":/scenes/scenes/ofdscene.ui"); + + + sceneLayout->addWidget(mainwindowscene); sceneLayout->addWidget(emailtextscene); sceneLayout->addWidget(ocrscene); + sceneLayout->addWidget(ofdscene); //Setting all back buttons for (uint32_t sceneIndex = 0; sceneIndex < sceneLayout->count(); sceneIndex ++) { diff --git a/ofdscene.cpp b/ofdscene.cpp new file mode 100644 index 0000000..2e62180 --- /dev/null +++ b/ofdscene.cpp @@ -0,0 +1,12 @@ +#include "ofdscene.h" +#include "ui_ofdscene.h" + +OFDScene::OFDScene(QWidget *parent) + : QWidget(parent) + , ui(new Ui::OFDScene) { + ui->setupUi(this); +} + +OFDScene::~OFDScene() { + delete ui; +} diff --git a/ofdscene.h b/ofdscene.h new file mode 100644 index 0000000..7de646d --- /dev/null +++ b/ofdscene.h @@ -0,0 +1,22 @@ +#ifndef OFDSCENE_H +#define OFDSCENE_H + +#include + +namespace Ui { +class OFDScene; +} + +class OFDScene : public QWidget +{ + Q_OBJECT + +public: + explicit OFDScene(QWidget *parent = nullptr); + ~OFDScene(); + +private: + Ui::OFDScene *ui; +}; + +#endif // OFDSCENE_H diff --git a/mainwindow_old.ui b/old_mainwindow.ui similarity index 99% rename from mainwindow_old.ui rename to old_mainwindow.ui index f4ebd1e..db5c247 100644 --- a/mainwindow_old.ui +++ b/old_mainwindow.ui @@ -73,7 +73,7 @@ - 2 + 1 @@ -384,7 +384,7 @@ 0 0 817 - 23 + 33 diff --git a/scenes.qrc b/scenes.qrc index 2178ed4..790004d 100644 --- a/scenes.qrc +++ b/scenes.qrc @@ -1,7 +1,8 @@ scenes/emailtextscene.ui - scenes/ocrscene.ui + scenes/ocrscene.ui scenes/mainwindow.ui + scenes/ofdscene.ui diff --git a/scenes/emailtextscene.ui b/scenes/emailtextscene.ui index 4414ecc..b8677ba 100644 --- a/scenes/emailtextscene.ui +++ b/scenes/emailtextscene.ui @@ -6,8 +6,8 @@ 0 0 - 927 - 603 + 1077 + 608 @@ -17,22 +17,6 @@ - - - - - 0 - 0 - - - - Check content - - - Qt::AlignmentFlag::AlignCenter - - - @@ -53,6 +37,19 @@ + + + + + 0 + 0 + + + + Check content + + + diff --git a/scenes/ocrscene.ui b/scenes/ocrscene.ui index d36066e..18d4477 100644 --- a/scenes/ocrscene.ui +++ b/scenes/ocrscene.ui @@ -6,13 +6,98 @@ 0 0 - 400 - 300 + 992 + 634 + + + 0 + 0 + + Form + + + 8 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Choose + + + + + + + + 0 + 0 + + + + Path to image: + + + + + + + + 0 + 0 + + + + Recognized text will be shown below as soon as image will be processed. Please, edit it + + + + + + + + + + + 0 + 0 + + + + Back + + + + + + + + 0 + 0 + + + + Parse + + + + diff --git a/scenes/ofdscene.ui b/scenes/ofdscene.ui new file mode 100644 index 0000000..a035c7c --- /dev/null +++ b/scenes/ofdscene.ui @@ -0,0 +1,190 @@ + + + OFDScene + + + + 0 + 0 + 894 + 625 + + + + Form + + + + QLayout::SizeConstraint::SetDefaultConstraint + + + + + Total + + + + + + + + 0 + 0 + + + + Back + + + + + + + + 0 + 0 + + + + or + + + + + + + + + + + 0 + 0 + + + + FD (Fiscal Document) + + + + + + + Date and time of purchase + + + + + + + + Funds income + + + + + Funds return + + + + + Funds spend + + + + + Spends return + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + Use your phone as a QR code scanner + + + + + + + + 0 + 0 + + + + FN (Fiscal Number) + + + + + + + FI (Fiscal Identifier) + + + + + + + + + + Choose image on your PC + + + + + + + Operation type + + + + + + + + 0 + 0 + + + + Parse + + + + + + + + diff --git a/translations/en_US.ts b/translations/en_US.ts index 5df8de0..132bb08 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -28,17 +28,17 @@ - + Check content Check content - + Parse Parse - + Back @@ -201,10 +201,118 @@ OCRScene - + Form + + + Choose + Choose + + + + Path to image: + + + + + Recognized text will be shown below as soon as image will be processed. Please, edit it + + + + + Back + + + + + Parse + Parse + + + + OFDScene + + + Form + + + + + Total + Total + + + + Back + + + + + or + + + + + FD (Fiscal Document) + FD (Fiscal Document) + + + + Date and time of purchase + + + + + Funds income + Funds income + + + + Funds return + Funds return + + + + Funds spend + Funds spend + + + + Spends return + Spends return + + + + Use your phone as a QR code scanner + + + + + FN (Fiscal Number) + FN (Fiscal Number) + + + + FI (Fiscal Identifier) + FI (Fiscal Identifier) + + + + Choose image + + + + + Operation type + + + + + Parse + Parse + OutputDialog diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index dcaa91f..4336f73 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -28,17 +28,17 @@ - + Check content Контент чека - + Parse Парсить - + Back @@ -201,10 +201,118 @@ OCRScene - + Form + + + Choose + Выбрать + + + + Path to image: + + + + + Recognized text will be shown below as soon as image will be processed. Please, edit it + + + + + Back + + + + + Parse + Парсить + + + + OFDScene + + + Form + + + + + Total + Итого + + + + Back + + + + + or + + + + + FD (Fiscal Document) + ФД + + + + Date and time of purchase + + + + + Funds income + Приход средств + + + + Funds return + Возврат средств + + + + Funds spend + Расход средств + + + + Spends return + Возврат расхода + + + + Use your phone as a QR code scanner + + + + + FN (Fiscal Number) + ФН + + + + FI (Fiscal Identifier) + ФП + + + + Choose image + + + + + Operation type + + + + + Parse + Парсить + OutputDialog From 1ae724f925d9694b126fe56ccb6bd824e6cab8c5 Mon Sep 17 00:00:00 2001 From: leca Date: Tue, 11 Mar 2025 23:31:08 +0300 Subject: [PATCH 5/8] added functionality to email text and ocr scenes --- CMakeLists.txt | 4 + check/check.cpp | 8 +- check/check.h | 1 + emailtextscene.cpp | 39 +++- emailtextscene.h | 5 + main.cpp | 20 +- mainwindow.cpp | 3 + ocrscene.cpp | 61 +++++ ocrscene.h | 7 + outputdialog.ui | 215 ------------------ parser/module.cpp | 2 +- parser/parser.cpp | 42 +++- parser/parser.h | 2 + scenes.qrc | 1 + .../adjustpicturedialog.ui | 0 scenes/emailtextscene.ui | 71 ++++-- scenes/ocrscene.ui | 93 +++++--- scenes/outputdialog.ui | 187 +++++++++++++++ translations/en_US.ts | 133 ++++++++--- translations/ru_RU.ts | 133 ++++++++--- 20 files changed, 679 insertions(+), 348 deletions(-) delete mode 100644 outputdialog.ui rename adjustpicturedialog.ui => scenes/adjustpicturedialog.ui (100%) create mode 100644 scenes/outputdialog.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index 071ed1a..631b6da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,8 @@ set(PROJECT_SOURCES emailtextscene.h emailtextscene.cpp scenes/emailtextscene.ui ocrscene.h ocrscene.cpp scenes/ocrscene.ui ofdscene.h ofdscene.cpp scenes/ofdscene.ui + outputdialog.h outputdialog.cpp scenes/outputdialog.ui + # adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui ) set(TRANSLATION_SOURCES @@ -47,6 +49,8 @@ set(TRANSLATION_SOURCES emailtextscene.cpp emailtextscene.h scenes/emailtextscene.ui ocrscene.cpp ocrscene.h scenes/ocrscene.ui ofdscene.cpp ofdscene.h scenes/ofdscene.ui + outputdialog.h outputdialog.cpp scenes/outputdialog.ui + # adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui ) set(TS_FILES diff --git a/check/check.cpp b/check/check.cpp index 6a1881a..587d0eb 100644 --- a/check/check.cpp +++ b/check/check.cpp @@ -5,10 +5,16 @@ Check::Check() {} void Check::add_goods(Goods goods) { this->goods.push_back(goods); } +void Check::add_goods(std::vector &goods) { + for (auto g : goods) { + this->goods.push_back(g); + } +} + double Check::calculae_total_price() { double total = 0.0; - for (Goods g : this->goods) { + for (Goods &g : goods) { total += g.calculate_total_price(); } diff --git a/check/check.h b/check/check.h index a7b8299..01af62b 100644 --- a/check/check.h +++ b/check/check.h @@ -9,6 +9,7 @@ class Check { public: Check(); void add_goods(Goods); + void add_goods(std::vector &goods); double calculae_total_price(); diff --git a/emailtextscene.cpp b/emailtextscene.cpp index 221a010..5c70c11 100644 --- a/emailtextscene.cpp +++ b/emailtextscene.cpp @@ -1,14 +1,45 @@ #include "emailtextscene.h" #include "ui_emailtextscene.h" +#include +#include +#include +#include EmailTextScene::EmailTextScene(QWidget *parent) : QWidget(parent) - , ui(new Ui::EmailTextScene) -{ + , ui(new Ui::EmailTextScene) { ui->setupUi(this); + + auto modules = parser.get_modules_names(); + + for (auto &module : modules) { + ui->store_combo_box->addItem(QString::fromStdString(module)); + } } -EmailTextScene::~EmailTextScene() -{ +EmailTextScene::~EmailTextScene() { delete ui; } + +void EmailTextScene::on_parse_button_clicked() { + std::wstring checkContent = ui->check_content->toPlainText().toStdWString(); + parser.set_module(parser.search_modules()[ui->store_combo_box->currentIndex()]); + + std::vector goods = parser.parse(checkContent); + if (goods.size() == 0) { + QMessageBox infoDialog; + infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Error in parsing")); + infoDialog.exec(); + return; + } + + Check check; + check.add_goods(goods); + + OutputDialog d(this, check); + d.show(); + d.exec(); +} + diff --git a/emailtextscene.h b/emailtextscene.h index 7b55eea..4a8739a 100644 --- a/emailtextscene.h +++ b/emailtextscene.h @@ -1,6 +1,7 @@ #ifndef EMAILTEXTSCENE_H #define EMAILTEXTSCENE_H +#include "parser/parser.h" #include namespace Ui { @@ -15,8 +16,12 @@ public: explicit EmailTextScene(QWidget *parent = nullptr); ~EmailTextScene(); +private slots: + void on_parse_button_clicked(); + private: Ui::EmailTextScene *ui; + Parser parser; }; #endif // EMAILTEXTSCENE_H diff --git a/main.cpp b/main.cpp index c516e06..fda2410 100644 --- a/main.cpp +++ b/main.cpp @@ -17,6 +17,9 @@ #include #include #include +#include +#include +#include #include #include @@ -48,31 +51,38 @@ int main(int argc, char *argv[]) { QObject::connect(text_from_email_button, &QPushButton::clicked, [&]() { // Text from email scene sceneLayout->setCurrentIndex(1); + sceneLayout->widget(1)->show(); }); QObject::connect(ocr_button, &QPushButton::clicked, [&]() { // OCR scene sceneLayout->setCurrentIndex(2); + sceneLayout->widget(2)->show(); }); QObject::connect(ofd_button, &QPushButton::clicked, [&]() { // OCR scene sceneLayout->setCurrentIndex(3); + sceneLayout->widget(3)->show(); }); - // Text from email setup - QWidget *emailtextscene = loadUI(window, ":/scenes/scenes/emailtextscene.ui"); + // // Text from email setup + // QWidget *emailtextscene = loadUI(window, ":/scenes/scenes/emailtextscene.ui"); + // emailtextscene->show(); //OCR scene - QWidget *ocrscene = loadUI(window, ":/scenes/scenes/ocrscene.ui"); + // QWidget *ocrscene = loadUI(window, ":/scenes/scenes/ocrscene.ui"); //OFD scene - QWidget *ofdscene = loadUI(window, ":/scenes/scenes/ofdscene.ui"); + // QWidget *ofdscene = loadUI(window, ":/scenes/scenes/ofdscene.ui"); + EmailTextScene *emailTextScene = new EmailTextScene(); + OCRScene *ocrscene = new OCRScene(); + OFDScene *ofdscene = new OFDScene(); sceneLayout->addWidget(mainwindowscene); - sceneLayout->addWidget(emailtextscene); + sceneLayout->addWidget(emailTextScene); sceneLayout->addWidget(ocrscene); sceneLayout->addWidget(ofdscene); diff --git a/mainwindow.cpp b/mainwindow.cpp index ebbb084..177df99 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,10 +1,13 @@ #include "mainwindow.h" #include "ui_mainwindow.h" +#include MainWindow::MainWindow(QWidget *parent) : QWidget(parent) , ui(new Ui::MainWindow) { ui->setupUi(this); + + std::cout << "test" << std::endl; } MainWindow::~MainWindow() { diff --git a/ocrscene.cpp b/ocrscene.cpp index 6d3821e..dc1e782 100644 --- a/ocrscene.cpp +++ b/ocrscene.cpp @@ -1,12 +1,73 @@ #include "ocrscene.h" #include "ui_ocrscene.h" +#include +#include +#include + +#include + +#include + OCRScene::OCRScene(QWidget *parent) : QWidget(parent) , ui(new Ui::OCRScene) { ui->setupUi(this); + + auto modules = parser.get_modules_names(); + + for (auto &module : modules) { + ui->store_combo_box->addItem(QString::fromStdString(module)); + } } OCRScene::~OCRScene() { delete ui; } + +void OCRScene::on_parse_button_clicked() { + std::wstring checkContent = ui->check_text_edit->toPlainText().toStdWString(); + + parser.set_module(parser.search_modules()[ui->store_combo_box->currentIndex()]); + + std::vector goods = parser.parse(checkContent); + if (goods.size() == 0) { + QMessageBox infoDialog; + infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Error in parsing")); + infoDialog.exec(); + return; + } + + Check check; + check.add_goods(goods); + + OutputDialog d(this, check); + d.show(); + d.exec(); +} + +void OCRScene::on_choose_image_button_clicked() { + QString filename = QFileDialog::getOpenFileName(); + + if (filename == "") { + QMessageBox infoDialog; + infoDialog.setText(tr("Please, select a picture to scan")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Picture was not selected")); + infoDialog.exec(); + return; + } + + std::string new_text = "Selected: " + filename.toStdString(); + ui->path_to_image_label->setText(tr("Path to image: ")+ filename); + + CheckImage i(filename.toStdString()); + std::string parsed = i.parse_text(); + + ui->check_text_edit->setPlainText(QString::fromStdString(parsed)); + + +} + diff --git a/ocrscene.h b/ocrscene.h index 64ede02..2909825 100644 --- a/ocrscene.h +++ b/ocrscene.h @@ -1,6 +1,7 @@ #ifndef OCRSCENE_H #define OCRSCENE_H +#include "parser/parser.h" #include namespace Ui { @@ -15,8 +16,14 @@ public: explicit OCRScene(QWidget *parent = nullptr); ~OCRScene(); +private slots: + void on_parse_button_clicked(); + + void on_choose_image_button_clicked(); + private: Ui::OCRScene *ui; + Parser parser; }; #endif // OCRSCENE_H diff --git a/outputdialog.ui b/outputdialog.ui deleted file mode 100644 index c6e462f..0000000 --- a/outputdialog.ui +++ /dev/null @@ -1,215 +0,0 @@ - - - OutputDialog - - - - 0 - 0 - 586 - 431 - - - - Dialog - - - - - 410 - 390 - 166 - 26 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 10 - 20 - 271 - 18 - - - - Path to export: - - - - - - 290 - 20 - 80 - 26 - - - - Choose - - - - - - 10 - 50 - 371 - 24 - - - - Print header - - - - - - 10 - 130 - 401 - 221 - - - - - Goods name - - - - - Goods price - - - - - Goods quantity - - - - - Goods net weight - - - - - Goods total - - - - - position - - - - - name - - - - - 1 - - - - - Name - - - - - 2 - - - - - Price - - - - - 3 - - - - - Quantity - - - - - 4 - - - - - Net weight - - - - - 5 - - - - - Total price - - - - - - - 10 - 90 - 381 - 24 - - - - Print total - - - - - - - buttonBox - accepted() - OutputDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - OutputDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/parser/module.cpp b/parser/module.cpp index ebdc002..dba8d44 100644 --- a/parser/module.cpp +++ b/parser/module.cpp @@ -31,7 +31,7 @@ StoreModule::StoreModule(std::string path) { std::vector StoreModule::parse_name(std::wstring str) { std::vector result; - std::wregex r(this->goods_name_regex, std::regex::collate); + std::wregex r(this->goods_name_regex, std::regex_constants::multiline); for (std::wsregex_iterator it{str.begin(), str.end(), r}, end{}; it != end; it++) { diff --git a/parser/parser.cpp b/parser/parser.cpp index a35a2b1..d15a0ff 100644 --- a/parser/parser.cpp +++ b/parser/parser.cpp @@ -4,6 +4,7 @@ #include "../settings/settings.h" #include "../utils/utils.h" #include +#include #if __GNUC__ < 8 && __clang_major__ < 17 # include @@ -14,6 +15,27 @@ using namespace std::filesystem; #endif +static void dumpVectorsToStdErr(std::vector &goods_names, std::vector &goods_prices, std::vector& goods_quantities) { + std::cerr << goods_names.size() << " " << goods_prices.size() << " " << goods_quantities.size() << std::endl; + std::cerr << "Found goods names: "; + for (auto &goods_name : goods_names) { + std::cerr << goods_name << " "; + } + std::cerr << std::endl; + + std::cerr << "Found goods prices: "; + for (auto &goods_price : goods_prices) { + std::cerr << goods_price << " "; + } + std::cerr << std::endl; + + std::cerr << "Found goods names: "; + for (auto &goods_quantity : goods_quantities) { + std::cerr << goods_quantity << " "; + } + std::cerr << std::endl; +} + Parser::Parser() {} std::vector Parser::search_modules() { @@ -31,13 +53,28 @@ std::vector Parser::search_modules() { std::vector modules_files; - for (auto file : directory_iterator(path)) { + for (auto &file : directory_iterator(path)) { modules_files.push_back(file.path()); } return modules_files; } +std::vector Parser::get_modules_names() { + std::vector modules = this->search_modules(); + std::vector names = {}; + + for (std::string &modulePath : modules) { + std::ifstream inputFile(modulePath); + + nlohmann::json module = nlohmann::json::parse(inputFile); + std::string name = module["name"]; + names.push_back(name); + } + + return names; +} + void Parser::set_module(std::string path) { module = StoreModule(path); } std::vector Parser::parse(std::wstring check_plaintext) { @@ -53,6 +90,9 @@ std::vector Parser::parse(std::wstring check_plaintext) { if (goods_names.size() != goods_prices.size() || goods_names.size() != goods_quantities.size() || goods_prices.size() != goods_quantities.size()) { + + dumpVectorsToStdErr(goods_names, goods_prices, goods_quantities); + //Error. Amount of names, prices or quantities are not equal. That means, that some regex(es) has mismatched. return {}; } diff --git a/parser/parser.h b/parser/parser.h index 5e4136f..c845785 100644 --- a/parser/parser.h +++ b/parser/parser.h @@ -15,6 +15,8 @@ public: std::vector search_modules(); + std::vector get_modules_names(); + std::vector check_updates(); void set_module(std::string); diff --git a/scenes.qrc b/scenes.qrc index 790004d..026d8a5 100644 --- a/scenes.qrc +++ b/scenes.qrc @@ -1,5 +1,6 @@ + scenes/outputdialog.ui scenes/emailtextscene.ui scenes/ocrscene.ui scenes/mainwindow.ui diff --git a/adjustpicturedialog.ui b/scenes/adjustpicturedialog.ui similarity index 100% rename from adjustpicturedialog.ui rename to scenes/adjustpicturedialog.ui diff --git a/scenes/emailtextscene.ui b/scenes/emailtextscene.ui index b8677ba..84573c2 100644 --- a/scenes/emailtextscene.ui +++ b/scenes/emailtextscene.ui @@ -14,30 +14,7 @@ Form - - - - - - - Parse - - - - - - - - 0 - 0 - - - - Back - - - - + @@ -50,6 +27,52 @@ + + + + Parse + + + + + + + + 0 + 0 + + + + Store: + + + + + + + + + + + 0 + 0 + + + + Back + + + + + + + + 0 + 0 + + + + diff --git a/scenes/ocrscene.ui b/scenes/ocrscene.ui index 18d4477..1c9aa59 100644 --- a/scenes/ocrscene.ui +++ b/scenes/ocrscene.ui @@ -23,7 +23,30 @@ 8 - + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Parse + + + + @@ -42,36 +65,7 @@ - - - - - 0 - 0 - - - - Path to image: - - - - - - - - 0 - 0 - - - - Recognized text will be shown below as soon as image will be processed. Please, edit it - - - - - - - + @@ -84,16 +78,45 @@ - - + + - + 0 0 - Parse + Recognized text will be shown below as soon as image will be processed. Please, edit it + + + + + + + + 0 + 0 + + + + Path to image: + + + + + + + + + + + 0 + 0 + + + + Store: diff --git a/scenes/outputdialog.ui b/scenes/outputdialog.ui new file mode 100644 index 0000000..f458fdf --- /dev/null +++ b/scenes/outputdialog.ui @@ -0,0 +1,187 @@ + + + OutputDialog + + + + 0 + 0 + 892 + 537 + + + + Dialog + + + + + + Path to export: + + + + + + + Choose + + + + + + + Print header + + + + + + + Print total + + + + + + + + 0 + 0 + + + + + Goods name + + + + + Goods price + + + + + Goods quantity + + + + + Goods net weight + + + + + Goods total + + + + + position + + + + + name + + + + + 1 + + + + + Name + + + + + 2 + + + + + Price + + + + + 3 + + + + + Quantity + + + + + 4 + + + + + Net weight + + + + + 5 + + + + + Total price + + + + + + + + Qt::Orientation::Horizontal + + + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok + + + + + + + + + buttonBox + accepted() + OutputDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + OutputDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/translations/en_US.ts b/translations/en_US.ts index 132bb08..fce0d7f 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -28,20 +28,39 @@ - + Store type + Store type + + + Check content Check content - + Parse Parse - + + Store: + + + + Back + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + + + + Error in parsing + Error in parsing + MainWindow @@ -206,30 +225,60 @@ - + Choose Choose - + Path to image: - + + Store: + + + + Recognized text will be shown below as soon as image will be processed. Please, edit it - + Back - + Parse Parse + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + + + + Error in parsing + Error in parsing + + + + Please, select a picture to scan + Please, select a picture to scan + + + + Picture was not selected + Picture was not selected + + + + Path to image: + Path to image: + OFDScene @@ -300,7 +349,7 @@ - Choose image + Choose image on your PC @@ -317,92 +366,114 @@ OutputDialog + Dialog - Dialog + Dialog + Path to export: - Path to export: + Path to export: + Choose - Choose + Choose + Print header - Print header + Print header + Goods name - Goods name + Goods name + Goods price - Goods price + Goods price + Goods quantity - Goods quality + Goods quality + Goods net weight - Goods net weight + Goods net weight + Goods total - Goods total + Goods total + position - position + position + name - name + name + 1 - 1 + 1 + Name - Name + Name + 2 - 2 + 2 + Price - Price + Price + 3 - 3 + 3 + Quantity - Quantity + Quantity + 4 - 4 + 4 + Net weight - Net Weight + Net Weight + 5 - 5 + 5 + Total price - Total price + Total price + Print total - Print total + Print total diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 4336f73..4e7fe60 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -28,20 +28,39 @@ - + Store type + Магазин + + + Check content Контент чека - + Parse Парсить - + + Store: + + + + Back + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + + + + Error in parsing + Ошибка в парсинге + MainWindow @@ -206,30 +225,60 @@ - + Choose Выбрать - + Path to image: - + + Store: + + + + Recognized text will be shown below as soon as image will be processed. Please, edit it - + Back - + Parse Парсить + + + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + + + + Error in parsing + Ошибка в парсинге + + + + Please, select a picture to scan + Пожалуйста, выберете изображение для сканирования + + + + Picture was not selected + Изображение не было выбрано + + + + Path to image: + Путь к изображению: + OFDScene @@ -300,7 +349,7 @@ - Choose image + Choose image on your PC @@ -317,92 +366,114 @@ OutputDialog + Dialog - Диалог + Диалог + Path to export: - Путь для экспорта: + Путь для экспорта: + Choose - Выбрать + Выбрать + Print header - Печатать заголовок + Печатать заголовок + Goods name - Имя товара + Имя товара + Goods price - Цена товара + Цена товара + Goods quantity - Количество товара + Количество товара + Goods net weight - Масса нетто товара + Масса нетто товара + Goods total - Всего за товар + Всего за товар + position - позиция + позиция + name - алиас + алиас + 1 - 1 + 1 + Name - Имя + Имя + 2 - 2 + 2 + Price - Цена + Цена + 3 - 3 + 3 + Quantity - Количество + Количество + 4 - 4 + 4 + Net weight - Масса нетто + Масса нетто + 5 - 5 + 5 + Total price - Всего + Всего + Print total - Печатать Итого + Печатать Итого From b305fba2fd6a5f0c65ff1e1d2b6bb8c26b597f09 Mon Sep 17 00:00:00 2001 From: leca Date: Wed, 12 Mar 2025 12:53:43 +0300 Subject: [PATCH 6/8] russian grammar --- README.ru.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.ru.md b/README.ru.md index ca2bfe3..85adc56 100644 --- a/README.ru.md +++ b/README.ru.md @@ -4,25 +4,25 @@ Чек парсер - это приложение, позволяющее доставать содержимое чека и переводить его в .csv файлы. !!!НА ДАННЫЙ МОМЕНТ ПОДДЕРЖИВАЮТСЯ ТОЛЬКО РУССКИЕ ЧЕКИ!!! -Чтобы узнать, почему [смотрите здесь](https://git.foxarmy.org/leca/checks-parser/src/branch/master/README.ru.md#checks-from-different-countries) +Чтобы узнать почему [смотрите здесь](https://git.foxarmy.org/leca/checks-parser/src/branch/master/README.ru.md#checks-from-different-countries) # Пользование Для более детального описания, пожалуйста, обратитесь к [вики](https://git.foxarmy.org/leca/checks-parser/wiki/Description-%5BRU%5D) ### Ввод данных Доступны следующие способы ввода данных: -* Через изображениие (используется OCR(Optical Character Recognition, Оптическое распознавание символов) чтобы прочитать содержимое чека. Изображение чека должно быть контрастным и выровненным (текст обязан быть перпендикулярным к границам изображения) хорошо, чтобы нормально прочитаться.) OCR - не волшебная палочка :( -* Через просто текст, скопированный из эл. письма. Просто скопируйте и вставьте текст с вашего письма, выберите подходящий магазин (автодетект в планах!) и парсите. -* Через QRCode на чеке (этот метод запрашивает данные у ОФД (Оператор Фискальных Данных) (В данном конкретном случае, к ofd.ru)). +* Через изображениие (используется OCR(Optical Character Recognition, Оптическое распознавание символов), чтобы прочитать содержимое чека. Изображение чека должно быть контрастным и выровненным (текст обязан быть перпендикулярным к границам изображения) хорошо, чтобы нормально прочитаться. OCR - не волшебная палочка :( +* Через простой текст, скопированный из эл. письма. Скопируйте и вставьте текст с вашего письма, выберите подходящий магазин (автодетект в планах!) и парсите. +* Через QRCode на чеке (этот метод запрашивает данные у ОФД (Оператор Фискальных Данных), в данном конкретном случае, к ofd.ru). ### Вывод данных -На начальном этапе разработки программы, Я задумывался о 3 или более форматов вывода: csv, xlsx и ods. Но по мере разработки, я понял, что большинство современных табличных процессоров (электронных таблиц) способны импортировать в себя csv гораздо лучше, чем смог бы написать я сам. Так что я решил не делать вывод во все остальные форматы, кроме csv. +На начальном этапе разработки программы, Я задумывался о 3-х или более форматов вывода: csv, xlsx и ods. Но, по мере разработки, я понял, что большинство современных табличных процессоров (электронных таблиц) способны импортировать в себя csv гораздо лучше, чем смог бы написать я сам. Так что я решил не делать вывод во все остальные форматы, кроме csv. -Чтобы экспортировать, вам нужно указать путь до файла, если вы желаете, вы можете изменить порядок и/или переименовать (алиасы) столбцы, выбрать печатать или не печатать заголовок (алиасы столбцов) и "итого" +Чтобы экспортировать вам нужно: указать путь до файла, если вы желаете, вы можете изменить порядок и/или переименовать (алиасы) столбцы, выбрать печатать или не печатать заголовок (алиасы столбцов) и "итого". # Установка ## Сборка из исходников -В целом, вам нужно установить следующие зависимости чтобы собрать приложение (я предполагаю, что вы уже имеете на системе базовые пакеты вроде cmake, make, gcc, git и так далее): +В целом, вам нужно установить следующие зависимости, чтобы собрать приложение (я предполагаю, что вы уже имеете на системе базовые пакеты вроде cmake, make, gcc, git и так далее): * tesseract (также вам нужно будет установить языковой пакет для него, например tesseract-data-rus на Arch Linux или tesseract-ocr-rus на Debian Linux.) * opencv * zbar From 33b54fb4754241dab008e74efeff6ae10fbf2123 Mon Sep 17 00:00:00 2001 From: leca Date: Fri, 14 Mar 2025 00:44:14 +0300 Subject: [PATCH 7/8] added ofd scene, working http server --- CMakeLists.txt | 22 ++- image/checkimage.cpp | 3 +- main.cpp | 16 +- ofdscene.cpp | 138 ++++++++++++++++++ ofdscene.h | 8 + scenes.qrc | 1 + scenes/ofdscene.ui | 6 +- .../solvecaptchadialog.ui | 0 translations/en_US.ts | 90 +++++++++--- translations/ru_RU.ts | 90 +++++++++--- utils/utils.cpp | 74 +++++++++- utils/utils.h | 1 + 12 files changed, 390 insertions(+), 59 deletions(-) rename solvecaptchadialog.ui => scenes/solvecaptchadialog.ui (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 631b6da..58362ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,10 @@ project(checks-parser VERSION 0.1 LANGUAGES CXX) option(BUILD_TRANSLATIONS "Build translations?" ON) +include(FetchContent) + +SET(CMAKE_BUILD_TYPE Debug) + set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC OFF) @@ -40,7 +44,9 @@ set(PROJECT_SOURCES ocrscene.h ocrscene.cpp scenes/ocrscene.ui ofdscene.h ofdscene.cpp scenes/ofdscene.ui outputdialog.h outputdialog.cpp scenes/outputdialog.ui - # adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui + adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui + image_redactor/imageredactor.h image_redactor/imageredactor.cpp + solvecaptchadialog.h solvecaptchadialog.cpp scenes/solvecaptchadialog.ui ) set(TRANSLATION_SOURCES @@ -50,7 +56,8 @@ set(TRANSLATION_SOURCES ocrscene.cpp ocrscene.h scenes/ocrscene.ui ofdscene.cpp ofdscene.h scenes/ofdscene.ui outputdialog.h outputdialog.cpp scenes/outputdialog.ui - # adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui + adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui + solvecaptchadialog.h solvecaptchadialog.cpp scenes/solvecaptchadialog.ui ) set(TS_FILES @@ -126,14 +133,23 @@ if(WIN32) set(OpenCV_DIR /usr/local/lib/cmake/opencv4) endif() +FetchContent_Declare(httplib SYSTEM + GIT_REPOSITORY https://github.com/yhirose/cpp-httplib + GIT_TAG 2eaa2ea64f9fb12773306534d461d9ed63cb76b6 # v0.14.1 + GIT_SHALLOW TRUE) +FetchContent_MakeAvailable(httplib) + find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs) include_directories( ${OpenCV_INCLUDE_DIRS} ) +target_include_directories(checks-parser PUBLIC ${OpenCV_INCLUDE_DIRS}) target_link_libraries(checks-parser PRIVATE -lzbar) target_link_libraries(checks-parser PRIVATE -ltesseract) target_link_libraries(checks-parser PRIVATE -lcurl) -target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS} ) +target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS}) +target_link_libraries(checks-parser PRIVATE httplib) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) target_link_libraries(checks-parser PRIVATE -lstdc++fs) endif() diff --git a/image/checkimage.cpp b/image/checkimage.cpp index caddf3d..4210ca6 100644 --- a/image/checkimage.cpp +++ b/image/checkimage.cpp @@ -1,7 +1,6 @@ +#include #include #include -#include -#include #include "checkimage.h" CheckImage::CheckImage(std::string path) { diff --git a/main.cpp b/main.cpp index fda2410..3549a9b 100644 --- a/main.cpp +++ b/main.cpp @@ -21,7 +21,6 @@ #include #include #include - #include static QWidget *loadUI(QWidget *parent, std::string filename) { @@ -61,25 +60,18 @@ int main(int argc, char *argv[]) { }); QObject::connect(ofd_button, &QPushButton::clicked, [&]() { - // OCR scene + // OFD scene sceneLayout->setCurrentIndex(3); sceneLayout->widget(3)->show(); }); - // // Text from email setup - // QWidget *emailtextscene = loadUI(window, ":/scenes/scenes/emailtextscene.ui"); - // emailtextscene->show(); - - //OCR scene - // QWidget *ocrscene = loadUI(window, ":/scenes/scenes/ocrscene.ui"); - - //OFD scene - // QWidget *ofdscene = loadUI(window, ":/scenes/scenes/ofdscene.ui"); - EmailTextScene *emailTextScene = new EmailTextScene(); OCRScene *ocrscene = new OCRScene(); OFDScene *ofdscene = new OFDScene(); + ofdscene->startHttpServer(); + // get_local_ip_address(); + sceneLayout->addWidget(mainwindowscene); sceneLayout->addWidget(emailTextScene); diff --git a/ofdscene.cpp b/ofdscene.cpp index 2e62180..fad6d35 100644 --- a/ofdscene.cpp +++ b/ofdscene.cpp @@ -1,5 +1,17 @@ #include "ofdscene.h" #include "ui_ofdscene.h" +#include "utils/utils.h" + +#include +#include +#include +#include +#include +#include + +#include + +#include OFDScene::OFDScene(QWidget *parent) : QWidget(parent) @@ -10,3 +22,129 @@ OFDScene::OFDScene(QWidget *parent) OFDScene::~OFDScene() { delete ui; } + +void OFDScene::startHttpServer() { + std::string localIp = ""; + try { + localIp = get_local_ip_address(); + } catch(std::exception e) { + std::cerr << e.what() << std::endl; + return; + } + + httplib::Server svr; + //TODO: generate random port from 1024 to 65535 and check if its used. + svr.Get("/", [&](const httplib::Request &, httplib::Response &res){ + res.set_redirect("http://"+ localIp +":8080/", 301); + }); + + svr.listen("0.0.0.0", 8080); +} + +void OFDScene::on_choose_image_button_clicked() { + QString filename = QFileDialog::getOpenFileName(); + + if (filename == "") { + QMessageBox infoDialog; + infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Picture was not selected")); + infoDialog.exec(); + return; + } + + + ui->info_label->setText(tr("Selected image: ") + filename); + + AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString()); + connect(&dialog, &AdjustPictureDialog::decodedData, this, &OFDScene::onDataDecode); + dialog.exec(); +} + +void OFDScene::onDataDecode(std::string data) { + std::vector dataSplit = split(data, "&"); + + ui->fn_line_edit->setText(QString::fromStdString(split(dataSplit[2], "=")[1])); + ui->fd_line_edit->setText(QString::fromStdString(split(dataSplit[3], "=")[1])); + ui->fi_line_edit->setText(QString::fromStdString(split(dataSplit[4], "=")[1])); + + QString extractedDateTime = QString::fromStdString(split(dataSplit[0], "=")[1]); + //TODO: some QRs contain datetime in format yyyyMMddThhmmss. Perhaps there is more different formats, should write function to detect them. + QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm"); + ui->purchase_datetime_edit->setDateTime(datetime); + + int type = std::stoi(split(dataSplit[5], "=")[1]); + ui->operation_type_combo_box->setCurrentIndex(type - 1); + + std::string total = split(dataSplit[1], "=")[1]; + + ui->total_spin_box->setValue(std::stod(total)); +} + + +void OFDScene::on_parse_button_clicked() { + Net net; + net.get_captcha_from_ofdru(); + + std::string solved_captcha = ""; + bool success = true; + bool is_captcha_solved = true; + Check check; + + do { + SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha); + dialog.exec(); + is_captcha_solved = true; + + try { + std::string check_content = net.fetch_check_data_from_ofdru( + ui->fn_line_edit->text().toStdString(), + ui->fd_line_edit->text().toStdString(), + ui->fi_line_edit->text().toStdString(), + ui->purchase_datetime_edit->dateTime().toString(Qt::ISODate).toStdString(), + ui->operation_type_combo_box->currentIndex() + 1, + // In the request to ofd.ru, total is in a format with 2 last digits represent decimal part of a number. + ui->total_spin_box->text().toDouble() * 100, + solved_captcha); + + check = parseOfdRuAnswer(check_content); + } catch(OfdRequestException e) { + success = false; + if (!strcmp(e.what(), "Incorrect captcha")) { + is_captcha_solved = false; + QMessageBox infoDialog; + infoDialog.setText(tr("Captcha was not solved correctly!")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Captcha is incorrect")); + infoDialog.exec(); + break; + } else if (!strcmp(e.what(), "Internal server error")) { + QMessageBox infoDialog; + infoDialog.setText(tr("Internal server error. Please, try again later.")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Internal server error")); + infoDialog.exec(); + return; + } else if (!strcmp(e.what(), "Does not exist")) { + QMessageBox infoDialog; + infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data.")); + infoDialog.setIcon(QMessageBox::Critical); + infoDialog.setWindowTitle(tr("Check was not found")); + infoDialog.exec(); + return; + } + } + } while (!is_captcha_solved); + + if (success) { + OutputDialog d = OutputDialog(this, check); + d.exec(); + } + +} + + +void OFDScene::on_binary_eye_button_clicked() { + +} + diff --git a/ofdscene.h b/ofdscene.h index 7de646d..83901a3 100644 --- a/ofdscene.h +++ b/ofdscene.h @@ -14,6 +14,14 @@ class OFDScene : public QWidget public: explicit OFDScene(QWidget *parent = nullptr); ~OFDScene(); + void startHttpServer(); +private slots: + void on_choose_image_button_clicked(); + void onDataDecode(std::string data); + + void on_parse_button_clicked(); + + void on_binary_eye_button_clicked(); private: Ui::OFDScene *ui; diff --git a/scenes.qrc b/scenes.qrc index 026d8a5..4704a99 100644 --- a/scenes.qrc +++ b/scenes.qrc @@ -5,5 +5,6 @@ scenes/ocrscene.ui scenes/mainwindow.ui scenes/ofdscene.ui + scenes/solvecaptchadialog.ui diff --git a/scenes/ofdscene.ui b/scenes/ofdscene.ui index a035c7c..4e44026 100644 --- a/scenes/ofdscene.ui +++ b/scenes/ofdscene.ui @@ -51,7 +51,11 @@ - + + + 4294967296.000000000000000 + + diff --git a/solvecaptchadialog.ui b/scenes/solvecaptchadialog.ui similarity index 100% rename from solvecaptchadialog.ui rename to scenes/solvecaptchadialog.ui diff --git a/translations/en_US.ts b/translations/en_US.ts index fce0d7f..bd82b03 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -4,20 +4,24 @@ AdjustPictureDialog + Dialog - Dialog + Dialog + Please, zoom to qr code and adjust contrast so that qr code looks sharp - Please, zoom to qr code and adjust contrast so that qr code looks sharp + Please, zoom to qr code and adjust contrast so that qr code looks sharp + QR code was not detected on that image. Please edit it again or enter data manually - QR code was not detected on that image. Please edit it again or enter data manually + QR code was not detected on that image. Please edit it again or enter data manually + No QR code - No QR code + No QR code @@ -303,65 +307,110 @@ - + FD (Fiscal Document) FD (Fiscal Document) - + Date and time of purchase - + Funds income Funds income - + Funds return Funds return - + Funds spend Funds spend - + Spends return Spends return - + Use your phone as a QR code scanner - + FN (Fiscal Number) FN (Fiscal Number) - + FI (Fiscal Identifier) FI (Fiscal Identifier) - + Choose image on your PC - + Operation type - + Parse Parse + + + Please, select a picture where QR code that contains info about check is present + Please, select a picture where QR code that contains info about check is present + + + + Picture was not selected + Picture was not selected + + + + Selected image: + + + + + Captcha was not solved correctly! + Captcha was not solved correctly! + + + + Captcha is incorrect + Captcha is incorrect + + + + Internal server error. Please, try again later. + Internal server error. Please, try again later. + + + + Internal server error + Internal server error + + + + Check not found. Please, ensure correctness of entered data. + Check not found. Please, ensure correctness of entered data. + + + + Check was not found + + OutputDialog @@ -490,16 +539,19 @@ SolveCaptchaDialog + Dialog - Dialog + Dialog + Please, enter a valid captcha - Please, enter a valid captcha + Please, enter a valid captcha + No captcha - No captcha + No captcha diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 4e7fe60..e12d8d7 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -4,20 +4,24 @@ AdjustPictureDialog + Dialog - Диалог + Диалог + Please, zoom to qr code and adjust contrast so that qr code looks sharp - Пожалуйста, приблизьте QR код и настройте контраст, чтобы он читался + Пожалуйста, приблизьте QR код и настройте контраст, чтобы он читался + QR code was not detected on that image. Please edit it again or enter data manually - QR код не найден на этом изображении. Пожалуйста, попытайтесь снова или введите данные вручную + QR код не найден на этом изображении. Пожалуйста, попытайтесь снова или введите данные вручную + No QR code - QR код не найден + QR код не найден @@ -303,65 +307,110 @@ - + FD (Fiscal Document) ФД - + Date and time of purchase - + Funds income Приход средств - + Funds return Возврат средств - + Funds spend Расход средств - + Spends return Возврат расхода - + Use your phone as a QR code scanner - + FN (Fiscal Number) ФН - + FI (Fiscal Identifier) ФП - + Choose image on your PC - + Operation type - + Parse Парсить + + + Please, select a picture where QR code that contains info about check is present + Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке + + + + Picture was not selected + Изображение не было выбрано + + + + Selected image: + + + + + Captcha was not solved correctly! + Капча была решена неверно! + + + + Captcha is incorrect + Капча введена неверно + + + + Internal server error. Please, try again later. + Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. + + + + Internal server error + Внутренняя ошибка сервера + + + + Check not found. Please, ensure correctness of entered data. + Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. + + + + Check was not found + Чек не найден + OutputDialog @@ -490,16 +539,19 @@ SolveCaptchaDialog + Dialog - Диалог + Диалог + Please, enter a valid captcha - Пожалуйста, введите верную капчу + Пожалуйста, введите верную капчу + No captcha - Нет капчи + Нет капчи diff --git a/utils/utils.cpp b/utils/utils.cpp index e220616..ec5ab3d 100644 --- a/utils/utils.cpp +++ b/utils/utils.cpp @@ -1,5 +1,6 @@ #include "utils.h" +#include #include #include #include @@ -7,6 +8,37 @@ #include #include #include "../exceptions/ofdrequestexception.h" +#include "settings/settings.h" +#include +#include +#include +#include + +std::string get_local_ip_address() { + struct ifaddrs * ifAddrStruct=NULL; + struct ifaddrs * ifa=NULL; + void * tmpAddrPtr=NULL; + + getifaddrs(&ifAddrStruct); + + for (ifa = ifAddrStruct; ifa != NULL; ifa = ifa->ifa_next) { + if (ifa->ifa_addr == nullptr) continue; + if (ifa->ifa_addr->sa_family==AF_INET) { + tmpAddrPtr=&((struct sockaddr_in *)ifa->ifa_addr)->sin_addr; + char addressBuffer[128]; + inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN); + + std::string value(addressBuffer); + if (!strncmp(value.c_str(), "192.168", 7)) { + return value; + } + } + } + if (ifAddrStruct!=NULL) + freeifaddrs(ifAddrStruct); + + throw std::runtime_error(QWidget::tr("Could not find any usable local IP address. If you beleive that this is problem with the program, please, contact the developer.").toStdString()); +} std::string to_utf8(std::wstring wide_string) { static std::wstring_convert> utf8_conv; @@ -94,8 +126,9 @@ std::vector find_in_html(std::string& html, std::string regex, std it != end; it++) { std::wstring found_entry = from_utf8(it->str()); + std::wcout << "Found: " << found_entry << std::endl; std::wstring extracted = substring_from_to(found_entry, from_utf8(html_start), from_utf8(html_end)); - + std::wcout << "Extracted: " << extracted << std::endl; parsed.push_back(extracted); } return parsed; @@ -106,11 +139,42 @@ std::vector find_products_in_html(std::string html) { } std::vector find_amounts_in_html(std::string html) { - return find_in_html(html, "\\d+<\\/span>", "", "<\\/span>"); + std::vector founds = find_in_html(html, "
\\d+(\\.|\\,)?\\d{0,3}<\\/span>", "", "<\\/span>"); + for (auto &found : founds) { + std::replace(found.begin(), found.end(), ',', '.'); + } + + return founds; } std::vector find_prices_in_html(std::string html) { - return find_in_html(html, "X <\\/span>\\d+\\.\\d{2}<\\/span>", "X <\\/span>", "<\\/span>"); + std::vector founds = find_in_html(html, "X <\\/span>\\d+(\\.|,)\\d{2}<\\/span>", "X <\\/span>", "<\\/span>"); + for (auto &found : founds) { + std::replace(found.begin(), found.end(), ',', '.'); + } + + return founds; +} + +void dumpVectorsToStderr(std::vector &products, std::vector &amounts, std::vector &prices) { + std::cerr << "Products: "; + for (auto &product : products) { + std::cerr << to_utf8(product) << "|[]|"; + } + std::cerr << std::endl; + + std::cerr << "Amounts: "; + for (auto &amount : amounts) { + std::wcerr << amount << " "; + } + std::cerr << std::endl; + + std::cerr << "Prices: "; + for (auto &price : prices) { + std::wcerr << price << " "; + } + + std::cerr << std::endl; } Check parseOfdRuAnswer(std::string html) { @@ -133,6 +197,10 @@ Check parseOfdRuAnswer(std::string html) { } if ((products.size() + amounts.size() + prices.size())/products.size() != 3) { + dumpVectorsToStderr(products, amounts, prices); + //TOOD: make new setting "app_home" and get all path using it. + std::ofstream error_log(get_path_relative_to_home(".local/share/checks_parser/error_log.txt"), std::ios_base::app); + error_log << trimmed << std::endl; std::cerr << "An error has occured during the parsing of html. Please, contact the developer." << std::endl; std::exit(-1); } diff --git a/utils/utils.h b/utils/utils.h index a235f28..7bb7402 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -5,6 +5,7 @@ #include #include "../check/check.h" +std::string get_local_ip_address(); std::string to_utf8(std::wstring wide_string); std::wstring from_utf8(std::string string); From 39c4bfb2fdacc9ceb1813bfc516950fbcaeebe8e Mon Sep 17 00:00:00 2001 From: leca Date: Fri, 14 Mar 2025 01:12:55 +0300 Subject: [PATCH 8/8] fixed translations --- main.cpp | 59 +++++++++++++++------- translations/en_US.ts | 112 +++++++++++++++++++++--------------------- translations/ru_RU.ts | 112 +++++++++++++++++++++--------------------- 3 files changed, 154 insertions(+), 129 deletions(-) diff --git a/main.cpp b/main.cpp index 3549a9b..69ab8b6 100644 --- a/main.cpp +++ b/main.cpp @@ -33,9 +33,32 @@ static QWidget *loadUI(QWidget *parent, std::string filename) { } int main(int argc, char *argv[]) { - QUiLoader loader; + QApplication app(argc, argv); + std::string settings_file_path = + get_path_relative_to_home(".local/share/checks_parser/settings.json"); + + Settings s(settings_file_path); + + QTranslator translator; + QString lang = "en_US"; + + if (s.get_all_settings().contains("language")) { + lang = QString::fromStdString(s.get_all_settings()["language"]); + } else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) { + lang = QLocale::system().name(); + } else { + lang = QString::fromStdString("en_US"); + } + + std::cout << "Using locale: " << lang.toStdString() << std::endl; + + translator.load(":/translation/" + lang + ".qm"); + app.installTranslator(&translator); + + QUiLoader loader; + QWidget *window = new QWidget(); QStackedLayout *sceneLayout = new QStackedLayout; @@ -69,7 +92,7 @@ int main(int argc, char *argv[]) { OCRScene *ocrscene = new OCRScene(); OFDScene *ofdscene = new OFDScene(); - ofdscene->startHttpServer(); + // ofdscene->startHttpServer(); // get_local_ip_address(); @@ -90,6 +113,8 @@ int main(int argc, char *argv[]) { }); } + + window->setLayout(sceneLayout); window->show(); @@ -139,10 +164,10 @@ int main(int argc, char *argv[]) { std::string program_data_path = get_path_relative_to_home(".local/share/checks_parser"); create_directories(program_data_path); - std::string settings_file_path = - get_path_relative_to_home(".local/share/checks_parser/settings.json"); + // std::string settings_file_path = + // get_path_relative_to_home(".local/share/checks_parser/settings.json"); - Settings s(settings_file_path); + // Settings s(settings_file_path); Net n; Parser p; @@ -161,22 +186,22 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - QTranslator translator; - QString lang = "en_US"; + // QTranslator translator; + // QString lang = "en_US"; - if (s.get_all_settings().contains("language")) { - lang = QString::fromStdString(s.get_all_settings()["language"]); - } else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) { - lang = QLocale::system().name(); - } else { - lang = QString::fromStdString("en_US"); - } + // if (s.get_all_settings().contains("language")) { + // lang = QString::fromStdString(s.get_all_settings()["language"]); + // } else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) { + // lang = QLocale::system().name(); + // } else { + // lang = QString::fromStdString("en_US"); + // } - std::cout << "Using locale: " << lang.toStdString() << std::endl; + // std::cout << "Using locale: " << lang.toStdString() << std::endl; - translator.load(":/translation/" + lang + ".qm"); + // translator.load(":/translation/" + lang + ".qm"); - a.installTranslator(&translator); + // a.installTranslator(&translator); MainWindow w; w.update(); w.show(); diff --git a/translations/en_US.ts b/translations/en_US.ts index bd82b03..49b8dfd 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -29,7 +29,7 @@ Form - + Form Store type @@ -38,32 +38,32 @@ Check content - Check content + Check content Parse - Parse + Parse Store: - + Store: Back - + Back An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. Error in parsing - Error in parsing + Error in parsing @@ -208,17 +208,17 @@ Form - + Form Optical Character Recognition - + Optical Character Recognition Text from E-Mail - + Text from E-Mail @@ -226,62 +226,62 @@ Form - + Form Choose - Choose + Choose Path to image: - + Path to image: Store: - + Store: Recognized text will be shown below as soon as image will be processed. Please, edit it - + Recognized text will be shown below as soon as image will be processed. Please, edit it Back - + Back Parse - Parse + Parse An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. + An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. Error in parsing - Error in parsing + Error in parsing Please, select a picture to scan - Please, select a picture to scan + Please, select a picture to scan Picture was not selected - Picture was not selected + Picture was not selected Path to image: - Path to image: + Path to image: @@ -289,127 +289,127 @@ Form - + Form Total - Total + Total Back - + Back or - + or FD (Fiscal Document) - FD (Fiscal Document) + FD (Fiscal Document) Date and time of purchase - + Date and time of purchase Funds income - Funds income + Funds income Funds return - Funds return + Funds return Funds spend - Funds spend + Funds spend Spends return - Spends return + Spends return Use your phone as a QR code scanner - + Use your phone as a QR code scanner FN (Fiscal Number) - FN (Fiscal Number) + FN (Fiscal Number) FI (Fiscal Identifier) - FI (Fiscal Identifier) + FI (Fiscal Identifier) Choose image on your PC - + Choose image on your PC Operation type - + Operation type Parse - Parse + Parse - + Please, select a picture where QR code that contains info about check is present - Please, select a picture where QR code that contains info about check is present + Please, select a picture where QR code that contains info about check is present - + Picture was not selected - Picture was not selected + Picture was not selected - + Selected image: - + Selected image: - + Captcha was not solved correctly! - Captcha was not solved correctly! + Captcha was not solved correctly! - + Captcha is incorrect - Captcha is incorrect + Captcha is incorrect - + Internal server error. Please, try again later. - Internal server error. Please, try again later. + Internal server error. Please, try again later. - + Internal server error - Internal server error + Internal server error - + Check not found. Please, ensure correctness of entered data. - Check not found. Please, ensure correctness of entered data. + Check not found. Please, ensure correctness of entered data. - + Check was not found - + Check was not found diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index e12d8d7..de475ae 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -29,7 +29,7 @@ Form - + Форма Store type @@ -38,32 +38,32 @@ Check content - Контент чека + Контент чека Parse - Парсить + Парсить Store: - + Магазин: Back - + Назад An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. Error in parsing - Ошибка в парсинге + Ошибка в парсинге @@ -208,17 +208,17 @@ Form - + Форма Optical Character Recognition - + Оптическое распознавание символов Text from E-Mail - + Текст из электронного письма @@ -226,62 +226,62 @@ Form - + Форма Choose - Выбрать + Выбрать Path to image: - + Путь к изображению: Store: - + Магазин: Recognized text will be shown below as soon as image will be processed. Please, edit it - + Распознанный текст будет показан ниже как только изображение обработается. Пожалуйста, отредактируйте Back - + Назад Parse - Парсить + Парсить An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer. - Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. + Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику. Error in parsing - Ошибка в парсинге + Ошибка в парсинге Please, select a picture to scan - Пожалуйста, выберете изображение для сканирования + Пожалуйста, выберете изображение для сканирования Picture was not selected - Изображение не было выбрано + Изображение не было выбрано Path to image: - Путь к изображению: + Путь к изображению: @@ -289,127 +289,127 @@ Form - + Форма Total - Итого + Итого Back - + Назад or - + или FD (Fiscal Document) - ФД + ФД Date and time of purchase - + Дата и время покупки Funds income - Приход средств + Приход средств Funds return - Возврат средств + Возврат средств Funds spend - Расход средств + Расход средств Spends return - Возврат расхода + Возврат расхода Use your phone as a QR code scanner - + Использовать телефон как сканнер QR FN (Fiscal Number) - ФН + ФН FI (Fiscal Identifier) - ФП + ФП Choose image on your PC - + Выбрать изображение на компьютере Operation type - + Тип операции Parse - Парсить + Парсить - + Please, select a picture where QR code that contains info about check is present - Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке + Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке - + Picture was not selected - Изображение не было выбрано + Изображение не было выбрано - + Selected image: - + Выбранное изображение: - + Captcha was not solved correctly! - Капча была решена неверно! + Капча была решена неверно! - + Captcha is incorrect - Капча введена неверно + Капча введена неверно - + Internal server error. Please, try again later. - Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. + Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. - + Internal server error - Внутренняя ошибка сервера + Внутренняя ошибка сервера - + Check not found. Please, ensure correctness of entered data. - Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. + Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. - + Check was not found - Чек не найден + Чек не найден