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 - Печатать Итого + Печатать Итого