diff --git a/GUIWidgets/qSlicerGUIWidgetsModuleWidget.cxx b/GUIWidgets/qSlicerGUIWidgetsModuleWidget.cxx
index c07a6ca..4dfd3b0 100644
--- a/GUIWidgets/qSlicerGUIWidgetsModuleWidget.cxx
+++ b/GUIWidgets/qSlicerGUIWidgetsModuleWidget.cxx
@@ -153,8 +153,7 @@ void qSlicerGUIWidgetsModuleWidget::setWidgetToGUIWidgetMarkupsNode(vtkMRMLGUIWi
QWidget* qSlicerGUIWidgetsModuleWidget::onAddHelloWorldNodeClicked()
{
qSlicerApplication* app = qSlicerApplication::application();
- vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(
- app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
+ vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
widgetNode->SetName("TestButtonWidgetNode");
QPushButton* newButton = new QPushButton("Hello world!");
@@ -188,8 +187,7 @@ void qSlicerGUIWidgetsModuleWidget::onAddHomeWidgetButtonClicked()
Q_D(qSlicerGUIWidgetsModuleWidget);
qSlicerApplication* app = qSlicerApplication::application();
- vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(
- app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
+ vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
widgetNode->SetName("HomeWidgetNode");
qMRMLVirtualRealityHomeWidget* widget = new qMRMLVirtualRealityHomeWidget();
@@ -203,8 +201,7 @@ void qSlicerGUIWidgetsModuleWidget::onAddDataModuleWidgetButtonClicked()
Q_D(qSlicerGUIWidgetsModuleWidget);
qSlicerApplication* app = qSlicerApplication::application();
- vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(
- app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
+ vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
widgetNode->SetName("DataModuleWidgetNode");
qMRMLVirtualRealityDataModuleWidget* widget = new qMRMLVirtualRealityDataModuleWidget();
@@ -218,8 +215,7 @@ void qSlicerGUIWidgetsModuleWidget::onAddSegmentEditorWidgetButtonClicked()
Q_D(qSlicerGUIWidgetsModuleWidget);
qSlicerApplication* app = qSlicerApplication::application();
- vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(
- app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
+ vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
widgetNode->SetName("SegmentEditorWidgetNode");
qMRMLVirtualRealitySegmentEditorWidget* widget = new qMRMLVirtualRealitySegmentEditorWidget();
@@ -233,12 +229,10 @@ void qSlicerGUIWidgetsModuleWidget::onAddTransformWidgetButtonClicked()
Q_D(qSlicerGUIWidgetsModuleWidget);
qSlicerApplication* app = qSlicerApplication::application();
- vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(
- app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
+ vtkMRMLGUIWidgetNode* widgetNode = vtkMRMLGUIWidgetNode::SafeDownCast(app->mrmlScene()->AddNewNodeByClass("vtkMRMLGUIWidgetNode") );
widgetNode->SetName("TransformWidgetNode");
- vtkSlicerVirtualRealityLogic* vrLogic =
- vtkSlicerVirtualRealityLogic::SafeDownCast(app->applicationLogic()->GetModuleLogic("VirtualReality"));
+ vtkSlicerVirtualRealityLogic* vrLogic = vtkSlicerVirtualRealityLogic::SafeDownCast(app->applicationLogic()->GetModuleLogic("VirtualReality"));
if (!vrLogic)
{
qCritical() << Q_FUNC_INFO << " : invalid VR logic";
@@ -253,7 +247,7 @@ void qSlicerGUIWidgetsModuleWidget::onAddTransformWidgetButtonClicked()
//-----------------------------------------------------------------------------
void qSlicerGUIWidgetsModuleWidget::onSetUpInteractionButtonClicked()
{
- std::cout << "----- onSetUpInteractionButtonClicked ----- \n";
+ qCritical() << "----- onSetUpInteractionButtonClicked (no-op) ----- \n";
}
//-----------------------------------------------------------------------------
diff --git a/PointerSimulator/PointerSimulator.py b/PointerSimulator/PointerSimulator.py
index a272176..1217d44 100644
--- a/PointerSimulator/PointerSimulator.py
+++ b/PointerSimulator/PointerSimulator.py
@@ -248,7 +248,7 @@ def updatePointerModel(self, origin, direction, length):
self.pointerModel.SetPolyDataConnection(tubeFilter.GetOutputPort())
slicer.mrmlScene.AddNode(self.pointerModel)
self.pointerModelDisplay = slicer.vtkMRMLModelDisplayNode()
- self.pointerModelDisplay.SetSliceIntersectionVisibility(True)
+ self.pointerModelDisplay.SetVisibility2D(True)
self.pointerModelDisplay.SetColor(1,0,0)
self.pointerModelDisplay.SetOpacity(1.0)
slicer.mrmlScene.AddNode(self.pointerModelDisplay)
diff --git a/PointerSimulator/Resources/UI/PointerSimulator.ui b/PointerSimulator/Resources/UI/PointerSimulator.ui
index 5c2b2b5..03fde13 100644
--- a/PointerSimulator/Resources/UI/PointerSimulator.ui
+++ b/PointerSimulator/Resources/UI/PointerSimulator.ui
@@ -6,7 +6,7 @@
0
0
- 315
+ 430
556
@@ -18,27 +18,25 @@
-
-
+
+
+ Set up pointer
+
+
-
-
-
- Click
+
+
+ Rotation
+
+
+ qMRMLTransformSliders::ROTATION
-
-
-
-
-
- Click
-
-
- true
-
-
-
-
+ -
+
+
@@ -75,12 +73,6 @@
1
-
- ctkCollapsibleGroupBox
- QGroupBox
-
- 1
-