hatam
/
QtMvvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

completed basic qml generation

pull/2/head
Skycoder42 7 years ago
parent
119d4b9318
commit
957f58bc18
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
8 changed files with 212 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/mvvmcore/settingsentry.h
  2. 4
      tests/auto/mvvmcore/settingsgenerator/generatortest.xml
  3. 2
      tests/auto/mvvmcore/settingsgenerator/test_de.ts
  4. 2
      tests/auto/mvvmcore/settingsgenerator/tst_settingsgenerator.cpp
  5. 4
      tests/auto/qml/qmlsettingsgenerator/generatortest.xml
  6. 5
      tools/settingsgenerator/cppsettingsgenerator.cpp
  7. 227
      tools/settingsgenerator/qmlsettingsgenerator.cpp
  8. 20
      tools/settingsgenerator/qmlsettingsgenerator.h

25
src/mvvmcore/settingsentry.h
View File

@ -192,6 +192,8 @@ public:
const_iterator constBegin() const; const_iterator constBegin() const;
const_iterator constEnd() const; const_iterator constEnd() const;
void addChangeCallback(const std::function<void(QList<TType>)> &callback);
void addChangeCallback(QObject *scope, const std::function<void(QList<TType>)> &callback);
void addChangeCallback(const std::function<void(int, TType)> &callback); // index, value void addChangeCallback(const std::function<void(int, TType)> &callback); // index, value
void addChangeCallback(QObject *scope, const std::function<void(int, TType)> &callback); void addChangeCallback(QObject *scope, const std::function<void(int, TType)> &callback);
void addSizeChangeCallback(const std::function<void(int)> &callback); // size void addSizeChangeCallback(const std::function<void(int)> &callback); // size
@ -474,6 +476,27 @@ typename SettingsEntry<QList<TType>>::const_iterator SettingsEntry<QList<TType>>
return const_iterator{const_cast<SettingsEntry<QList<TType>>*>(this), size()}; return const_iterator{const_cast<SettingsEntry<QList<TType>>*>(this), size()};
} }
template<typename TType>
void SettingsEntry<QList<TType>>::addChangeCallback(const std::function<void (QList<TType>)> &callback)
{
addChangeCallback(_accessor, callback);
}
template<typename TType>
void SettingsEntry<QList<TType>>::addChangeCallback(QObject *scope, const std::function<void (QList<TType>)> &callback)
{
QObject::connect(_accessor, &ISettingsAccessor::entryChanged,
scope, [this, callback](const QString &key, const QVariant &) {
if(key.startsWith(_key))
callback(get());
});
QObject::connect(_accessor, &ISettingsAccessor::entryRemoved,
scope, [this, callback](const QString &key) {
if(key.startsWith(_key))
callback(get());
});
}
template<typename TType> template<typename TType>
void SettingsEntry<QList<TType>>::addChangeCallback(const std::function<void (int, TType)> &callback) void SettingsEntry<QList<TType>>::addChangeCallback(const std::function<void (int, TType)> &callback)
{ {
@ -496,7 +519,7 @@ void SettingsEntry<QList<TType>>::addChangeCallback(QObject *scope, const std::f
scope, [mKey, mDefault, callback](const QString &key) { scope, [mKey, mDefault, callback](const QString &key) {
auto match = mKey.match(key); auto match = mKey.match(key);
if(match.hasMatch()) if(match.hasMatch())
callback(match.captured(1).toInt(), mDefault); callback(match.captured(1).toInt(), mDefault.template value<TType>());
}); });
} }

4
tests/auto/mvvmcore/settingsgenerator/generatortest.xml
View File

@ -56,6 +56,10 @@
type="void"/> type="void"/>
<Entry key="variantEntry" <Entry key="variantEntry"
type="QVariant"/> type="QVariant"/>
<Entry key="simpleListEntry"
type="QList&lt;int&gt;">
<Code>{42}</Code>
</Entry>
<ListEntry key="listEntry" <ListEntry key="listEntry"
type="QByteArray"> type="QByteArray">

2
tests/auto/mvvmcore/settingsgenerator/test_de.ts
View File

@ -4,7 +4,7 @@
<context> <context>
<name>SettingsGeneratorTest</name> <name>SettingsGeneratorTest</name>
<message> <message>
<location filename="tst_settingsgenerator.cpp" line="+138"/> <location filename="tst_settingsgenerator.cpp" line="+140"/>
<source>somet translated text...</source> <source>somet translated text...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

2
tests/auto/mvvmcore/settingsgenerator/tst_settingsgenerator.cpp
View File

@ -40,6 +40,7 @@ void SettingsGeneratorTest::testSettingsGenerator()
QCOMPARE(settings->parentNode.parentEntry.nodeWithCodeEntry.key(), QStringLiteral("tests/parentNode/parentEntry/nodeWithCodeEntry")); QCOMPARE(settings->parentNode.parentEntry.nodeWithCodeEntry.key(), QStringLiteral("tests/parentNode/parentEntry/nodeWithCodeEntry"));
QCOMPARE(settings->parentNode.parentEntry.leafEntry.key(), QStringLiteral("tests/parentNode/parentEntry/leafEntry")); QCOMPARE(settings->parentNode.parentEntry.leafEntry.key(), QStringLiteral("tests/parentNode/parentEntry/leafEntry"));
QCOMPARE(settings->variantEntry.key(), QStringLiteral("tests/variantEntry")); QCOMPARE(settings->variantEntry.key(), QStringLiteral("tests/variantEntry"));
QCOMPARE(settings->simpleListEntry.key(), QStringLiteral("tests/simpleListEntry"));
QCOMPARE(settings->listEntry.key(), QStringLiteral("tests/listEntry")); QCOMPARE(settings->listEntry.key(), QStringLiteral("tests/listEntry"));
QCOMPARE(settings->listEntry.dummyChild.key(), QStringLiteral("tests/listEntry/dummyChild")); QCOMPARE(settings->listEntry.dummyChild.key(), QStringLiteral("tests/listEntry/dummyChild"));
@ -52,6 +53,7 @@ void SettingsGeneratorTest::testSettingsGenerator()
QCOMPARE(settings->parentNode.parentEntry.nodeWithCodeEntry.get(), 43); QCOMPARE(settings->parentNode.parentEntry.nodeWithCodeEntry.get(), 43);
QCOMPARE(settings->parentNode.parentEntry.leafEntry.get(), QStringLiteral("translate me")); QCOMPARE(settings->parentNode.parentEntry.leafEntry.get(), QStringLiteral("translate me"));
QCOMPARE(settings->variantEntry.get(), QVariant{}); QCOMPARE(settings->variantEntry.get(), QVariant{});
QCOMPARE(settings->simpleListEntry.get(), QList<int>{42});
QByteArrayList iList{"test1", "test2", "test3"}; QByteArrayList iList{"test1", "test2", "test3"};
QCOMPARE(settings->listEntry.get(), iList); QCOMPARE(settings->listEntry.get(), iList);
QCOMPARE(settings->listEntry.dummyChild.get(), false); QCOMPARE(settings->listEntry.dummyChild.get(), false);

4
tests/auto/qml/qmlsettingsgenerator/generatortest.xml
View File

@ -55,6 +55,10 @@
type="void"/> type="void"/>
<Entry key="variantEntry" <Entry key="variantEntry"
type="QVariant"/> type="QVariant"/>
<Entry key="simpleListEntry"
type="QList&lt;int&gt;">
<Code>{42}</Code>
</Entry>
<ListEntry key="listEntry" <ListEntry key="listEntry"
type="QByteArray"> type="QByteArray">

5
tools/settingsgenerator/cppsettingsgenerator.cpp
View File

@ -154,12 +154,11 @@ void CppSettingsGenerator::writeSource(const SettingsType &settings)
first = false; first = false;
else else
_src << ",\n"; _src << ",\n";
_src << "\t\tQVariant{"; _src << "\t\t";
if(param.asStr) if(param.asStr)
_src << "QStringLiteral(\"" << param.value << "\")"; _src << "QVariant{QStringLiteral(\"" << param.value << "\")}.value<" << param.type << ">()";
else else
_src << param.value; _src << param.value;
_src << "}.value<" << param.type << ">()";
} }
_src << "\n\t"; _src << "\n\t";
} }

227
tools/settingsgenerator/qmlsettingsgenerator.cpp
View File

@ -33,7 +33,7 @@ void QmlSettingsGenerator::process(const QString &inPath)
_srcFile.close(); _srcFile.close();
} }
void QmlSettingsGenerator::writeHeader(const SettingsGeneratorBase::SettingsType &settings, const QString &inHdrPath) void QmlSettingsGenerator::writeHeader(const SettingsType &settings, const QString &inHdrPath)
{ {
QString incGuard = QFileInfo{_hdrFile.fileName()} QString incGuard = QFileInfo{_hdrFile.fileName()}
.completeBaseName() .completeBaseName()
@ -58,88 +58,106 @@ void QmlSettingsGenerator::writeHeader(const SettingsGeneratorBase::SettingsType
} }
_hdr << "\n"; _hdr << "\n";
writeListTypeBaseClass(settings); writeListTypeBaseClass();
// create all the qmltype classes // create all the qmltype classes
auto keyList = settings.prefix ? QStringList{settings.prefix.value()} : QStringList{}; auto keyList = settings.baseKey ? QStringList{settings.baseKey.value()} : QStringList{};
int offset; int offset;
QList<int> childOffsets; QList<int> childOffsets;
std::tie(offset, childOffsets) = writeNodeContentClassesDeclarations(settings, keyList); std::tie(offset, childOffsets) = writeNodeContentClassesDeclarations(settings, keyList);
// create the class // create the class
_hdr << "class " << _prefixName << " : public QObject\n" _hdr << "class " << _name << " : public QObject\n"
<< "{\n" << "{\n"
<< "\tQ_OBJECT\n\n" << "\tQ_OBJECT\n\n"
<< "\tQ_PROPERTY(QtMvvm::ISettingsAccessor *accessor READ accessor CONSTANT FINAL)\n\n"; << "\tQ_PROPERTY(QtMvvm::ISettingsAccessor *accessor READ accessor CONSTANT FINAL)\n\n";
QList<QPair<QString, int>> childConstructs; QList<QPair<QString, int>> childConstructs;
writeNodeClassPropertiesDeclarations(settings, keyList, childOffsets, childConstructs); QList<int> listEntries;
writeNodeClassPropertiesDeclarations(settings, keyList, childOffsets, listEntries, childConstructs);
_hdr << "public:\n" _hdr << "\t" << _cppName << " *_settings;\n\n"
<< "\texplicit " << settings.name.value() << "(QObject *parent = nullptr);\n" << "public:\n"
<< "\tQtMvvm::ISettingsAccessor *accessor() const;\n\n"; << "\texplicit " << _name << "(" << _cppName << " *settings, QObject *parent = nullptr) : \n"
<< "\t\tQObject{parent},\n";
_hdr << "\nprivate:\n" writeMemberInits(keyList, childConstructs);
<< "\tQtMvvm::ISettingsAccessor *_accessor;\n" _hdr << "\t\t_settings{settings}\n"
<< "\t{\n";
writeEntryPropertySignalConnects(settings, keyList, -1, listEntries);
_hdr << "\t}\n\n"
<< "\texplicit " << _name << "(QObject *parent = nullptr) :\n"
<< "\t\t" << _name << "{" << _cppName << "::instance(), parent}\n"
<< "\t{}\n\n"
<< "\tQtMvvm::ISettingsAccessor *accessor() const { return _settings->accessor(); }\n"
<< "\t" << _cppName << " *settings() const { return _settings; }\n"
<< "};\n\n" << "};\n\n"
<< "#endif //" << incGuard << '\n'; << "#endif //" << incGuard << '\n';
} }
void QmlSettingsGenerator::writeListTypeBaseClass(const SettingsGeneratorBase::SettingsType &settings) void QmlSettingsGenerator::writeListTypeBaseClass()
{ {
// write the generic variant // write the generic variant
_hdr << "template <typename T>\n" _hdr << "template <typename T>\n"
<< "class " << _prefixName << "_ListType : public QObject\n" << "class " << _name << "_ListType : public QObject\n"
<< "{\n" << "{\n"
<< "public:\n" << "public:\n"
<< "\ttemplate <typename TList>\n" << "\ttemplate <typename TList>\n"
<< "\tstruct ListData {\n" << "\tstruct ListData {\n"
<< "\t\tstatic_assert(std::is_base_of<" << _prefixName << "_ListType<T>, TList>::value, \"TList must extend " << _prefixName << "_ListType<T>\");\n" << "\t\tstatic_assert(std::is_base_of<" << _name << "_ListType<T>, TList>::value, \"TList must extend " << _name << "_ListType<T>\");\n"
<< "\t\tQtMvvm::SettingsEntry<QList<T>> &entry;\n" << "\t\tQtMvvm::SettingsEntry<QList<T>> &entry;\n"
<< "\t\tQList<TList*> elements;\n" << "\t\tQList<TList*> elements;\n"
<< "\t};\n\n" << "\t};\n\n"
<< "\t" << _prefixName << "_ListType(QtMvvm::SettingsEntry<QList<T>> &entry, QObject *parent) : \n" << "\t" << _name << "_ListType(QObject *parent) : \n"
<< "\t\tQObject{parent},\n" << "\t\tQObject{parent}\n"
<< "\t\t_entry{entry}\n"
<< "\t{}\n" << "\t{}\n"
<< "\tT value() const { return _index >= 0 ? _entry.getAt(_index) : _buffer; }\n" << "\tT value() const { return _entry ? _entry->getAt(_index) : _buffer; }\n"
<< "\tvoid setValue(const T &value) { if(_index >= 0) _entry.setAt(_index, value); else { _index = -2; _buffer = value; } }\n\n" << "\tvoid setValue(const T &value) { if(_entry) _entry->setAt(_index, value); else { _index = -2; _buffer = value; } }\n\n"
<< "private:\n"
<< "\tfriend class " << _prefixName << ";\n"
<< "\tQtMvvm::SettingsEntry<QList<T>> &_entry;\n"
<< "\tint _index = -1;\n"
<< "\tT _buffer{};\n\n"
<< "\ttemplate <typename TList>\n" << "\ttemplate <typename TList>\n"
<< "\tstatic void append(QQmlListProperty<TList> *list, TList *element) {\n" << "\tstatic void adjust(ListData<TList> *data, QObject *parent, int size) {\n"
<< "\t\tconst auto data = reinterpret_cast<ListData<TList>*>(list->data);\n" << "\t\twhile(data->elements.size() > size)\n"
<< "\t\tconst auto maxIndex = data->entry.size();\n" << "\t\t\tdata->elements.takeLast()->deleteLater();\n"
<< "\t\tfor(auto index = data->elements.size(); index <= maxIndex; index++) {\n" << "\t\tfor(auto index = data->elements.size(); index < size; index++) {\n"
<< "\t\t\tTList *elem;\n" << "\t\t\tauto elem = new TList{parent};\n"
<< "\t\t\tif(index == maxIndex) {\n"
<< "\t\t\t\telem = element;\n"
<< "\t\t\t\telem->setParent(list->object);\n"
<< "\t\t\t} else\n"
<< "\t\t\t\telem = new TList{list->object};\n"
<< "\t\t\tconst auto copyDefault = elem->_index == -2;\n"
<< "\t\t\telem->_index = index;\n" << "\t\t\telem->_index = index;\n"
<< "\t\t\telem->_entry = &data->entry;\n"
<< "\t\t\tdata->elements.append(elem);\n" << "\t\t\tdata->elements.append(elem);\n"
<< "\t\t\tif(copyDefault)\n"
<< "\t\t\t\telem->setValue(T{std::move(elem->_buffer)});\n"
<< "\t\t\tdata->entry.addChangeCallback(elem, [index, elem](int i, const T &d) {\n" << "\t\t\tdata->entry.addChangeCallback(elem, [index, elem](int i, const T &d) {\n"
<< "\t\t\t\tif(i == index)\n" << "\t\t\t\tif(i == index)\n"
<< "\t\t\t\t\temit elem->valueChanged(d);\n" << "\t\t\t\t\temit elem->valueChanged(d);\n"
<< "\t\t\t});\n" << "\t\t\t});\n"
<< "\t\t}\n" << "\t\t}\n"
<< "\t}\n\n" << "\t}\n\n"
<< "\ttemplate <typename TList>\n"
<< "\tstatic void append(QQmlListProperty<TList> *list, TList *element) {\n"
<< "\t\tconst auto data = reinterpret_cast<ListData<TList>*>(list->data);\n"
<< "\t\tconst auto maxIndex = data->entry.size();\n"
<< "\t\tadjust<TList>(data, list->object, maxIndex);\n"
<< "\t\telement->setParent(list->object);\n"
<< "\t\tconst auto copyDefault = element->_index == -2;\n"
<< "\t\telement->_index = maxIndex;\n"
<< "\t\telement->_entry = &data->entry;\n"
<< "\t\tdata->elements.append(element);\n"
<< "\t\tif(copyDefault)\n"
<< "\t\t\telement->setValue(T{std::move(element->_buffer)});\n"
<< "\t\tdata->entry.addChangeCallback(element, [maxIndex, element](int i, const T &d) {\n"
<< "\t\t\tif(i == maxIndex)\n"
<< "\t\t\t\temit element->valueChanged(d);\n"
<< "\t\t});\n"
<< "\t}\n\n"
<< "\ttemplate <typename TList>\n" << "\ttemplate <typename TList>\n"
<< "\tstatic TList *at(QQmlListProperty<TList> *list, int index) {\n" << "\tstatic TList *at(QQmlListProperty<TList> *list, int index) {\n"
<< "\t\tconst auto data = reinterpret_cast<ListData<TList>*>(list->data);\n" << "\t\tconst auto data = reinterpret_cast<ListData<TList>*>(list->data);\n"
<< "\t\treturn data->elements.size() > index ? data->elements.value(index) : nullptr;\n" << "\t\treturn data->elements.size() > index ? data->elements.value(index) : nullptr;\n"
<< "\t}\n\n" << "\t}\n\n"
<< "\ttemplate <typename TList>\n" << "\ttemplate <typename TList>\n"
<< "\tstatic int count(QQmlListProperty<TList> *list) {\n" << "\tstatic int count(QQmlListProperty<TList> *list) {\n"
<< "\t\treturn reinterpret_cast<ListData<TList>*>(list->data)->elements.size();\n" << "\t\treturn reinterpret_cast<ListData<TList>*>(list->data)->elements.size();\n"
<< "\t}\n\n" << "\t}\n\n"
<< "\ttemplate <typename TList>\n" << "\ttemplate <typename TList>\n"
<< "\tstatic void clear(QQmlListProperty<TList> *list) {\n" << "\tstatic void clear(QQmlListProperty<TList> *list) {\n"
<< "\t\tconst auto data = reinterpret_cast<ListData<TList>*>(list->data);\n" << "\t\tconst auto data = reinterpret_cast<ListData<TList>*>(list->data);\n"
@ -147,11 +165,16 @@ void QmlSettingsGenerator::writeListTypeBaseClass(const SettingsGeneratorBase::S
<< "\t\t\telem->deleteLater();\n" << "\t\t\telem->deleteLater();\n"
<< "\t\tdata->elements.clear();\n" << "\t\tdata->elements.clear();\n"
<< "\t\tdata->entry.reset(false);\n" << "\t\tdata->entry.reset(false);\n"
<< "\t}\n" << "\t}\n\n"
<< "private:\n"
<< "\tQtMvvm::SettingsEntry<QList<T>> *_entry = nullptr;\n"
<< "\tint _index = -1;\n"
<< "\tT _buffer{};\n"
<< "};\n\n"; << "};\n\n";
} }
std::tuple<int, QList<int>> QmlSettingsGenerator::writeNodeContentClassesDeclarations(const SettingsGeneratorBase::NodeContentGroup &node, const QStringList &keyList, int offset) std::tuple<int, QList<int>> QmlSettingsGenerator::writeNodeContentClassesDeclarations(const NodeContentGroup &node, const QStringList &keyList, int offset)
{ {
QList<int> offsetList; QList<int> offsetList;
for(const auto &cNode : node.contentNodes) { for(const auto &cNode : node.contentNodes) {
@ -165,7 +188,7 @@ std::tuple<int, QList<int>> QmlSettingsGenerator::writeNodeContentClassesDeclara
} else } else
offsetList.append(-1); offsetList.append(-1);
} else if(nonstd::holds_alternative<ListEntryType>(cNode)) { } else if(nonstd::holds_alternative<ListEntryType>(cNode)) {
offset = writeListEntryListClass(nonstd::get<ListEntryType>(cNode), keyList, offset); offset = writeListEntryListClass(nonstd::get<ListEntryType>(cNode), offset);
offsetList.append(offset - 1); //double offset!!! offsetList.append(offset - 1); //double offset!!!
if(!nonstd::get<ListEntryType>(cNode).contentNodes.isEmpty()) { if(!nonstd::get<ListEntryType>(cNode).contentNodes.isEmpty()) {
offset = writeNodeClassDeclaration(nonstd::get<ListEntryType>(cNode), keyList, offset); offset = writeNodeClassDeclaration(nonstd::get<ListEntryType>(cNode), keyList, offset);
@ -182,41 +205,45 @@ std::tuple<int, QList<int>> QmlSettingsGenerator::writeNodeContentClassesDeclara
return std::make_tuple(offset, offsetList); return std::make_tuple(offset, offsetList);
} }
int QmlSettingsGenerator::writeNodeClassDeclaration(const SettingsGeneratorBase::NodeType &node, const QStringList &keyList, int offset) int QmlSettingsGenerator::writeNodeClassDeclaration(const NodeType &node, QStringList keyList, int offset)
{ {
auto subList = QStringList{keyList} << node.key; keyList.append(node.key);
QList<int> childOffsets; QList<int> childOffsets;
std::tie(offset, childOffsets) = writeNodeContentClassesDeclarations(node, subList, offset); std::tie(offset, childOffsets) = writeNodeContentClassesDeclarations(node, keyList, offset);
_hdr << "class " << _prefixName << "_" << offset << " : public QObject // " << node.key << "\n" _hdr << "class " << _name << "_" << offset << " : public QObject // " << node.key << "\n"
<< "{\n" << "{\n"
<< "\tQ_OBJECT\n\n"; << "\tQ_OBJECT\n\n";
QList<QPair<QString, int>> childConstructs; QList<QPair<QString, int>> childConstructs;
writeNodeClassPropertiesDeclarations(node, subList, childOffsets, childConstructs); QList<int> listEntries;
writeNodeClassPropertiesDeclarations(node, keyList, childOffsets, listEntries, childConstructs);
_hdr << "\t" << _cppName << " *_settings;\n\n" _hdr << "\t" << _cppName << " *_settings;\n\n"
<< "public:\n" << "public:\n"
<< "\t" << _name << "_" << offset << "(" << _cppName << " *settings, QObject *parent) : \n" << "\t" << _name << "_" << offset << "(" << _cppName << " *settings, QObject *parent) : \n"
<< "\t\tQObject{parent},\n"; << "\t\tQObject{parent},\n";
for(const auto &info : childConstructs) writeMemberInits(keyList, childConstructs);
_hdr << "\t\t_" << info.first << "{new " << _name << "_" << info.second << "{settings, this}},\n";
_hdr << "\t\t_settings{settings}\n" _hdr << "\t\t_settings{settings}\n"
<< "\t{}\n" << "\t{\n";
writeEntryPropertySignalConnects(node, keyList, offset, listEntries);
_hdr << "\t}\n"
<< "};\n\n"; << "};\n\n";
return ++offset; return ++offset;
} }
int QmlSettingsGenerator::writeListEntryListClass(const SettingsGeneratorBase::ListEntryType &entry, QStringList keyList, int offset) int QmlSettingsGenerator::writeListEntryListClass(const ListEntryType &entry, int offset)
{ {
const auto &mType = _typeMappings.value(entry.type, entry.type); const auto &mType = _typeMappings.value(entry.type, entry.type);
_hdr << "class " << _prefixName << "_" << offset << " : public " << _prefixName << "_ListType<" << mType << "> // " << entry.key << "\n" _hdr << "class " << _name << "_" << offset << " : public " << _name << "_ListType<" << mType << "> // " << entry.key << "\n"
<< "{\n" << "{\n"
<< "\tQ_OBJECT\n\n" << "\tQ_OBJECT\n\n"
<< "\tQ_PROPERTY(" << mType << " value READ value WRITE setValue NOTIFY valueChanged)\n\n" << "\tQ_PROPERTY(" << mType << " value READ value WRITE setValue NOTIFY valueChanged)\n\n"
<< "public:\n" << "public:\n"
<< "\texplicit " << _name << "_" << offset << "(QObject *parent = nullptr);\n\n" << "\texplicit " << _name << "_" << offset << "(QObject *parent = nullptr) : \n"
<< "\t\t" << _name << "_ListType{parent}\n"
<< "\t{}\n\n"
<< "Q_SIGNALS:\n" << "Q_SIGNALS:\n"
<< "\tvoid valueChanged(const " << mType << " &value);\n" << "\tvoid valueChanged(const " << mType << " &value);\n"
<< "};\n\n"; << "};\n\n";
@ -224,7 +251,7 @@ int QmlSettingsGenerator::writeListEntryListClass(const SettingsGeneratorBase::L
return ++offset; return ++offset;
} }
void QmlSettingsGenerator::writeNodeClassPropertiesDeclarations(const SettingsGeneratorBase::NodeContentGroup &node, const QStringList &keyList, QList<int> &childOffsets, QList<QPair<QString, int>> &childConstructs) void QmlSettingsGenerator::writeNodeClassPropertiesDeclarations(const NodeContentGroup &node, const QStringList &keyList, QList<int> &childOffsets, QList<int> &listEntries, QList<QPair<QString, int>> &childConstructs)
{ {
for(const auto &cNode : node.contentNodes) { for(const auto &cNode : node.contentNodes) {
if(nonstd::holds_alternative<NodeType>(cNode)) if(nonstd::holds_alternative<NodeType>(cNode))
@ -232,25 +259,26 @@ void QmlSettingsGenerator::writeNodeClassPropertiesDeclarations(const SettingsGe
else if(nonstd::holds_alternative<EntryType>(cNode)) else if(nonstd::holds_alternative<EntryType>(cNode))
writeEntryPropertyDeclaration(nonstd::get<EntryType>(cNode), keyList, childOffsets.takeFirst(), childConstructs); writeEntryPropertyDeclaration(nonstd::get<EntryType>(cNode), keyList, childOffsets.takeFirst(), childConstructs);
else if(nonstd::holds_alternative<ListEntryType>(cNode)) { else if(nonstd::holds_alternative<ListEntryType>(cNode)) {
childOffsets.takeFirst(); //TODO use... auto lIndex = childOffsets.takeFirst(); //done seperately because of undefine param call order
writeEntryPropertyDeclaration(nonstd::get<ListEntryType>(cNode), keyList, childOffsets.takeFirst(), childConstructs); writeListEntryPropertyDeclaration(nonstd::get<ListEntryType>(cNode), keyList, lIndex, childOffsets.takeFirst(), childConstructs);
listEntries.append(lIndex);
} else if(nonstd::holds_alternative<NodeContentGroup>(cNode)) } else if(nonstd::holds_alternative<NodeContentGroup>(cNode))
writeNodeClassPropertiesDeclarations(nonstd::get<NodeContentGroup>(cNode), keyList, childOffsets, childConstructs); writeNodeClassPropertiesDeclarations(nonstd::get<NodeContentGroup>(cNode), keyList, childOffsets, listEntries, childConstructs);
else else
Q_UNREACHABLE(); Q_UNREACHABLE();
} }
} }
void QmlSettingsGenerator::writeNodePropertyDeclaration(const SettingsGeneratorBase::NodeType &entry, int classIndex, QList<QPair<QString, int>> &childConstructs, const QString &overwriteName) void QmlSettingsGenerator::writeNodePropertyDeclaration(const NodeType &entry, int classIndex, QList<QPair<QString, int>> &childConstructs, const QString &overwriteName)
{ {
const auto &mName = overwriteName.isNull() ? entry.key : overwriteName; const auto &mName = overwriteName.isNull() ? entry.key : overwriteName;
_hdr << "\tQ_PROPERTY(" << _name << "_" << classIndex << "* " << mName _hdr << "\tQ_PROPERTY(" << _name << "_" << classIndex << "* " << mName
<< " MEMBER _" << mName << " CONSTANT)\n"; << " MEMBER _" << mName << " CONSTANT)\n"
_hdr << "\t" << _name << "_" << classIndex << "* _" << mName << ";\n\n"; << "\t" << _name << "_" << classIndex << "* _" << mName << ";\n\n";
childConstructs.append({mName, classIndex}); childConstructs.append({mName, classIndex});
} }
void QmlSettingsGenerator::writeEntryPropertyDeclaration(const SettingsGeneratorBase::EntryType &entry, QStringList keyList, int classIndex, QList<QPair<QString, int>> &childConstructs) void QmlSettingsGenerator::writeEntryPropertyDeclaration(const EntryType &entry, QStringList keyList, int classIndex, QList<QPair<QString, int>> &childConstructs)
{ {
keyList.append(entry.key); keyList.append(entry.key);
const auto &mType = _typeMappings.value(entry.type, entry.type); const auto &mType = _typeMappings.value(entry.type, entry.type);
@ -261,9 +289,9 @@ void QmlSettingsGenerator::writeEntryPropertyDeclaration(const SettingsGenerator
<< " NOTIFY " << entry.key << "_changed)\n"; << " NOTIFY " << entry.key << "_changed)\n";
_hdr << "\t" << mType << " get_" << entry.key << "() const { return _settings->" << keyList.join(QLatin1Char('.')) << ".get(); }\n" _hdr << "\t" << mType << " get_" << entry.key << "() const { return _settings->" << keyList.join(QLatin1Char('.')) << ".get(); }\n"
<< "\tvoid set_" << entry.key << "(const " << mType << "& value) { _settings->" << keyList.join(QLatin1Char('.')) << ".set(value); }\n" << "\tvoid set_" << entry.key << "(const " << mType << " &value) { _settings->" << keyList.join(QLatin1Char('.')) << ".set(value); }\n"
<< "Q_SIGNALS:\n" << "Q_SIGNALS:\n"
<< "\tvoid " << entry.key << "_changed();\n" << "\tvoid " << entry.key << "_changed(const " << mType << " &value);\n"
<< "private:\n\n"; << "private:\n\n";
} }
@ -271,12 +299,77 @@ void QmlSettingsGenerator::writeEntryPropertyDeclaration(const SettingsGenerator
writeNodePropertyDeclaration(entry, classIndex, childConstructs, entry.qmlGroupKey.value_or(entry.key + QStringLiteral("Group"))); writeNodePropertyDeclaration(entry, classIndex, childConstructs, entry.qmlGroupKey.value_or(entry.key + QStringLiteral("Group")));
} }
void QmlSettingsGenerator::writeSource(const SettingsGeneratorBase::SettingsType &settings) void QmlSettingsGenerator::writeListEntryPropertyDeclaration(const ListEntryType &entry, QStringList keyList, int listIndex, int classIndex, QList<QPair<QString, int>> &childConstructs)
{ {
_src << "#include \"" << _hdrFile.fileName() << "\"\n\n"; keyList.append(entry.key);
_hdr << "\tQ_PROPERTY(QQmlListProperty<" << _name << "_" << listIndex << "> " << entry.key
<< " READ get_" << entry.key << " CONSTANT)\n"
<< "\t" << _name << "_" << listIndex << "::ListData<" << _name << "_" << listIndex << "> _" << entry.key << ";\n"
<< "\tQQmlListProperty<" << _name << "_" << listIndex << "> get_" << entry.key << "() {\n"
<< "\t\treturn {\n"
<< "\t\t\tthis, &_" << entry.key << ",\n"
<< "\t\t\t&" << _name << "_" << listIndex << "::append<" << _name << "_" << listIndex << ">,\n"
<< "\t\t\t&" << _name << "_" << listIndex << "::count<" << _name << "_" << listIndex << ">,\n"
<< "\t\t\t&" << _name << "_" << listIndex << "::at<" << _name << "_" << listIndex << ">,\n"
<< "\t\t\t&" << _name << "_" << listIndex << "::clear<" << _name << "_" << listIndex << ">\n"
<< "\t\t};\n"
<< "\t}\n\n";
_src << "QtMvvm::ISettingsAccessor *" << settings.name.value() << "::accessor() const\n" childConstructs.append({entry.key, -1});
<< "{\n"
<< "\treturn _accessor;\n" if(!entry.contentNodes.isEmpty())
<< "}\n\n"; writeNodePropertyDeclaration(entry, classIndex, childConstructs, entry.qmlGroupKey.value_or(entry.key + QStringLiteral("Group")));
}
void QmlSettingsGenerator::writeMemberInits(const QStringList &keyList, const QList<QPair<QString, int>> &childConstructs)
{
for(const auto &info : childConstructs) {
if(info.second < 0)
_hdr << "\t\t_" << info.first << "{settings->" << (QStringList{keyList} << info.first).join(QLatin1Char('.')) << ", {}},\n";
else
_hdr << "\t\t_" << info.first << "{new " << _name << "_" << info.second << "{settings, this}},\n";
}
}
void QmlSettingsGenerator::writeEntryPropertySignalConnects(const NodeContentGroup &node, const QStringList &keyList, int classIndex, QList<int> &listEntries)
{
for(const auto &cNode : node.contentNodes) {
if(nonstd::holds_alternative<NodeType>(cNode))
continue; //nothing to be set
else if(nonstd::holds_alternative<EntryType>(cNode))
writeEntryPropertySignalConnect(nonstd::get<EntryType>(cNode), keyList, classIndex);
else if(nonstd::holds_alternative<ListEntryType>(cNode))
writeListEntryPropertySignalConnect(nonstd::get<ListEntryType>(cNode), keyList, listEntries);
else if(nonstd::holds_alternative<NodeContentGroup>(cNode))
writeEntryPropertySignalConnects(nonstd::get<NodeContentGroup>(cNode), keyList, classIndex, listEntries);
else
Q_UNREACHABLE();
}
}
void QmlSettingsGenerator::writeEntryPropertySignalConnect(const EntryType &entry, QStringList keyList, int classIndex)
{
if(_typeMappings.value(entry.type, entry.type) == QStringLiteral("void"))
return;
keyList.append(entry.key);
_hdr << "\t\t_settings->" << keyList.join(QLatin1Char('.'))
<< ".addChangeCallback(this, std::bind(&" << _name;
if(classIndex >= 0)
_hdr << "_" << classIndex;
_hdr << "::" << entry.key << "_changed, this, std::placeholders::_1));\n";
}
void QmlSettingsGenerator::writeListEntryPropertySignalConnect(const SettingsGeneratorBase::ListEntryType &entry, QStringList keyList, QList<int> &listEntries)
{
auto classIndex = listEntries.takeFirst();
keyList.append(entry.key);
_hdr << "\t\t_settings->" << keyList.join(QLatin1Char('.'))
<< ".addSizeChangeCallback(this, std::bind(&"
<< _name << "_" << classIndex << "::adjust<" << _name << "_" << classIndex
<< ">, &_" << entry.key << ", this, std::placeholders::_1));\n";
}
void QmlSettingsGenerator::writeSource(const SettingsType &settings)
{
_src << "#include \"" << _hdrFile.fileName() << "\"\n\n";
} }

20
tools/settingsgenerator/qmlsettingsgenerator.h
View File

@ -26,15 +26,25 @@ private:
void writeHeader(const SettingsType &settings, const QString &inHdrPath); void writeHeader(const SettingsType &settings, const QString &inHdrPath);
void writeListTypeBaseClass(const SettingsType &settings); void writeListTypeBaseClass();
std::tuple<int, QList<int>> writeNodeContentClassesDeclarations(const NodeContentGroup &node, const QStringList &keyList, int offset = 0); std::tuple<int, QList<int>> writeNodeContentClassesDeclarations(const NodeContentGroup &node, const QStringList &keyList, int offset = 0);
int writeNodeClassDeclaration(const NodeType &node, const QStringList &keyList, int offset); int writeNodeClassDeclaration(const NodeType &node, QStringList keyList, int offset);
int writeListEntryListClass(const ListEntryType &entry, QStringList keyList, int offset); int writeListEntryListClass(const ListEntryType &entry, int offset);
void writeNodeClassPropertiesDeclarations(const NodeContentGroup &node, const QStringList &keyList, QList<int> &childOffsets, QList<QPair<QString, int>> &childConstructs); void writeNodeClassPropertiesDeclarations(const NodeContentGroup &node,
const QStringList &keyList,
QList<int> &childOffsets,
QList<int> &listEntries,
QList<QPair<QString, int>> &childConstructs);
void writeNodePropertyDeclaration(const NodeType &entry, int classIndex, QList<QPair<QString, int>> &childConstructs, const QString &overwriteName = {}); void writeNodePropertyDeclaration(const NodeType &entry, int classIndex, QList<QPair<QString, int>> &childConstructs, const QString &overwriteName = {});
void writeEntryPropertyDeclaration(const EntryType &entry, QStringList keyList, int classIndex, QList<QPair<QString, int>> &childConstructs); void writeEntryPropertyDeclaration(const EntryType &entry, QStringList keyList, int classIndex, QList<QPair<QString, int>> &childConstructs);
void writeListEntryPropertyDeclaration(const ListEntryType &entry, QStringList keyList, int listIndex, int classIndex, QList<QPair<QString, int>> &childConstructs);
void writeMemberInits(const QStringList &keyList, const QList<QPair<QString, int>> &childConstructs);
void writeEntryPropertySignalConnects(const NodeContentGroup &node, const QStringList &keyList, int classIndex, QList<int> &listEntries);
void writeEntryPropertySignalConnect(const EntryType &entry, QStringList keyList, int classIndex);
void writeListEntryPropertySignalConnect(const ListEntryType &entry, QStringList keyList, QList<int> &listEntries);
void writeSource(const SettingsType &settings); void writeSource(const SettingsType &settings);
}; };

Write Preview
Loading…
Cancel
Save