feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Detect data types for CSV models

Browse Source 
Task-number: QDS-11081
Change-Id: I88418e31f0fd033d7d5ec3c03fea26ae1e4e2362
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Shrief Gabr
2023-11-10 01:44:06 +02:00
parent baf0fc9598
commit 0bcd0b915e
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/components/collectioneditor/collectiondetails.cpp
View File

@@ -428,6 +428,7 @@ void CollectionDetails::resetPropertyType(CollectionProperty &property)
break;
}
}
property.type = type;
}

40
src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.cpp
View File

@@ -542,12 +542,52 @@ void CollectionDetailsModel::loadCsvCollection(const QString &source,
}
}
for (const QString &header : std::as_const(headers)) {
for (QJsonObject &element: elements) {
QVariant variantValue;
if (element.contains(header)) {
variantValue = variantFromString(element.value(header).toString());
element[header] = variantValue.toJsonValue();
if (variantValue.isValid())
break;
}
}
}
SourceFormat sourceFormat = csvFileIsOk ? SourceFormat::Csv : SourceFormat::Unknown;
beginResetModel();
m_currentCollection.resetDetails(headers, elements, sourceFormat);
endResetModel();
}
QVariant CollectionDetailsModel::variantFromString(const QString &value)
{
constexpr QStringView typesPattern{u"(?<boolean>^(?:true|false)$)|"
u"(?<number>^(?:-?(?:0|[1-9]\\d*)?(?:\\.\\d*)?(?<=\\d|\\.)"
u"(?:e-?(?:0|[1-9]\\d*))?|0x[0-9a-f]+)$)|"
u"(?<color>^(?:#(?:(?:[0-9a-fA-F]{2}){3,4}|"
u"(?:[0-9a-fA-F]){3,4}))$)|"
u"(?<string>[A-Za-z][A-Za-z0-9_ -]*)"};
static QRegularExpression validator(typesPattern.toString());
const QString trimmedValue = value.trimmed();
QRegularExpressionMatch match = validator.match(trimmedValue);
QVariant variantValue = value;
if (value.isEmpty())
return QVariant();
if (!match.captured(u"boolean").isEmpty())
return variantValue.toBool();
if (!match.captured(u"number").isEmpty())
return variantValue.toDouble();
if (!match.captured(u"color").isEmpty())
return variantValue.value<QColor>();
if (!match.captured(u"string").isEmpty())
return variantValue.toString();
return QVariant::fromValue(value);
}
void CollectionDetailsModel::setCollectionName(const QString &newCollectionName)
{
if (m_collectionName != newCollectionName) {

1
src/plugins/qmldesigner/components/collectioneditor/collectiondetailsmodel.h
View File

@@ -83,6 +83,7 @@ private:
void loadCsvCollection(const QString &source, const QString &collectionName);
bool saveCollectionAsJson(const QString &path, const QJsonArray &content, const QString &collectionName);
bool saveCollectionAsCsv(const QString &path, const QString &content);
QVariant variantFromString(const QString &value);
QHash<CollectionReference, CollectionDetails> m_openedCollections;
CollectionDetails m_currentCollection;