diff --git a/invesalius/data/bases.py b/invesalius/data/bases.py index 0d038fc..6876860 100644 --- a/invesalius/data/bases.py +++ b/invesalius/data/bases.py @@ -183,13 +183,15 @@ def calculate_fre(fiducials_raw, fiducials, ref_mode_id, m_change, m_icp=None): p2 = np.vstack([fiducials_raw[2, :], fiducials_raw[3, :]]) p3 = np.vstack([fiducials_raw[4, :], fiducials_raw[5, :]]) - coreg_data = (m_change, 0) - p1_m, m_img = dcr.corregistrate_dynamic(coreg_data, p1, ref_mode_id, [None, None]) - p2_m, m_img = dcr.corregistrate_dynamic(coreg_data, p2, ref_mode_id, [None, None]) - p3_m, m_img = dcr.corregistrate_dynamic(coreg_data, p3, ref_mode_id, [None, None]) + if m_icp is not None: + icp = [True, m_icp] + else: + icp = [False, None] - if m_icp: - m_img = transform_icp(m_img, m_icp) + coreg_data = (m_change, 0) + p1_m, m_img = dcr.corregistrate_dynamic(coreg_data, p1, ref_mode_id, icp) + p2_m, m_img = dcr.corregistrate_dynamic(coreg_data, p2, ref_mode_id, icp) + p3_m, m_img = dcr.corregistrate_dynamic(coreg_data, p3, ref_mode_id, icp) print(p1_m) print(fiducials[0, :]) diff --git a/invesalius/data/coregistration.py b/invesalius/data/coregistration.py index 6bcf950..8b8ceef 100644 --- a/invesalius/data/coregistration.py +++ b/invesalius/data/coregistration.py @@ -155,12 +155,10 @@ def corregistrate_dynamic(inp, coord_raw, ref_mode_id, icp): else: m_probe_ref = m_probe - print(m_probe_ref) # invert y coordinate m_probe_ref[2, -1] = -m_probe_ref[2, -1] # corregistrate from tracker to image space m_img = m_change @ m_probe_ref - print(m_img) if icp[0]: m_img = bases.transform_icp(m_img, icp[1]) -- libgit2 0.21.2