From 892b40da0181cb01823c1592137839e41e82ca6f Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Thu, 30 Mar 2023 16:09:55 +0800 Subject: [PATCH] Remove g_strdup() at mainwindow.cpp --- DSView/pv/mainwindow.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp index 0d1d39fa..18cad26c 100644 --- a/DSView/pv/mainwindow.cpp +++ b/DSView/pv/mainwindow.cpp @@ -880,8 +880,8 @@ namespace pv for (const QJsonValue &value : sessionObj["channel"].toArray()) { QJsonObject obj = value.toObject(); - if ((strcmp(probe->name, g_strdup(obj["name"].toString().toStdString().c_str())) == 0) && - (probe->type == obj["type"].toDouble())) + if (QString(probe->name) == obj["name"].toString() && + probe->type == obj["type"].toDouble()) { probe->vdiv = obj["vdiv"].toDouble(); probe->coupling = obj["coupling"].toDouble(); @@ -949,8 +949,9 @@ namespace pv for (const QJsonValue &value : sessionObj["channel"].toArray()) { QJsonObject obj = value.toObject(); - if ((strcmp(s->get_name().toStdString().c_str(), g_strdup(obj["name"].toString().toStdString().c_str())) == 0) && - (s->get_type() == obj["type"].toDouble())) + + if (s->get_name() == obj["name"].toString() && + s->get_type() == obj["type"].toDouble()) { s->set_colour(QColor(obj["colour"].toString())); @@ -961,6 +962,7 @@ namespace pv dsoSig->set_zero_ratio(obj["zeroPos"].toDouble()); dsoSig->set_trig_ratio(obj["trigValue"].toDouble()); dsoSig->commit_settings(); + //dsoSig->set_enable() } break; } @@ -983,7 +985,7 @@ namespace pv } s->set_colour(QColor(obj["colour"].toString())); - s->set_name(g_strdup(chan_name.toUtf8().data())); + s->set_name(chan_name); view::LogicSignal *logicSig = NULL; if ((logicSig = dynamic_cast(s)))