oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Very minor serializer refactoring

Browse Source
This commit is contained in:
itsmattkc
2022-02-02 10:46:08 -08:00
parent fed62246e6
commit fdcee7cd07
2 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/project/serializer/serializer211228.cpp
+29 -23
View File
@@ -914,51 +914,57 @@ void ProjectSerializer211228::SaveWorkArea(QXmlStreamWriter *writer, TimelineWor
writer->writeAttribute(QStringLiteral("out"), workarea->out().toString());
}
void ProjectSerializer211228::LoadMarker(QXmlStreamReader *reader, TimelineMarkerList *markers) const
{
QString name;
int color = -1;
rational in, out;
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("name")) {
name = attr.value().toString();
} else if (attr.name() == QStringLiteral("color")) {
color = attr.value().toInt();
} else if (attr.name() == QStringLiteral("in")) {
in = rational::fromString(attr.value().toString());
} else if (attr.name() == QStringLiteral("out")) {
out = rational::fromString(attr.value().toString());
}
}
markers->AddMarker(TimeRange(in, out), name, color);
// Required to move XML reader to the end of element
reader->readElementText();
}
void ProjectSerializer211228::SaveMarker(QXmlStreamWriter* writer, TimelineMarker* marker) const
{
writer->writeStartElement(QStringLiteral("marker"));
writer->writeAttribute(QStringLiteral("name"), marker->name());
writer->writeAttribute(QStringLiteral("color"), QString::number(marker->color()));
writer->writeAttribute(QStringLiteral("in"), marker->time().in().toString());
writer->writeAttribute(QStringLiteral("out"), marker->time().out().toString());
writer->writeEndElement(); // marker
}
void ProjectSerializer211228::LoadMarkerList(QXmlStreamReader *reader, TimelineMarkerList *markers) const
{
while(XMLReadNextStartElement(reader)) {
if (reader->name() == QStringLiteral("marker")) {
QString name;
int color = -1;
rational in, out;
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("name")) {
name = attr.value().toString();
} else if (attr.name() == QStringLiteral("color")) {
color = attr.value().toInt();
} else if (attr.name() == QStringLiteral("in")) {
in = rational::fromString(attr.value().toString());
} else if (attr.name() == QStringLiteral("out")) {
out = rational::fromString(attr.value().toString());
}
}
markers->AddMarker(TimeRange(in, out), name, color);
LoadMarker(reader, markers);
} else {
reader->skipCurrentElement();
}
reader->skipCurrentElement();
}
}
void ProjectSerializer211228::SaveMarkerList(QXmlStreamWriter *writer, TimelineMarkerList *markers) const
{
foreach (TimelineMarker* marker, markers->list()) {
writer->writeStartElement(QStringLiteral("marker"));
SaveMarker(writer, marker);
writer->writeEndElement(); // marker
}
}
app/node/project/serializer/serializer211228.h
+2 -2
View File
@@ -97,8 +97,8 @@ private:
void SaveWorkArea(QXmlStreamWriter *writer, TimelineWorkArea *workarea) const;
void LoadMarker(QXmlStreamReader *reader);
void LoadMarker(QXmlStreamReader *reader, TimelineMarkerList *markers) const;
void SaveMarker(QXmlStreamWriter *writer, TimelineMarker *marker) const;
void LoadMarkerList(QXmlStreamReader *reader, TimelineMarkerList *markers) const;