diff --git a/ofdscene.cpp b/ofdscene.cpp index e630132..c9f23f4 100644 --- a/ofdscene.cpp +++ b/ofdscene.cpp @@ -31,8 +31,6 @@ OFDScene::OFDScene(QWidget *parent) , ui(new Ui::OFDScene) { ui->setupUi(this); ui->stop_server_button->hide(); - // std::string message = "GET /?result=t=20171112T153500&s=834.25&fn=8712000101054551&i=32332&fp=2169935838&n=1 HTTP/1.1\nHost: localhost:8080\nUser-Agent: curl/8.12.1\nAccept: */*"; - // emit this->httpNewMessage(message); #ifdef BUILD_OFD_BINARYEYE_SCAN QObject::connect(this, &OFDScene::httpErrorOccured, this, &OFDScene::notifyHttpServerFailure); diff --git a/translations/en_US.ts b/translations/en_US.ts index 0b13763..6eeca82 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -377,67 +377,67 @@ <translation>Parse</translation> </message> <message> - <location filename="../ofdscene.cpp" line="89"/> + <location filename="../ofdscene.cpp" line="87"/> <source>Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ofdscene.cpp" line="91"/> + <location filename="../ofdscene.cpp" line="89"/> <source>Could not start http server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ofdscene.cpp" line="128"/> + <location filename="../ofdscene.cpp" line="126"/> <source>Please, select a picture where QR code that contains info about check is present</source> <translation>Please, select a picture where QR code that contains info about check is present</translation> </message> <message> - <location filename="../ofdscene.cpp" line="130"/> + <location filename="../ofdscene.cpp" line="128"/> <source>Picture was not selected</source> <translation>Picture was not selected</translation> </message> <message> - <location filename="../ofdscene.cpp" line="135"/> + <location filename="../ofdscene.cpp" line="133"/> <source>Selected image: </source> <translation>Selected image: </translation> </message> <message> - <location filename="../ofdscene.cpp" line="195"/> + <location filename="../ofdscene.cpp" line="193"/> <source>Captcha was not solved correctly!</source> <translation>Captcha was not solved correctly!</translation> </message> <message> - <location filename="../ofdscene.cpp" line="197"/> + <location filename="../ofdscene.cpp" line="195"/> <source>Captcha is incorrect</source> <translation>Captcha is incorrect</translation> </message> <message> - <location filename="../ofdscene.cpp" line="202"/> + <location filename="../ofdscene.cpp" line="200"/> <source>Internal server error. Please, try again later.</source> <translation>Internal server error. Please, try again later.</translation> </message> <message> - <location filename="../ofdscene.cpp" line="204"/> + <location filename="../ofdscene.cpp" line="202"/> <source>Internal server error</source> <translation>Internal server error</translation> </message> <message> - <location filename="../ofdscene.cpp" line="209"/> + <location filename="../ofdscene.cpp" line="207"/> <source>Check not found. Please, ensure correctness of entered data.</source> <translation>Check not found. Please, ensure correctness of entered data.</translation> </message> <message> - <location filename="../ofdscene.cpp" line="211"/> + <location filename="../ofdscene.cpp" line="209"/> <source>Check was not found</source> <translation>Check was not found</translation> </message> <message> - <location filename="../ofdscene.cpp" line="82"/> + <location filename="../ofdscene.cpp" line="80"/> <source>QR code for binaryeye to connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ofdscene.cpp" line="83"/> + <location filename="../ofdscene.cpp" line="81"/> <source>I've scanned</source> <translation type="unfinished"></translation> </message> diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 41f1122..b246546 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -377,67 +377,67 @@ <translation>Парсить</translation> </message> <message> - <location filename="../ofdscene.cpp" line="89"/> + <location filename="../ofdscene.cpp" line="87"/> <source>Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ofdscene.cpp" line="91"/> + <location filename="../ofdscene.cpp" line="89"/> <source>Could not start http server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ofdscene.cpp" line="128"/> + <location filename="../ofdscene.cpp" line="126"/> <source>Please, select a picture where QR code that contains info about check is present</source> <translation>Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке</translation> </message> <message> - <location filename="../ofdscene.cpp" line="130"/> + <location filename="../ofdscene.cpp" line="128"/> <source>Picture was not selected</source> <translation>Изображение не было выбрано</translation> </message> <message> - <location filename="../ofdscene.cpp" line="135"/> + <location filename="../ofdscene.cpp" line="133"/> <source>Selected image: </source> <translation>Выбранное изображение: </translation> </message> <message> - <location filename="../ofdscene.cpp" line="195"/> + <location filename="../ofdscene.cpp" line="193"/> <source>Captcha was not solved correctly!</source> <translation>Капча была решена неверно!</translation> </message> <message> - <location filename="../ofdscene.cpp" line="197"/> + <location filename="../ofdscene.cpp" line="195"/> <source>Captcha is incorrect</source> <translation>Капча введена неверно</translation> </message> <message> - <location filename="../ofdscene.cpp" line="202"/> + <location filename="../ofdscene.cpp" line="200"/> <source>Internal server error. Please, try again later.</source> <translation>Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже.</translation> </message> <message> - <location filename="../ofdscene.cpp" line="204"/> + <location filename="../ofdscene.cpp" line="202"/> <source>Internal server error</source> <translation>Внутренняя ошибка сервера</translation> </message> <message> - <location filename="../ofdscene.cpp" line="209"/> + <location filename="../ofdscene.cpp" line="207"/> <source>Check not found. Please, ensure correctness of entered data.</source> <translation>Чек не найден. Пожалуйста, убедитесь в правильности введённых данных.</translation> </message> <message> - <location filename="../ofdscene.cpp" line="211"/> + <location filename="../ofdscene.cpp" line="209"/> <source>Check was not found</source> <translation>Чек не найден</translation> </message> <message> - <location filename="../ofdscene.cpp" line="82"/> + <location filename="../ofdscene.cpp" line="80"/> <source>QR code for binaryeye to connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ofdscene.cpp" line="83"/> + <location filename="../ofdscene.cpp" line="81"/> <source>I've scanned</source> <translation type="unfinished"></translation> </message> diff --git a/utils/utils.cpp b/utils/utils.cpp index c03f20a..ab01d21 100644 --- a/utils/utils.cpp +++ b/utils/utils.cpp @@ -17,7 +17,6 @@ # include <opencv2/imgcodecs.hpp> # include <opencv2/imgproc.hpp> #endif -#include <regex> #include <string> #include <QWidget> #include <fstream> @@ -196,6 +195,10 @@ std::vector<std::wstring> find_net_weights_in_names(std::vector<std::wstring> &n result.push_back(from_utf8("?")); } } + + for (auto &entry : result) { + std::replace(entry.begin(), entry.end(), ',', '.'); + } return result; }