From 1ba56fa282f3f535426ac74b3f0c15d887a91aa8 Mon Sep 17 00:00:00 2001 From: Renan Date: Wed, 6 Oct 2021 09:44:43 +0300 Subject: [PATCH] FIX: ICP get coordinates --- invesalius/gui/dialogs.py | 5 ++--- invesalius/navigation/icp.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 9dfddb2..0bf8f0d 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -3647,8 +3647,7 @@ class ICPCorregistrationDialog(wx.Dialog): import invesalius.project as prj self.m_change = nav_prop[0] - self.tracker_id = nav_prop[1] - self.trk_init = nav_prop[2] + self.tracker = nav_prop[1] self.obj_ref_id = 2 self.obj_name = None self.obj_actor = None @@ -3804,7 +3803,7 @@ class ICPCorregistrationDialog(wx.Dialog): self.interactor.Render() def GetCurrentCoord(self): - coord_raw = dco.TrackerCoordinates.GetCoordinates() + coord_raw, markers_flag = self.tracker.TrackerCoordinates.GetCoordinates() coord, _ = dcr.corregistrate_dynamic((self.m_change, 0), coord_raw, const.DEFAULT_REF_MODE, [None, None]) return coord[:3] diff --git a/invesalius/navigation/icp.py b/invesalius/navigation/icp.py index 5e273bb..295cd34 100644 --- a/invesalius/navigation/icp.py +++ b/invesalius/navigation/icp.py @@ -48,7 +48,7 @@ class ICP(): def OnICP(self, navigation, tracker, m_change): ref_mode_id = navigation.GetReferenceMode() - dialog = dlg.ICPCorregistrationDialog(nav_prop=(m_change, tracker.tracker_id, tracker.trk_init, ref_mode_id)) + dialog = dlg.ICPCorregistrationDialog(nav_prop=(m_change, tracker, ref_mode_id)) if dialog.ShowModal() == wx.ID_OK: m_icp, point_coord, transformed_points, prev_error, final_error = dialog.GetValue() -- libgit2 0.21.2