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