From 33f819a09d1ae92ce2fbddc24d7df3a1d6b5613e Mon Sep 17 00:00:00 2001 From: leca Date: Tue, 18 Mar 2025 00:02:10 +0300 Subject: [PATCH] cleanup --- icon.png => assets/icons/icon.png | Bin icon.svg => assets/icons/icon.svg | 0 deploy/appimage/Dockerfile | 2 +- mainwindow.cpp.old | 219 ---------------- mainwindow.h.old | 44 ---- media.qrc | 2 + old_mainwindow.ui | 401 ------------------------------ 7 files changed, 3 insertions(+), 665 deletions(-) rename icon.png => assets/icons/icon.png (100%) rename icon.svg => assets/icons/icon.svg (100%) delete mode 100644 mainwindow.cpp.old delete mode 100644 mainwindow.h.old delete mode 100644 old_mainwindow.ui diff --git a/icon.png b/assets/icons/icon.png similarity index 100% rename from icon.png rename to assets/icons/icon.png diff --git a/icon.svg b/assets/icons/icon.svg similarity index 100% rename from icon.svg rename to assets/icons/icon.svg diff --git a/deploy/appimage/Dockerfile b/deploy/appimage/Dockerfile index 6a5b2f3..2888a98 100644 --- a/deploy/appimage/Dockerfile +++ b/deploy/appimage/Dockerfile @@ -36,7 +36,7 @@ WORKDIR /appimage RUN mkdir -p AppDir COPY deploy/appimage/checks-parser.desktop AppDir -COPY icon.png AppDir/checks-parser.png +COPY assets/icons/icon.png AppDir/checks-parser.png COPY deploy/appimage/AppRun AppDir RUN chmod +x AppDir/AppRun diff --git a/mainwindow.cpp.old b/mainwindow.cpp.old deleted file mode 100644 index 62e5fd9..0000000 --- a/mainwindow.cpp.old +++ /dev/null @@ -1,219 +0,0 @@ -#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.old b/mainwindow.h.old deleted file mode 100644 index ed77ada..0000000 --- a/mainwindow.h.old +++ /dev/null @@ -1,44 +0,0 @@ -#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 index 99e4a07..66caa1c 100644 --- a/media.qrc +++ b/media.qrc @@ -3,5 +3,7 @@ assets/icons/email-text.svg assets/icons/OCR.svg assets/icons/OFD.svg + assets/icons/icon.png + assets/icons/icon.svg diff --git a/old_mainwindow.ui b/old_mainwindow.ui deleted file mode 100644 index db5c247..0000000 --- a/old_mainwindow.ui +++ /dev/null @@ -1,401 +0,0 @@ - - - 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 - - - - 1 - - - - 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 - 33 - - - - - checks parser - - - - - - - - -