Skip to content
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

Update to use markups ROI instead of annotations ROI #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to use markups ROI instead of annotations ROI #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions ProstateAblation/ProstateAblationUtils/steps/zFrameRegistration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ class ProstateAblationZFrameRegistrationStep(ProstateAblationStep):
LayoutClass = qt.QVBoxLayout

def __init__(self, ProstateAblationSession):
self.annotationLogic = slicer.modules.annotations.logic()
self.zFrameRegistrationClass = getattr(sys.modules[__name__], self.getSetting("ZFrame_Registration_Class_Name"))
self.roiObserverTag = None
self.coverTemplateROI = None
Expand Down Expand Up @@ -315,7 +314,7 @@ def cleanup(self):

def onBackButtonClicked(self):
self.resetZFrameRegistration()
self.annotationLogic.StopPlaceMode(True)
slicer.mrmlScene.GetNodeByID("vtkMRMLInteractionNodeSingleton").SwitchToViewTransformMode() # stop place mode
self.removeZFrameInstructionAnnotation()
if self.session.previousStep:
self.session.previousStep.active = True
Expand Down Expand Up @@ -461,7 +460,7 @@ def addROIObserver(self):
@vtk.calldata_type(vtk.VTK_OBJECT)
def onNodeAdded(caller, event, calldata):
node = calldata
if isinstance(node, slicer.vtkMRMLAnnotationROINode):
if isinstance(node, slicer.vtkMRMLMarkupsROINode):
self.removeROIObserver()
self.coverTemplateROI = node
self.runZFrameRegistrationButton.enabled = self.isRegistrationPossible()
Expand All @@ -478,11 +477,8 @@ def removeROIObserver(self):
self.roiObserverTag = slicer.mrmlScene.RemoveObserver(self.roiObserverTag)

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

def addZFrameInstructions(self, step=1):
self.removeZFrameInstructionAnnotation()
Expand Down Expand Up @@ -513,7 +509,7 @@ def onApplyZFrameRegistrationButtonClicked(self):
zFrameTemplateVolume = self.logic.templateVolume
try:
if self.zFrameRegistrationClass is OpenSourceZFrameRegistration:
self.annotationLogic.SetAnnotationLockedUnlocked(self.coverTemplateROI.GetID())
self.coverTemplateROI.SetLocked(not self.coverTemplateROI.GetLocked())
self.zFrameCroppedVolume = self.logic.createCroppedVolume(zFrameTemplateVolume, self.coverTemplateROI)
self.zFrameLabelVolume = self.logic.createLabelMapFromCroppedVolume(self.zFrameCroppedVolume, "labelmap")
self.zFrameMaskedVolume = self.logic.createMaskedVolume(zFrameTemplateVolume, self.zFrameLabelVolume,
Expand Down Expand Up @@ -557,10 +553,12 @@ def applyZFrameTransform(self):
def onApproveZFrameRegistrationButtonClicked(self):
self.redSliceNode.SetSliceVisible(False)
if self.zFrameRegistrationClass is OpenSourceZFrameRegistration:
self.annotationLogic.SetAnnotationVisibility(self.coverTemplateROI.GetID())
roiDisplayNode = self.coverTemplateROI.GetDisplayNode()
roiDisplayNode.SetVisibility(not roiDisplayNode.GetVisibility())
self.session.approvedCoverTemplate = self.logic.templateVolume

def onRetryZFrameRegistrationButtonClicked(self):
self.removeZFrameInstructionAnnotation()
self.annotationLogic.SetAnnotationVisibility(self.coverTemplateROI.GetID())
roiDisplayNode = self.coverTemplateROI.GetDisplayNode()
roiDisplayNode.SetVisibility(not roiDisplayNode.GetVisibility())
self.initiateZFrameRegistrationStep()