From 93b406d1914a5512aec6ca737ba8326a21191227 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 1 Dec 2015 21:29:42 +0100 Subject: HAWD: Ensure the column order is maintained By turning the columns into an array instead of an object, we can print the values in the same order as in the definition file. Previosly the order was random, and even headers and values were somtimes mixed up. --- tests/hawd/datasetdefinition.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/hawd/datasetdefinition.cpp') diff --git a/tests/hawd/datasetdefinition.cpp b/tests/hawd/datasetdefinition.cpp index a4a95dd..e2af2b9 100644 --- a/tests/hawd/datasetdefinition.cpp +++ b/tests/hawd/datasetdefinition.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -119,11 +120,11 @@ DatasetDefinition::DatasetDefinition(const QString &path) } m_description = json.value("description").toString(); - QJsonObject cols = json.value("columns").toObject(); - for (const QString &key: cols.keys()) { - QJsonObject def = cols.value(key).toObject(); + auto cols = json.value("columns").toArray(); + for (const auto &entry: cols) { + QJsonObject def = entry.toObject(); if (!def.isEmpty()) { - m_columns.insert(key, DataDefinition(def)); + m_columns << qMakePair(def.value("name").toString(), DataDefinition(def)); } } } @@ -152,7 +153,7 @@ QString DatasetDefinition::description() const return m_description; } -QHash DatasetDefinition::columns() const +QList > DatasetDefinition::columns() const { return m_columns; } -- cgit v1.2.3