Skip to content

fix simple json #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AntonMrt merged 1 commit into from
Jul 29, 2026
Merged

fix simple json #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions gui/davis_gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -289,15 +289,15 @@ 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")) {
matrix_to_matrix_stamps =
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();
}
Expand All @@ -309,7 +309,9 @@ void DavisGUI::readJsonToPlot(const QString &pathToFile) {
return;
};
jsn::extractAllObjects(jv, result);
// qDebug()<<"result all objects size:"<<result.size();
//qDebug()<<"result all objects size:"<<result.size()<<jv;
//qDebug()<<"service_json_keys: "<<service_json_keys;
//qDebug()<<"user_stamp_keys: "<<user_stamp_keys;

for (int i = 0; i < result.size(); ++i) {

Expand Down
4 changes: 2 additions & 2 deletions gui/json_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ isJsonObjectContainsUserKeys(const QJsonObject &user_json_from_file,
QStringList user_stamp_keys_list = user_stamp_keys.keys();

// Check that all user stamp keys are valid
for (int i = 0; i < user_stamp_keys_list.size(); ++i) {
/*for (int i = 0; i < user_stamp_keys_list.size(); ++i) {
QString check_key = user_stamp_keys_list[i];
if (service_keys.contains(QJsonValue(check_key)) == false) {
qDebug() << "invalid key in the user stamps json" << check_key;
return {false, QJsonObject()};
}
}
}*/

// Check that we have keys for user json
for (int i = 0; i < service_keys.size(); ++i) {
Expand Down
Loading