Skip to content

Commit

Permalink
COMP: Fix build after merging GUI widget interaction branch
Browse files Browse the repository at this point in the history
  • Loading branch information
cpinter committed Aug 22, 2023
1 parent 9c60402 commit ab3bfb9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
5 changes: 0 additions & 5 deletions VirtualReality/MRML/vtkVirtualRealityViewInteractorStyle.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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 <vtkCamera.h>
Expand Down
7 changes: 4 additions & 3 deletions VirtualReality/Widgets/qMRMLVirtualRealityHomeWidget.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -286,6 +287,7 @@ void qMRMLVirtualRealityHomeWidget::onMagnification100xPressed()
}

//-----------------------------------------------------------------------------
//TODO: This member function won't work unless qSlicerVirtualRealityModule and qMRMLVirtualRealityView are included
/*
void qMRMLVirtualRealityHomeWidget::updateViewFromReferenceViewCamera()
{
Expand All @@ -305,7 +307,6 @@ void qMRMLVirtualRealityHomeWidget::updateViewFromReferenceViewCamera()
vrView->updateViewFromReferenceViewCamera();
}
*/
//TODO: This member function won't work unless qSlicerVirtualRealityModule and qMRMLVirtualRealityView are included

//-----------------------------------------------------------------------------
/*
Expand Down
5 changes: 2 additions & 3 deletions VirtualReality/Widgets/qMRMLVirtualRealityView.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ qMRMLVirtualRealityViewPrivate::qMRMLVirtualRealityViewPrivate(qMRMLVirtualReali
, HomeWidget(nullptr)
{
this->MRMLVirtualRealityViewNode = nullptr;
this->HomeWidget = new qMRMLVirtualRealityHomeWidget(q_ptr);
this->DataModuleWidget = new qMRMLVirtualRealityDataModuleWidget;
}

//---------------------------------------------------------------------------
Expand All @@ -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*)));
}

//----------------------------------------------------------------------------
Expand Down

0 comments on commit ab3bfb9

Please sign in to comment.