From b96fd7ae454b081743b5a183ee6f01171581fda6 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 16 Dec 2019 03:02:28 +1100 Subject: [PATCH] allowed access to the viewer node from the viewer widgets --- app/panel/viewer/viewer.cpp | 5 +++++ app/panel/viewer/viewer.h | 2 ++ app/widget/viewer/viewer.cpp | 5 +++++ app/widget/viewer/viewer.h | 2 ++ 4 files changed, 14 insertions(+) diff --git a/app/panel/viewer/viewer.cpp b/app/panel/viewer/viewer.cpp index f18893298..471ef78fa 100644 --- a/app/panel/viewer/viewer.cpp +++ b/app/panel/viewer/viewer.cpp @@ -107,6 +107,11 @@ rational ViewerPanel::GetTime() return viewer_->GetTime(); } +ViewerOutput *ViewerPanel::GetConnectedViewer() const +{ + return viewer_->GetConnectedViewer(); +} + void ViewerPanel::SetTime(const int64_t ×tamp) { viewer_->SetTime(timestamp); diff --git a/app/panel/viewer/viewer.h b/app/panel/viewer/viewer.h index 1d4b79678..322f3608c 100644 --- a/app/panel/viewer/viewer.h +++ b/app/panel/viewer/viewer.h @@ -62,6 +62,8 @@ public: rational GetTime(); + ViewerOutput* GetConnectedViewer() const; + public slots: void SetTime(const int64_t& timestamp); diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index 58c58f1cd..c7956f88d 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -166,6 +166,11 @@ void ViewerWidget::DisconnectViewerNode() ConnectViewerNode(nullptr); } +ViewerOutput *ViewerWidget::GetConnectedViewer() const +{ + return viewer_node_; +} + void ViewerWidget::SetTexture(OpenGLTexturePtr tex) { if (tex == nullptr) { diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h index 21aa699aa..d00bf4034 100644 --- a/app/widget/viewer/viewer.h +++ b/app/widget/viewer/viewer.h @@ -67,6 +67,8 @@ public: void DisconnectViewerNode(); + ViewerOutput* GetConnectedViewer() const; + public slots: /** * @brief Set the texture to draw and draw it