refactored so sequence is again a derivative of viewer
This commit is contained in:
@@ -68,12 +68,12 @@ const int64_t &TimeBasedWidget::GetTimestamp() const
|
||||
return ruler_->GetTime();
|
||||
}
|
||||
|
||||
Sequence *TimeBasedWidget::GetConnectedNode() const
|
||||
ViewerOutput *TimeBasedWidget::GetConnectedNode() const
|
||||
{
|
||||
return viewer_node_;
|
||||
}
|
||||
|
||||
void TimeBasedWidget::ConnectViewerNode(Sequence *node)
|
||||
void TimeBasedWidget::ConnectViewerNode(ViewerOutput *node)
|
||||
{
|
||||
if (viewer_node_ == node) {
|
||||
return;
|
||||
@@ -101,7 +101,7 @@ void TimeBasedWidget::ConnectViewerNode(Sequence *node)
|
||||
if (viewer_node_) {
|
||||
connect(viewer_node_, &ViewerOutput::LengthChanged, this, &TimeBasedWidget::UpdateMaximumScroll);
|
||||
|
||||
if ((points_ = ConnectTimelinePoints())) {
|
||||
if ((points_ = GetTimelinePointsToConnect())) {
|
||||
ruler()->ConnectTimelinePoints(points_);
|
||||
scrollbar_->ConnectTimelinePoints(points_);
|
||||
}
|
||||
@@ -242,9 +242,15 @@ void TimeBasedWidget::resizeEvent(QResizeEvent *event)
|
||||
UpdateMaximumScroll();
|
||||
}
|
||||
|
||||
TimelinePoints *TimeBasedWidget::ConnectTimelinePoints()
|
||||
TimelinePoints *TimeBasedWidget::GetTimelinePointsToConnect()
|
||||
{
|
||||
return viewer_node_->timeline_points();
|
||||
Sequence* sequence = dynamic_cast<Sequence*>(viewer_node_);
|
||||
|
||||
if (sequence) {
|
||||
return sequence->timeline_points();
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Project *TimeBasedWidget::GetTimelinePointsProject()
|
||||
|
||||
@@ -46,9 +46,11 @@ public:
|
||||
|
||||
void ZoomOut();
|
||||
|
||||
Sequence* GetConnectedNode() const;
|
||||
ViewerOutput* GetConnectedNode() const;
|
||||
|
||||
void ConnectViewerNode(Sequence *node);
|
||||
TimelinePoints* GetConnectedTimelinePoints() const;
|
||||
|
||||
void ConnectViewerNode(ViewerOutput *node);
|
||||
|
||||
void SetScaleAndCenterOnPlayhead(const double& scale);
|
||||
|
||||
@@ -105,22 +107,20 @@ protected:
|
||||
|
||||
virtual void ScaleChangedEvent(const double &) override;
|
||||
|
||||
virtual void ConnectedNodeChanged(Sequence*){}
|
||||
virtual void ConnectedNodeChanged(ViewerOutput*){}
|
||||
|
||||
virtual void ConnectNodeInternal(Sequence*){}
|
||||
virtual void ConnectNodeInternal(ViewerOutput*){}
|
||||
|
||||
virtual void DisconnectNodeInternal(Sequence*){}
|
||||
virtual void DisconnectNodeInternal(ViewerOutput*){}
|
||||
|
||||
void SetAutoMaxScrollBar(bool e);
|
||||
|
||||
virtual void resizeEvent(QResizeEvent *event) override;
|
||||
|
||||
virtual TimelinePoints* ConnectTimelinePoints();
|
||||
virtual TimelinePoints* GetTimelinePointsToConnect();
|
||||
|
||||
virtual Project* GetTimelinePointsProject();
|
||||
|
||||
TimelinePoints* GetConnectedTimelinePoints() const;
|
||||
|
||||
void ConnectTimelineView(TimeBasedView* base, bool connect_time_change_event = true);
|
||||
|
||||
void PassWheelEventsToScrollBar(QObject* object);
|
||||
@@ -189,7 +189,7 @@ private:
|
||||
|
||||
bool UserIsDraggingPlayhead() const;
|
||||
|
||||
Sequence* viewer_node_;
|
||||
ViewerOutput* viewer_node_;
|
||||
|
||||
TimeRuler* ruler_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user