Skip to content

Commit 868216b

Browse files
committed
Update to use markups ROI instead of annotations ROI
Annotations module will be removed in Slicer-5.3
1 parent ce4a004 commit 868216b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

ProstateAblation/ProstateAblationUtils/steps/zFrameRegistration.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ class ProstateAblationZFrameRegistrationStep(ProstateAblationStep):
275275
LayoutClass = qt.QVBoxLayout
276276

277277
def __init__(self, ProstateAblationSession):
278-
self.annotationLogic = slicer.modules.annotations.logic()
279278
self.zFrameRegistrationClass = getattr(sys.modules[__name__], self.getSetting("ZFrame_Registration_Class_Name"))
280279
self.roiObserverTag = None
281280
self.coverTemplateROI = None
@@ -315,7 +314,7 @@ def cleanup(self):
315314

316315
def onBackButtonClicked(self):
317316
self.resetZFrameRegistration()
318-
self.annotationLogic.StopPlaceMode(True)
317+
slicer.mrmlScene.GetNodeByID("vtkMRMLInteractionNodeSingleton").SwitchToViewTransformMode() # stop place mode
319318
self.removeZFrameInstructionAnnotation()
320319
if self.session.previousStep:
321320
self.session.previousStep.active = True
@@ -461,7 +460,7 @@ def addROIObserver(self):
461460
@vtk.calldata_type(vtk.VTK_OBJECT)
462461
def onNodeAdded(caller, event, calldata):
463462
node = calldata
464-
if isinstance(node, slicer.vtkMRMLAnnotationROINode):
463+
if isinstance(node, slicer.vtkMRMLMarkupsROINode):
465464
self.removeROIObserver()
466465
self.coverTemplateROI = node
467466
self.runZFrameRegistrationButton.enabled = self.isRegistrationPossible()
@@ -478,11 +477,8 @@ def removeROIObserver(self):
478477
self.roiObserverTag = slicer.mrmlScene.RemoveObserver(self.roiObserverTag)
479478

480479
def activateCreateROIMode(self):
481-
mrmlScene = self.annotationLogic.GetMRMLScene()
482-
selectionNode = mrmlScene.GetNthNodeByClass(0, "vtkMRMLSelectionNode")
483-
selectionNode.SetReferenceActivePlaceNodeClassName("vtkMRMLAnnotationROINode")
484-
# self.annotationLogic.StopPlaceMode(False) # BUG: http://na-mic.org/Mantis/view.php?id=4355
485-
self.annotationLogic.StartPlaceMode(False)
480+
slicer.mrmlScene.GetNthNodeByClass(0, "vtkMRMLSelectionNode").SetReferenceActivePlaceNodeClassName("vtkMRMLMarkupsROINode")
481+
slicer.modules.markups.logic().StartPlaceMode(False)
486482

487483
def addZFrameInstructions(self, step=1):
488484
self.removeZFrameInstructionAnnotation()
@@ -513,7 +509,7 @@ def onApplyZFrameRegistrationButtonClicked(self):
513509
zFrameTemplateVolume = self.logic.templateVolume
514510
try:
515511
if self.zFrameRegistrationClass is OpenSourceZFrameRegistration:
516-
self.annotationLogic.SetAnnotationLockedUnlocked(self.coverTemplateROI.GetID())
512+
self.coverTemplateROI.SetLocked(not self.coverTemplateROI.GetLocked())
517513
self.zFrameCroppedVolume = self.logic.createCroppedVolume(zFrameTemplateVolume, self.coverTemplateROI)
518514
self.zFrameLabelVolume = self.logic.createLabelMapFromCroppedVolume(self.zFrameCroppedVolume, "labelmap")
519515
self.zFrameMaskedVolume = self.logic.createMaskedVolume(zFrameTemplateVolume, self.zFrameLabelVolume,
@@ -557,10 +553,12 @@ def applyZFrameTransform(self):
557553
def onApproveZFrameRegistrationButtonClicked(self):
558554
self.redSliceNode.SetSliceVisible(False)
559555
if self.zFrameRegistrationClass is OpenSourceZFrameRegistration:
560-
self.annotationLogic.SetAnnotationVisibility(self.coverTemplateROI.GetID())
556+
roiDisplayNode = self.coverTemplateROI.GetDisplayNode()
557+
roiDisplayNode.SetVisibility(not roiDisplayNode.GetVisibility())
561558
self.session.approvedCoverTemplate = self.logic.templateVolume
562559

563560
def onRetryZFrameRegistrationButtonClicked(self):
564561
self.removeZFrameInstructionAnnotation()
565-
self.annotationLogic.SetAnnotationVisibility(self.coverTemplateROI.GetID())
562+
roiDisplayNode = self.coverTemplateROI.GetDisplayNode()
563+
roiDisplayNode.SetVisibility(not roiDisplayNode.GetVisibility())
566564
self.initiateZFrameRegistrationStep()

0 commit comments

Comments
 (0)