Skip to content

ENH: Allow virtual func to be called during MRML(ThreeD|Slice)View pimpl init #7325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcfr merged 2 commits into from
Oct 31, 2023
Merged

ENH: Allow virtual func to be called during MRML(ThreeD|Slice)View pimpl init #7325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34580f6
ENH: Update CTK to allow improved ctkVTK(Render|Slice)View pimpl deri…
jcfr Oct 30, 2023
368ad56
ENH: Allow virtual func to be called during MRML(ThreeD|Slice)View pi…
jcfr Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Libs/MRML/Widgets/qMRMLSliceView.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void qMRMLSliceViewPrivate::vtkInternalLightBoxRendererManagerProxy::SetLightBox

//---------------------------------------------------------------------------
qMRMLSliceViewPrivate::qMRMLSliceViewPrivate(qMRMLSliceView& object)
: q_ptr(&object)
: ctkVTKSliceViewPrivate(object)
{
this->DisplayableManagerGroup = nullptr;
this->MRMLScene = nullptr;
Expand All @@ -155,6 +155,8 @@ void qMRMLSliceViewPrivate::init()
{
Q_Q(qMRMLSliceView);

this->ctkVTKSliceViewPrivate::init();

// Highlight first RenderWindowItem
q->setHighlightedBoxColor(this->InactiveBoxColor);

Expand Down Expand Up @@ -269,8 +271,8 @@ void qMRMLSliceViewPrivate::updateWidgetFromMRML()
// qMRMLSliceView methods

// --------------------------------------------------------------------------
qMRMLSliceView::qMRMLSliceView(QWidget* _parent) : Superclass(_parent)
, d_ptr(new qMRMLSliceViewPrivate(*this))
qMRMLSliceView::qMRMLSliceView(QWidget* _parent)
: Superclass(new qMRMLSliceViewPrivate(*this), _parent)
{
Q_D(qMRMLSliceView);
d->init();
Expand Down
3 changes: 0 additions & 3 deletions Libs/MRML/Widgets/qMRMLSliceView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ public slots:
/// Set the current \a viewNode to observe
void setMRMLSliceNode(vtkMRMLSliceNode* newSliceNode);

protected:
QScopedPointer<qMRMLSliceViewPrivate> d_ptr;

private:
Q_DECLARE_PRIVATE(qMRMLSliceView);
Q_DISABLE_COPY(qMRMLSliceView);
Expand Down
7 changes: 3 additions & 4 deletions Libs/MRML/Widgets/qMRMLSliceView_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

// CTK includes
#include <ctkVTKObject.h>
#include <ctkVTKSliceView_p.h>

// qMRML includes
#include "qMRMLSliceView.h"
Expand All @@ -52,18 +53,16 @@ class vtkMRMLCameraNode;
class vtkObject;

//-----------------------------------------------------------------------------
class qMRMLSliceViewPrivate: public QObject
class qMRMLSliceViewPrivate: public ctkVTKSliceViewPrivate
{
Q_OBJECT
QVTK_OBJECT
Q_DECLARE_PUBLIC(qMRMLSliceView);
protected:
qMRMLSliceView* const q_ptr;
public:
qMRMLSliceViewPrivate(qMRMLSliceView& object);
~qMRMLSliceViewPrivate() override;

virtual void init();
void init() override;

void setMRMLScene(vtkMRMLScene* scene);

Expand Down
9 changes: 6 additions & 3 deletions Libs/MRML/Widgets/qMRMLThreeDView.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

//---------------------------------------------------------------------------
qMRMLThreeDViewPrivate::qMRMLThreeDViewPrivate(qMRMLThreeDView& object)
: q_ptr(&object)
: ctkVTKRenderViewPrivate(object)
{
this->DisplayableManagerGroup = nullptr;
this->MRMLScene = nullptr;
Expand All @@ -83,6 +83,9 @@ qMRMLThreeDViewPrivate::~qMRMLThreeDViewPrivate()
void qMRMLThreeDViewPrivate::init()
{
Q_Q(qMRMLThreeDView);

this->ctkVTKRenderViewPrivate::init();

q->setRenderEnabled(this->MRMLScene != nullptr);

vtkNew<vtkMRMLThreeDViewInteractorStyle> interactorStyle;
Expand Down Expand Up @@ -246,8 +249,8 @@ void ClickCallbackFunction (
}

// --------------------------------------------------------------------------
qMRMLThreeDView::qMRMLThreeDView(QWidget* _parent) : Superclass(_parent)
, d_ptr(new qMRMLThreeDViewPrivate(*this))
qMRMLThreeDView::qMRMLThreeDView(QWidget* _parent)
: Superclass(new qMRMLThreeDViewPrivate(*this), _parent)
{
Q_D(qMRMLThreeDView);
d->init();
Expand Down
3 changes: 0 additions & 3 deletions Libs/MRML/Widgets/qMRMLThreeDView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ public slots:
/// account when computing the boundaries
virtual void resetFocalPoint();

protected:
QScopedPointer<qMRMLThreeDViewPrivate> d_ptr;

private:
Q_DECLARE_PRIVATE(qMRMLThreeDView);
Q_DISABLE_COPY(qMRMLThreeDView);
Expand Down
7 changes: 3 additions & 4 deletions Libs/MRML/Widgets/qMRMLThreeDView_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
//

// CTK includes
#include <ctkVTKRenderView_p.h>
#include <ctkPimpl.h>
#include <ctkVTKObject.h>

Expand All @@ -45,18 +46,16 @@ class vtkMRMLCameraNode;
class vtkObject;

//-----------------------------------------------------------------------------
class qMRMLThreeDViewPrivate: public QObject
class qMRMLThreeDViewPrivate: public ctkVTKRenderViewPrivate
{
Q_OBJECT
QVTK_OBJECT
Q_DECLARE_PUBLIC(qMRMLThreeDView);
protected:
qMRMLThreeDView* const q_ptr;
public:
qMRMLThreeDViewPrivate(qMRMLThreeDView& object);
~qMRMLThreeDViewPrivate() override;

virtual void init();
void init() override;

void setMRMLScene(vtkMRMLScene* scene);

Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_CTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if(NOT DEFINED CTK_DIR AND NOT Slicer_USE_SYSTEM_${proj})

ExternalProject_SetIfNotDefined(
Slicer_${proj}_GIT_TAG
"4888deb1d7f2e72b5458182da1a54369e5e52887"
"f53820a4e6ebfc9649897577a6157d94833e9699"
QUIET
)

Expand Down