diff --git a/CMakeLists.txt b/CMakeLists.txt
index be87240..58362ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,15 @@ 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)
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 +21,43 @@ 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
+ ofdscene.h ofdscene.cpp scenes/ofdscene.ui
+ outputdialog.h outputdialog.cpp scenes/outputdialog.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
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
+ ofdscene.cpp ofdscene.h scenes/ofdscene.ui
+ outputdialog.h outputdialog.cpp scenes/outputdialog.ui
+ adjustpicturedialog.h adjustpicturedialog.cpp scenes/adjustpicturedialog.ui
+ solvecaptchadialog.h solvecaptchadialog.cpp scenes/solvecaptchadialog.ui
)
set(TS_FILES
@@ -66,7 +74,23 @@ 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})
+
+#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})
endif()
@@ -83,7 +107,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)
@@ -104,20 +128,28 @@ install(TARGETS checks-parser
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
-
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/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
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 @@
+
+
+
+
diff --git a/assets/icons/OFD.svg b/assets/icons/OFD.svg
new file mode 100644
index 0000000..1d3f058
--- /dev/null
+++ b/assets/icons/OFD.svg
@@ -0,0 +1,181 @@
+
+
+
+
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 @@
+
+
+
+
diff --git a/assets/icons/using_binary_eye.svg b/assets/icons/using_binary_eye.svg
new file mode 100644
index 0000000..cb932be
--- /dev/null
+++ b/assets/icons/using_binary_eye.svg
@@ -0,0 +1,219 @@
+
+
+
+
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
new file mode 100644
index 0000000..5c70c11
--- /dev/null
+++ b/emailtextscene.cpp
@@ -0,0 +1,45 @@
+#include "emailtextscene.h"
+#include "ui_emailtextscene.h"
+#include
+#include
+#include
+#include
+
+EmailTextScene::EmailTextScene(QWidget *parent)
+ : QWidget(parent)
+ , 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() {
+ 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
new file mode 100644
index 0000000..4a8739a
--- /dev/null
+++ b/emailtextscene.h
@@ -0,0 +1,27 @@
+#ifndef EMAILTEXTSCENE_H
+#define EMAILTEXTSCENE_H
+
+#include "parser/parser.h"
+#include
+
+namespace Ui {
+class EmailTextScene;
+}
+
+class EmailTextScene : public QWidget
+{
+ Q_OBJECT
+
+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/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 de82bd9..69ab8b6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,20 +12,162 @@
# include
using namespace std::filesystem;
#endif
+#include
#include
+#include
#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[]) {
- curl_global_init(CURL_GLOBAL_ALL);
- std::string program_data_path = get_path_relative_to_home(".local/share/checks_parser");
- create_directories(program_data_path);
+ 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;
+
+ // 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);
+ 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, [&]() {
+ // OFD scene
+ sceneLayout->setCurrentIndex(3);
+ sceneLayout->widget(3)->show();
+ });
+
+ EmailTextScene *emailTextScene = new EmailTextScene();
+ OCRScene *ocrscene = new OCRScene();
+ OFDScene *ofdscene = new OFDScene();
+
+ // ofdscene->startHttpServer();
+ // get_local_ip_address();
+
+
+ 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 ++) {
+ 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");
+ create_directories(program_data_path);
+
+ // std::string settings_file_path =
+ // get_path_relative_to_home(".local/share/checks_parser/settings.json");
+
+ // Settings s(settings_file_path);
Net n;
Parser p;
@@ -44,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/mainwindow.cpp b/mainwindow.cpp
index 59474c7..177df99 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,219 +1,15 @@
#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"
+#include
MainWindow::MainWindow(QWidget *parent)
- : QMainWindow(parent), ui(new Ui::MainWindow) {
+ : QWidget(parent)
+ , ui(new Ui::MainWindow) {
ui->setupUi(this);
- this->setupStoresList();
+
+ std::cout << "test" << std::endl;
}
-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);
- }
+MainWindow::~MainWindow() {
+ delete ui;
}
-
-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.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..84bf578 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,44 +1,25 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
-#include
+#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;
+private slots:
+private:
+
};
+
#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/media.qrc b/media.qrc
new file mode 100644
index 0000000..99e4a07
--- /dev/null
+++ b/media.qrc
@@ -0,0 +1,7 @@
+
+
+ assets/icons/email-text.svg
+ assets/icons/OCR.svg
+ assets/icons/OFD.svg
+
+
diff --git a/ocrscene.cpp b/ocrscene.cpp
new file mode 100644
index 0000000..dc1e782
--- /dev/null
+++ b/ocrscene.cpp
@@ -0,0 +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
new file mode 100644
index 0000000..2909825
--- /dev/null
+++ b/ocrscene.h
@@ -0,0 +1,29 @@
+#ifndef OCRSCENE_H
+#define OCRSCENE_H
+
+#include "parser/parser.h"
+#include
+
+namespace Ui {
+class OCRScene;
+}
+
+class OCRScene : public QWidget
+{
+ Q_OBJECT
+
+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/ofdscene.cpp b/ofdscene.cpp
new file mode 100644
index 0000000..fad6d35
--- /dev/null
+++ b/ofdscene.cpp
@@ -0,0 +1,150 @@
+#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)
+ , ui(new Ui::OFDScene) {
+ ui->setupUi(this);
+}
+
+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
new file mode 100644
index 0000000..83901a3
--- /dev/null
+++ b/ofdscene.h
@@ -0,0 +1,30 @@
+#ifndef OFDSCENE_H
+#define OFDSCENE_H
+
+#include
+
+namespace Ui {
+class OFDScene;
+}
+
+class OFDScene : public QWidget
+{
+ Q_OBJECT
+
+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;
+};
+
+#endif // OFDSCENE_H
diff --git a/mainwindow.ui b/old_mainwindow.ui
similarity index 99%
rename from mainwindow.ui
rename to old_mainwindow.ui
index f4ebd1e..db5c247 100644
--- a/mainwindow.ui
+++ b/old_mainwindow.ui
@@ -73,7 +73,7 @@
- 2
+ 1
@@ -384,7 +384,7 @@
0
0
817
- 23
+ 33