From 5fb1b823aca2623360e15b61792366ec83c20258 Mon Sep 17 00:00:00 2001 From: Csaba Pinter Date: Mon, 12 Jun 2023 10:49:30 +0100 Subject: [PATCH] COMP: Fix build after merging GUI widget interaction branch Re KitwareMedical#43 --- .../MRML/vtkVirtualRealityViewInteractorStyle.cxx | 5 ----- VirtualReality/Widgets/qMRMLVirtualRealityHomeWidget.cxx | 7 ++++--- VirtualReality/Widgets/qMRMLVirtualRealityView.cxx | 5 ++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/VirtualReality/MRML/vtkVirtualRealityViewInteractorStyle.cxx b/VirtualReality/MRML/vtkVirtualRealityViewInteractorStyle.cxx index d704057..cb1191b 100644 --- a/VirtualReality/MRML/vtkVirtualRealityViewInteractorStyle.cxx +++ b/VirtualReality/MRML/vtkVirtualRealityViewInteractorStyle.cxx @@ -29,13 +29,8 @@ #include "vtkMRMLDisplayNode.h" #include "vtkMRMLInteractionEventData.h" #include "vtkMRMLLinearTransformNode.h" -#include "vtkMRMLInteractionEventData.h" #include "vtkMRMLModelDisplayableManager.h" #include "vtkMRMLScene.h" -#include "vtkMRMLSegmentationNode.h" -#include "vtkMRMLSegmentationDisplayNode.h" -#include "vtkMRMLVolumeNode.h" -#include "vtkMRMLVolumeRenderingDisplayNode.h" // VTK includes #include diff --git a/VirtualReality/Widgets/qMRMLVirtualRealityHomeWidget.cxx b/VirtualReality/Widgets/qMRMLVirtualRealityHomeWidget.cxx index a3704ce..149770c 100644 --- a/VirtualReality/Widgets/qMRMLVirtualRealityHomeWidget.cxx +++ b/VirtualReality/Widgets/qMRMLVirtualRealityHomeWidget.cxx @@ -92,10 +92,11 @@ void qMRMLVirtualRealityHomeWidgetPrivate::init() QObject::connect(this->Magnification1xButton, SIGNAL(clicked()), q, SLOT(onMagnification1xPressed())); QObject::connect(this->Magnification10xButton, SIGNAL(clicked()), q, SLOT(onMagnification10xPressed())); QObject::connect(this->Magnification100xButton, SIGNAL(clicked()), q, SLOT(onMagnification100xPressed())); - QObject::connect(this->SyncViewToReferenceViewButton, SIGNAL(clicked()), q, SLOT(updateViewFromReferenceViewCamera())); + //TODO: Slot commented out, do not connect + //QObject::connect(this->SyncViewToReferenceViewButton, SIGNAL(clicked()), q, SLOT(updateViewFromReferenceViewCamera())); - //QObject::connect(this->LockMagnificationCheckBox, SIGNAL(toggled(bool)), q, SLOT(setMagnificationLock(bool))); //TODO: Magnification lock of view node not implemented yet + //QObject::connect(this->LockMagnificationCheckBox, SIGNAL(toggled(bool)), q, SLOT(setMagnificationLock(bool))); // Hide module widget frame. It appears with the module when a module button is clicked this->ModuleWidgetFrame->setVisible(false); @@ -286,6 +287,7 @@ void qMRMLVirtualRealityHomeWidget::onMagnification100xPressed() } //----------------------------------------------------------------------------- +//TODO: This member function won't work unless qSlicerVirtualRealityModule and qMRMLVirtualRealityView are included /* void qMRMLVirtualRealityHomeWidget::updateViewFromReferenceViewCamera() { @@ -305,7 +307,6 @@ void qMRMLVirtualRealityHomeWidget::updateViewFromReferenceViewCamera() vrView->updateViewFromReferenceViewCamera(); } */ -//TODO: This member function won't work unless qSlicerVirtualRealityModule and qMRMLVirtualRealityView are included //----------------------------------------------------------------------------- /* diff --git a/VirtualReality/Widgets/qMRMLVirtualRealityView.cxx b/VirtualReality/Widgets/qMRMLVirtualRealityView.cxx index 6006722..294aadc 100644 --- a/VirtualReality/Widgets/qMRMLVirtualRealityView.cxx +++ b/VirtualReality/Widgets/qMRMLVirtualRealityView.cxx @@ -112,8 +112,6 @@ qMRMLVirtualRealityViewPrivate::qMRMLVirtualRealityViewPrivate(qMRMLVirtualReali , HomeWidget(nullptr) { this->MRMLVirtualRealityViewNode = nullptr; - this->HomeWidget = new qMRMLVirtualRealityHomeWidget(q_ptr); - this->DataModuleWidget = new qMRMLVirtualRealityDataModuleWidget; } //--------------------------------------------------------------------------- @@ -128,7 +126,8 @@ void qMRMLVirtualRealityViewPrivate::init() // Setup VR home widget this->HomeWidget = new qMRMLVirtualRealityHomeWidget(q_ptr); - QObject::connect(this, SIGNAL(mrmlSceneChanged(vtkMRMLScene*)), this->HomeWidget, SLOT(setMRMLScene(vtkMRMLScene*))); + //TODO: This signal does not exist + //QObject::connect(this, SIGNAL(mrmlSceneChanged(vtkMRMLScene*)), this->HomeWidget, SLOT(setMRMLScene(vtkMRMLScene*))); } //----------------------------------------------------------------------------