Allow markers to be selected
This commit is contained in:
@@ -150,6 +150,18 @@ void SeekableWidget::SetScroll(int s)
|
||||
update();
|
||||
}
|
||||
|
||||
QMap<TimelineMarker *, Marker *> SeekableWidget::GetActiveMarkers() {
|
||||
QMap<TimelineMarker *, Marker *> active_markers;
|
||||
|
||||
foreach(TimelineMarker* marker, marker_map_.keys()) {
|
||||
if (marker_map_.value(marker)->active()) {
|
||||
active_markers.insert(marker, marker_map_.value(marker));
|
||||
}
|
||||
}
|
||||
|
||||
return active_markers;
|
||||
}
|
||||
|
||||
void SeekableWidget::addMarker(TimelineMarker* marker)
|
||||
{
|
||||
if (!marker_map_.contains(marker)) {
|
||||
@@ -158,6 +170,7 @@ void SeekableWidget::addMarker(TimelineMarker* marker)
|
||||
|
||||
connect(marker_widget, &Marker::ColorChanged, marker, &TimelineMarker::set_color);
|
||||
connect(marker, &TimelineMarker::ColorChanged, marker_widget, &Marker::SetColor);
|
||||
connect(marker_widget, &Marker::markerSelected, this, &SeekableWidget::markerSelected);
|
||||
|
||||
marker_widget->move(TimeToScreen(marker->time().in()), 20);
|
||||
marker_widget->SetColor(marker->color());
|
||||
@@ -173,6 +186,16 @@ void SeekableWidget::updateMarkerPositions()
|
||||
}
|
||||
}
|
||||
|
||||
void SeekableWidget::markerSelected(Marker* marker)
|
||||
{
|
||||
foreach(Marker * marker_widget, marker_map_.values()) {
|
||||
if (marker_widget != marker) {
|
||||
marker_widget->set_active(false);
|
||||
marker_widget->update();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int SeekableWidget::TimeToScreen(const rational &time) const
|
||||
{
|
||||
return qFloor(TimeToScene(time)) - scroll_;
|
||||
|
||||
@@ -53,6 +53,10 @@ public:
|
||||
return dragging_;
|
||||
}
|
||||
|
||||
virtual void DeleteSelected(){};
|
||||
|
||||
QMap<TimelineMarker*, Marker*> GetActiveMarkers();
|
||||
|
||||
public slots:
|
||||
void SetTime(const rational &r);
|
||||
|
||||
@@ -62,6 +66,8 @@ public slots:
|
||||
|
||||
void updateMarkerPositions();
|
||||
|
||||
void markerSelected(Marker* marker);
|
||||
|
||||
protected:
|
||||
void SeekToScreenPoint(int screen);
|
||||
|
||||
|
||||
@@ -83,6 +83,14 @@ void TimeRuler::SetPlaybackCache(PlaybackCache *cache)
|
||||
update();
|
||||
}
|
||||
|
||||
void TimeRuler::DeleteSelected()
|
||||
{
|
||||
foreach(TimelineMarker* marker, GetActiveMarkers().keys()) {
|
||||
timeline_points()->markers()->RemoveMarker(marker);
|
||||
GetActiveMarkers().value(marker)->deleteLater();
|
||||
}
|
||||
}
|
||||
|
||||
void TimeRuler::paintEvent(QPaintEvent *)
|
||||
{
|
||||
// Nothing to paint if the timebase is invalid
|
||||
|
||||
@@ -41,6 +41,8 @@ public:
|
||||
|
||||
void SetPlaybackCache(PlaybackCache* cache);
|
||||
|
||||
virtual void DeleteSelected() override;
|
||||
|
||||
protected:
|
||||
virtual void paintEvent(QPaintEvent* e) override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user