Merge pull request #431 from rmatsuda/fix_arrows_markers_id

Fix arrows markers

Merge pull request #431 from rmatsuda/fix_arrows_markers_id
Fix arrows markers
Victor Hugo Souza · GitHub
2 parents f8b595d9 240dd373
Showing 2 changed files with 62 additions and 61 deletions Show diff stats
invesalius/data/viewer_volume.py
invesalius/gui/task_navigator.py
@@ -281,7 +281,6 @@ class Viewer(wx.Panel):
         # Related to marker creation in navigation tools
         Publisher.subscribe(self.AddMarker, 'Add marker')
-        Publisher.subscribe(self.AddMarkerwithOrientation, 'Add arrow marker')
         Publisher.subscribe(self.HideAllMarkers, 'Hide all markers')
         Publisher.subscribe(self.ShowAllMarkers, 'Show all markers')
         Publisher.subscribe(self.RemoveAllMarkers, 'Remove all markers')
@@ -616,7 +615,7 @@ class Viewer(wx.Panel):
             target = marker["target"]
             self.AddMarker(
-                ball_id=ball_id,
+                marker_id=ball_id,
                 size=size,
                 colour=colour,
                 coord=position,
@@ -631,49 +630,28 @@ class Viewer(wx.Panel):
         self.UpdateRender()
-    def AddMarkerwithOrientation(self, arrow_id, size, color, coord):
-        """
-        Markers arrow with orientation created by navigation tools and rendered in volume viewer.
-        """
-        self.arrow_marker_id = arrow_id
-        coord_flip = list(coord)
-        coord_flip[1] = -coord_flip[1]
-
-        arrow_actor = self.Add_ObjectArrow(coord_flip[:3], coord_flip[3:6], color, size)
-        self.static_markers.append(arrow_actor)
-        self.ren.AddActor(self.static_markers[self.arrow_marker_id])
-        self.arrow_marker_id += 1
-
-        self.Refresh()
-
-    def AddMarker(self, ball_id, size, colour, coord):
+    def AddMarker(self, marker_id, size, colour, coord, arrow_flag):
         """
         Markers created by navigation tools and rendered in volume viewer.
         """
-        self.ball_id = ball_id
+        self.marker_id = marker_id
         coord_flip = list(coord)
         coord_flip[1] = -coord_flip[1]
-        ball_ref = vtk.vtkSphereSource()
-        ball_ref.SetRadius(size)
-        ball_ref.SetCenter(coord_flip)
-
-        mapper = vtk.vtkPolyDataMapper()
-        mapper.SetInputConnection(ball_ref.GetOutputPort())
-
-        prop = vtk.vtkProperty()
-        prop.SetColor(colour)
-
-        # adding a new actor for the present ball
-        self.static_markers.append(vtk.vtkActor())
+        if arrow_flag:
+            """
+            Markers arrow with orientation created by navigation tools and rendered in volume viewer.
+            """
+            marker_actor = self.CreateActorArrow(coord_flip[:3], coord_flip[3:6], colour, const.ARROW_MARKER_SIZE)
+        else:
+            marker_actor = self.CreateActorBall(coord_flip[:3], colour, size)
-        self.static_markers[self.ball_id].SetMapper(mapper)
-        self.static_markers[self.ball_id].SetProperty(prop)
+        # adding a new actor for the marker
+        self.static_markers.append(marker_actor)
-        self.ren.AddActor(self.static_markers[self.ball_id])
-        self.ball_id += 1
+        self.ren.AddActor(self.static_markers[self.marker_id])
+        self.marker_id += 1
-        #self.UpdateRender()
         self.Refresh()
     def add_marker(self, coord, color):
@@ -726,7 +704,7 @@ class Viewer(wx.Panel):
         for i in reversed(index):
             self.ren.RemoveActor(self.static_markers[i])
             del self.static_markers[i]
-            self.ball_id = self.ball_id - 1
+            self.marker_id = self.marker_id - 1
         self.UpdateRender()
     def BlinkMarker(self, index):
@@ -1383,8 +1361,8 @@ class Viewer(wx.Panel):
         self.y_actor = self.add_line([0., 0., 0.], [0., 1., 0.], color=[.0, 1.0, .0])
         self.z_actor = self.add_line([0., 0., 0.], [0., 0., 1.], color=[1.0, .0, .0])
-        self.obj_projection_arrow_actor = self.Add_ObjectArrow([0., 0., 0.], [0., 0., 0.], vtk_colors.GetColor3d('Red'),
-                                                               8)
+        self.obj_projection_arrow_actor = self.CreateActorArrow([0., 0., 0.], [0., 0., 0.], vtk_colors.GetColor3d('Red'),
+                                                                8)
         self.object_orientation_torus_actor = self.Add_Torus([0., 0., 0.], [0., 0., 0.],
                                                              vtk_colors.GetColor3d('Red'))
@@ -1449,9 +1427,24 @@ class Viewer(wx.Panel):
         return torusActor
-    def Add_ObjectArrow(self, direction, orientation, color=[0.0, 0.0, 1.0], size=2):
-        vtk_colors = vtk.vtkNamedColors()
+    def CreateActorBall(self, coord_flip, colour=[0.0, 0.0, 1.0], size=2):
+        ball_ref = vtk.vtkSphereSource()
+        ball_ref.SetRadius(size)
+        ball_ref.SetCenter(coord_flip)
+
+        mapper = vtk.vtkPolyDataMapper()
+        mapper.SetInputConnection(ball_ref.GetOutputPort())
+
+        prop = vtk.vtkProperty()
+        prop.SetColor(colour)
+        actor = vtk.vtkActor()
+        actor.SetMapper(mapper)
+        actor.SetProperty(prop)
+
+        return actor
+
+    def CreateActorArrow(self, direction, orientation, colour=[0.0, 0.0, 1.0], size=const.ARROW_MARKER_SIZE):
         arrow = vtk.vtkArrowSource()
         arrow.SetTipResolution(40)
         arrow.SetShaftResolution(40)
@@ -1464,7 +1457,7 @@ class Viewer(wx.Panel):
         actor = vtk.vtkActor()
         actor.SetMapper(mapper)
-        actor.GetProperty().SetColor(color)
+        actor.GetProperty().SetColor(colour)
         actor.GetProperty().SetLineWidth(5)
         actor.AddPosition(0, 0, 0)
         actor.SetScale(size)
@@ -172,13 +172,16 @@ class InnerFoldPanel(wx.Panel):
         fold_panel = fpb.FoldPanelBar(self, -1, wx.DefaultPosition,
                                       (10, 330), 0, fpb.FPB_SINGLE_FOLD)
-        # Initialize Tracker and PedalConnection objects here so that they are available to several panels.
+        # Initialize Navigation, Tracker and PedalConnection objects here so that they are available to several panels.
         #
         tracker = Tracker()
         pedal_connection = PedalConnection() if HAS_PEDAL_CONNECTION else None
         neuronavigation_api = NeuronavigationApi()
-
+        navigation = Navigation(
+            pedal_connection=pedal_connection,
+            neuronavigation_api=neuronavigation_api,
+        )
         # Fold panel style
         style = fpb.CaptionBarStyle()
         style.SetCaptionStyle(fpb.CAPTIONBAR_GRADIENT_V)
@@ -189,6 +192,7 @@ class InnerFoldPanel(wx.Panel):
         item = fold_panel.AddFoldPanel(_("Neuronavigation"), collapsed=True)
         ntw = NeuronavigationPanel(
             parent=item,
+            navigation=navigation,
             tracker=tracker,
             pedal_connection=pedal_connection,
             neuronavigation_api=neuronavigation_api,
@@ -209,7 +213,7 @@ class InnerFoldPanel(wx.Panel):
         # Fold 3 - Markers panel
         item = fold_panel.AddFoldPanel(_("Markers"), collapsed=True)
-        mtw = MarkersPanel(item, tracker)
+        mtw = MarkersPanel(item, navigation, tracker)
         fold_panel.ApplyCaptionStyle(item, style)
         fold_panel.AddFoldPanelWindow(item, mtw, spacing= 0,
@@ -348,7 +352,7 @@ class InnerFoldPanel(wx.Panel):
 class NeuronavigationPanel(wx.Panel):
-    def __init__(self, parent, tracker, pedal_connection, neuronavigation_api):
+    def __init__(self, parent, navigation, tracker, pedal_connection, neuronavigation_api):
         wx.Panel.__init__(self, parent)
         try:
             default_colour = wx.SystemSettings.GetColour(wx.SYS_COLOUR_MENUBAR)
@@ -364,10 +368,7 @@ class NeuronavigationPanel(wx.Panel):
         self.pedal_connection = pedal_connection
         self.neuronavigation_api = neuronavigation_api
-        self.navigation = Navigation(
-            pedal_connection=pedal_connection,
-            neuronavigation_api=neuronavigation_api,
-        )
+        self.navigation = navigation
         self.icp = ICP()
         self.tracker = tracker
         self.robot = Robot(tracker)
@@ -1260,7 +1261,7 @@ class MarkersPanel(wx.Panel):
         def robot_target_matrix(self, new_m_robot_target):
             self.m_robot_target = new_m_robot_target
-    def __init__(self, parent, tracker):
+    def __init__(self, parent, navigation, tracker):
         wx.Panel.__init__(self, parent)
         try:
             default_colour = wx.SystemSettings.GetColour(wx.SYS_COLOUR_MENUBAR)
@@ -1270,6 +1271,7 @@ class MarkersPanel(wx.Panel):
         self.SetAutoLayout(1)
+        self.navigation = navigation
         self.tracker = tracker
         self.__bind_events()
@@ -1455,11 +1457,13 @@ class MarkersPanel(wx.Panel):
     def UpdateCurrentCoord(self, position):
         self.current_coord = list(position)
+        if not self.navigation.track_obj:
+            self.current_coord[3:] = None, None, None
     def UpdateNavigationStatus(self, nav_status, vis_status):
         if not nav_status:
-            self.current_coord = [None, None, None]
             self.nav_status = False
+            self.current_coord[3:] = None, None, None
         else:
             self.nav_status = True
@@ -1483,6 +1487,11 @@ class MarkersPanel(wx.Panel):
         send_target_to_robot = menu_id.Append(3, _('Send target to robot'))
         menu_id.Bind(wx.EVT_MENU, self.OnMenuSendTargetToRobot, send_target_to_robot)
+        if all([elem is not None for elem in self.markers[self.lc.GetFocusedItem()].coord[3:]]):
+            target_menu.Enable(True)
+        else:
+            target_menu.Enable(False)
+
         # Enable "Send target to robot" button only if tracker is robot, if navigation is on and if target is not none
         m_target_robot = np.array([self.robot_markers[self.lc.GetFocusedItem()].robot_target_matrix])
         if self.tracker.tracker_id == const.ROBOT and self.nav_status and m_target_robot.any():
@@ -1493,7 +1502,6 @@ class MarkersPanel(wx.Panel):
         # target_menu_rem = menu_id.Append(3, _('Remove target'))
         # menu_id.Bind(wx.EVT_MENU, self.OnMenuRemoveTarget, target_menu_rem)
-        target_menu.Enable(True)
         self.PopupMenu(menu_id)
         menu_id.Destroy()
@@ -1703,15 +1711,15 @@ class MarkersPanel(wx.Panel):
         # Note that ball_id is zero-based, so we assign it len(self.markers) before the new marker is added
         if all([elem is not None for elem in new_marker.coord[3:]]):
-            Publisher.sendMessage('Add arrow marker', arrow_id=len(self.markers),
-                                  size=self.arrow_marker_size,
-                                  color=new_marker.colour,
-                                  coord=new_marker.coord)
+            arrow_flag = True
         else:
-            Publisher.sendMessage('Add marker', ball_id=len(self.markers),
-                                  size=new_marker.size,
-                                  colour=new_marker.colour,
-                                  coord=new_marker.coord[:3])
+            arrow_flag = False
+
+        Publisher.sendMessage('Add marker', marker_id=len(self.markers),
+                              size=new_marker.size,
+                              colour=new_marker.colour,
+                              coord=new_marker.coord,
+                              arrow_flag=arrow_flag)
         self.markers.append(new_marker)