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

Merge branch 'master' into marker

Browse Source
This commit is contained in:
ThomasWilshaw
2022-01-28 22:30:29 +00:00
committed by GitHub
parent e606c156c5 04ae3acbda
commit 02b9a38737
307 changed files with 26841 additions and 11362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/timeline/timelinemarker.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ void TimelineMarkerList::Save(QXmlStreamWriter *writer) const
marker->Save(writer);
}
}
TimelineMarkerList::~TimelineMarkerList()
{
qDeleteAll(markers_);
app/timeline/timelinemarker.h
-3
View File
@@ -88,9 +88,6 @@ public:
const QList<TimelineMarker *> &list() const;
void Load(QXmlStreamReader* reader);
void Save(QXmlStreamWriter* writer) const;
signals:
void MarkerAdded(TimelineMarker* marker);
app/timeline/timelinepoints.cpp
-24
View File
@@ -39,30 +39,6 @@ const TimelineWorkArea *TimelinePoints::workarea() const
return &workarea_;
}
void TimelinePoints::Load(QXmlStreamReader *reader)
{
while (XMLReadNextStartElement(reader)) {
if (reader->name() == QStringLiteral("markers")) {
markers_.Load(reader);
} else if (reader->name() == QStringLiteral("workarea")) {
workarea_.Load(reader);
} else {
reader->skipCurrentElement();
}
}
}
void TimelinePoints::Save(QXmlStreamWriter *writer) const
{
writer->writeStartElement(QStringLiteral("workarea"));
workarea_.Save(writer);
writer->writeEndElement(); // workarea
writer->writeStartElement(QStringLiteral("markers"));
markers_.Save(writer);
writer->writeEndElement(); // markers
}
TimelineWorkArea *TimelinePoints::workarea()
{
return &workarea_;
app/timeline/timelinepoints.h
-3
View File
@@ -40,9 +40,6 @@ public:
TimelineWorkArea* workarea();
const TimelineWorkArea* workarea() const;
void Load(QXmlStreamReader* reader);
void Save(QXmlStreamWriter* writer) const;
private:
TimelineMarkerList markers_;
app/timeline/timelineworkarea.cpp
-31
View File
@@ -55,37 +55,6 @@ void TimelineWorkArea::set_range(const TimeRange &range)
emit RangeChanged(workarea_range_);
}
void TimelineWorkArea::Load(QXmlStreamReader *reader)
{
rational range_in = workarea_range_.in();
rational range_out = workarea_range_.out();
XMLAttributeLoop(reader, attr) {
if (attr.name() == QStringLiteral("enabled")) {
set_enabled(attr.value() != QStringLiteral("0"));
} else if (attr.name() == QStringLiteral("in")) {
range_in = rational::fromString(attr.value().toString());
} else if (attr.name() == QStringLiteral("out")) {
range_out = rational::fromString(attr.value().toString());
}
}
TimeRange loaded_workarea(range_in, range_out);
if (loaded_workarea != workarea_range_) {
set_range(loaded_workarea);
}
reader->skipCurrentElement();
}
void TimelineWorkArea::Save(QXmlStreamWriter *writer) const
{
writer->writeAttribute(QStringLiteral("enabled"), QString::number(workarea_enabled_));
writer->writeAttribute(QStringLiteral("in"), workarea_range_.in().toString());
writer->writeAttribute(QStringLiteral("out"), workarea_range_.out().toString());
}
const rational &TimelineWorkArea::in() const
{
return workarea_range_.in();
app/timeline/timelineworkarea.h
-3
View File
@@ -44,9 +44,6 @@ public:
const TimeRange& range() const;
void set_range(const TimeRange& range);
void Load(QXmlStreamReader* reader);
void Save(QXmlStreamWriter* writer) const;
static const rational kResetIn;
static const rational kResetOut;