From d16fa16309dc3b18446fce317d619a8fd4cef031 Mon Sep 17 00:00:00 2001 From: ValeryStk Date: Wed, 29 Jul 2026 12:02:53 +0300 Subject: [PATCH] fix simple json --- gui/davis_gui.cpp | 10 ++++++---- gui/json_utils.cpp | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gui/davis_gui.cpp b/gui/davis_gui.cpp index c5fded6..9344926 100644 --- a/gui/davis_gui.cpp +++ b/gui/davis_gui.cpp @@ -37,7 +37,7 @@ const double OPACITY_IF_NOT_ACTIVE = 0.94; DavisGUI::DavisGUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::DavisGUI) { - jsn::getJsonArrayFromFile(":/keys.json", service_json_keys); + jsn::getJsonArrayFromFile("keys.json", service_json_keys); ui->setupUi(this); isAboutWindowShowed = false; m_isMinStyleWindow = false; @@ -289,7 +289,7 @@ void DavisGUI::readJsonToPlot(const QString &pathToFile) { if (jsn::getJsonObjectFromFile("user_keys_list.json", user_stamp_keys) == false) { - jsn::getJsonObjectFromFile(":/user_keys_list.json", user_stamp_keys); + jsn::getJsonObjectFromFile(":/res/4restore/user_keys_list.json", user_stamp_keys); } if (user_stamp_keys.keys().contains("matrix_to_matrix")) { @@ -297,7 +297,7 @@ void DavisGUI::readJsonToPlot(const QString &pathToFile) { user_stamp_keys.value("matrix_to_matrix").toArray(); } else { QJsonObject user_stamp_keys; - jsn::getJsonObjectFromFile(":/user_keys_list.json", user_stamp_keys); + jsn::getJsonObjectFromFile(":/res/4restore/user_keys_list.json", user_stamp_keys); matrix_to_matrix_stamps = user_stamp_keys.value("matrix_to_matrix").toArray(); } @@ -309,7 +309,9 @@ void DavisGUI::readJsonToPlot(const QString &pathToFile) { return; }; jsn::extractAllObjects(jv, result); - // qDebug()<<"result all objects size:"<