Skip to content

Commit

Permalink
Observe PointModifiedEvent instead of ModifiedEvent for the Markup no…
Browse files Browse the repository at this point in the history
  • Loading branch information
tokjun committed Oct 14, 2020
1 parent 8c71b3b commit fad9658
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions SlicerDevelopmentToolboxUtils/mixins.py
Expand Up @@ -371,7 +371,7 @@ def removeViewNodeIDs(node, sliceNodes):
@staticmethod
def jumpSliceNodeToTarget(sliceNode, targetNode, index):
point = [0,0,0,0]
targetNode.GetMarkupPointWorld(index, 0, point)
targetNode.GetNthFiducialWorldCoordinates(index, point);
sliceNode.JumpSlice(point[0], point[1], point[2])

@staticmethod
Expand Down Expand Up @@ -808,7 +808,7 @@ def setNodeVisibility(node, visible):
def setNodeSliceIntersectionVisibility(node, visible):
displayNode = node.GetDisplayNode()
if displayNode is not None:
displayNode.SetSliceIntersectionVisibility(visible)
displayNode.SetVisibility2D(visible)

@staticmethod
def isVolumeExtentValid(volume):
Expand Down
5 changes: 3 additions & 2 deletions SlicerDevelopmentToolboxUtils/widgets.py
Expand Up @@ -311,6 +311,7 @@ def _onFiducialListSelected(self, node):
self.currentNode = node

def _createNewFiducialNode(self, name=None):
print("_createNewFiducialNode(self, name=None):")
markupsLogic = slicer.modules.markups.logic()
self.currentNode = slicer.mrmlScene.GetNodeByID(markupsLogic.AddNewFiducialNode())
self.currentNode.SetName(name if name else self.currentNode.GetName())
Expand All @@ -327,7 +328,7 @@ def _removeTargetListObservers(self):
def _addTargetListObservers(self):
self._removeTargetListObservers()
if self.currentNode:
self._modifiedEventObserverTag = self.currentNode.AddObserver(vtk.vtkCommand.ModifiedEvent, self._onFiducialsUpdated)
self._modifiedEventObserverTag = self.currentNode.AddObserver(slicer.vtkMRMLMarkupsNode.PointModifiedEvent, self._onFiducialsUpdated)

def _updateButtons(self):
if not self.currentNode or self.currentNode.GetNumberOfFiducials() == 0:
Expand Down Expand Up @@ -371,7 +372,7 @@ def _handleDeleteButtonClicked(self, idx):
self.currentNode.RemoveMarkup(idx)

def _onFiducialsUpdated(self, caller, event):
if caller.IsA("vtkMRMLMarkupsFiducialNode") and event == "ModifiedEvent":
if caller.IsA("vtkMRMLMarkupsFiducialNode"):
self._updateTable()
self._updateButtons()
self.invokeEvent(vtk.vtkCommand.ModifiedEvent)
Expand Down

0 comments on commit fad9658

Please sign in to comment.