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

Marker color is saved to .ove file

Browse Source
This commit is contained in:
Thomas Wilshaw
2021-10-22 22:15:50 +01:00
parent 575ce39696
commit ca807b7b66
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/timeline/timelinemarker.cpp
+10 -2
View File
@@ -73,6 +73,8 @@ void TimelineMarkerList::Save(QXmlStreamWriter *writer) const
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());
@@ -85,9 +87,12 @@ TimelineMarkerList::~TimelineMarkerList()
qDeleteAll(markers_);
}
TimelineMarker* TimelineMarkerList::AddMarker(const TimeRange &time, const QString &name)
TimelineMarker* TimelineMarkerList::AddMarker(const TimeRange &time, const QString &name, int color)
{
TimelineMarker* m = new TimelineMarker(time, name);
if (color >= 0) {
m->set_color(color);
}
markers_.append(m);
emit MarkerAdded(m);
return m;
@@ -117,11 +122,14 @@ void TimelineMarkerList::Load(QXmlStreamReader *reader)
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")) {
@@ -129,7 +137,7 @@ void TimelineMarkerList::Load(QXmlStreamReader *reader)
}
}
AddMarker(TimeRange(in, out), name);
AddMarker(TimeRange(in, out), name, color);
}
reader->skipCurrentElement();
app/timeline/timelinemarker.h
+1 -1
View File
@@ -68,7 +68,7 @@ public:
virtual ~TimelineMarkerList() override;
TimelineMarker *AddMarker(const TimeRange& time = TimeRange(), const QString& name = QString());
TimelineMarker *AddMarker(const TimeRange& time = TimeRange(), const QString& name = QString(), int color = -1);
void RemoveMarker(TimelineMarker* marker);
app/widget/timeruler/seekablewidget.cpp
+14
View File
@@ -44,6 +44,7 @@ SeekableWidget::SeekableWidget(QWidget* parent) :
playhead_width_ = QtUtils::QFontMetricsWidth(fm, "H");
setContextMenuPolicy(Qt::CustomContextMenu);
}
void SeekableWidget::ConnectTimelinePoints(TimelinePoints *points)
@@ -53,6 +54,10 @@ void SeekableWidget::ConnectTimelinePoints(TimelinePoints *points)
disconnect(timeline_points_->workarea(), &TimelineWorkArea::EnabledChanged, this, static_cast<void (SeekableWidget::*)()>(&SeekableWidget::update));
disconnect(timeline_points_->markers(), &TimelineMarkerList::MarkerAdded, this, static_cast<void (SeekableWidget::*)()>(&SeekableWidget::update));
disconnect(timeline_points_->markers(), &TimelineMarkerList::MarkerRemoved, this, static_cast<void (SeekableWidget::*)()>(&SeekableWidget::update));
foreach(Marker* marker_widget, marker_map_.values()) {
marker_widget->deleteLater();
}
}
timeline_points_ = points;
@@ -66,6 +71,14 @@ void SeekableWidget::ConnectTimelinePoints(TimelinePoints *points)
connect(timeline_points_->markers(), &TimelineMarkerList::MarkerAdded, this, &SeekableWidget::addMarker);
}
if (timeline_points() && !timeline_points()->markers()->list().isEmpty()) {
foreach (TimelineMarker *marker, timeline_points()->markers()->list()) {
if (!marker_map_.keys().contains(marker)) {
addMarker(marker);
}
}
}
updateMarkerPositions();
update();
@@ -147,6 +160,7 @@ void SeekableWidget::addMarker(TimelineMarker* marker)
connect(marker, &TimelineMarker::ColorChanged, marker_widget, &Marker::SetColor);
marker_widget->move(TimeToScreen(marker->time().in()), 20);
marker_widget->SetColor(marker->color());
marker_widget->show();
}
}