QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

Work on issue #90

Browse Source
This commit is contained in:
Alex Spataru 2022-02-10 18:58:28 -06:00
parent d00203b03d
commit ec2db92c1a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/JSON/Generator.cpp
View File

@ -255,11 +255,16 @@ void JSON::Generator::readData(const QByteArray &data)
return; return;
// Separate incoming data & add it to the JSON map // Separate incoming data & add it to the JSON map
auto json = jsonMapData(); auto json = jsonMapData().toStdString();
auto sepr = IO::Manager::instance().separatorSequence(); auto sepr = IO::Manager::instance().separatorSequence();
auto list = QString::fromUtf8(data).split(sepr); auto list = QString::fromUtf8(data).split(sepr);
for (int i = 0; i < list.count(); ++i) for (int i = 0; i < list.count(); ++i)
json.replace(QString("%%1").arg(i + 1), list.at(i)); {
std::string id = "%" + std::to_string(i + 1);
size_t pos = json.find(id);
if (pos != std::string::npos && pos < json.length())
json.replace(pos, id.length(), list.at(i).toStdString());
}
// Update latest JSON values list // Update latest JSON values list
if (list.count() > m_latestValidValues.count()) if (list.count() > m_latestValidValues.count())
@ -270,7 +275,8 @@ void JSON::Generator::readData(const QByteArray &data)
} }
// Create JSON document // Create JSON document
m_json = QJsonDocument::fromJson(json.toUtf8(), &m_error).object(); auto jsonData = QString::fromStdString(json).toUtf8();
m_json = QJsonDocument::fromJson(jsonData, &m_error).object();
} }
// No parse error, evaluate any JS code // No parse error, evaluate any JS code