SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Builds with Qt6.4

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-03-20 09:34:44 +08:00
parent 516f17e62b
commit dcb73f9ed2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DSView/pv/mainwindow.cpp
View File

@@ -689,6 +689,7 @@ namespace pv
s_obj["type"] = s->get_type();
s_obj["enabled"] = s->enabled();
s_obj["name"] = s->get_name();
if (s->get_colour().isValid())
s_obj["colour"] = QJsonValue::fromVariant(s->get_colour());
else

7
DSView/pv/storesession.cpp
View File

@@ -1070,7 +1070,8 @@ bool StoreSession::json_decoders(QJsonArray &array)
} else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s"))) {
GVariant *const var = dec_binding->getter(opt->id);
if (var != NULL) {
options_obj[opt->id] = QJsonValue::fromVariant(g_variant_get_string(var, NULL));
const char *sz = g_variant_get_string(var, NULL);
options_obj[opt->id] = QJsonValue::fromVariant(QString(sz));
g_variant_unref(var);
}
}else {
@@ -1079,12 +1080,12 @@ bool StoreSession::json_decoders(QJsonArray &array)
}
if (have_probes) {
dec_obj["id"] = QJsonValue::fromVariant(d->id);
dec_obj["id"] = QJsonValue::fromVariant(QString(d->id));
dec_obj["channel"] = ch_array;
dec_obj["options"] = options_obj;
} else {
QJsonObject stack_obj;
stack_obj["id"] = QJsonValue::fromVariant(d->id);
stack_obj["id"] = QJsonValue::fromVariant(QString(d->id));
stack_obj["options"] = options_obj;
stack_array.push_back(stack_obj);
}