test

rmatsuda
1 parent c3fdcee7
Showing 3 changed files with 30 additions and 4 deletions Show diff stats
invesalius/data/coregistration.py
invesalius/gui/dialogs.py
invesalius/gui/task_navigator.py
@@ -216,7 +216,7 @@ class CoordinateCorregistrate(threading.Thread):
 class CoordinateCorregistrateNoObject(threading.Thread):
-    def __init__(self, ref_mode_id, trck_info, coreg_data, coord_queue, view_tracts, coord_tracts_queue, event, sle):
+    def __init__(self, ref_mode_id, trck_info, coreg_data, coord_queue, view_tracts, coord_tracts_queue, event, sle, icp = None, m_icp = None):
         threading.Thread.__init__(self, name='CoordCoregNoObject')
         self.ref_mode_id = ref_mode_id
         self.trck_info = trck_info
@@ -226,13 +226,14 @@ class CoordinateCorregistrateNoObject(threading.Thread):
         self.coord_tracts_queue = coord_tracts_queue
         self.event = event
         self.sle = sle
-        self.m_icp = None
-        self.icp = False
+        self.m_icp = m_icp
+        self.icp = icp
     def __bind_events(self):
         Publisher.subscribe(self.UpdateICP, 'Update ICP matrix')
     def UpdateICP(self, m_icp, flag):
+        print('oi')
         self.m_icp = m_icp
         self.icp = flag
@@ -849,6 +849,23 @@ def ShowNavigationTrackerWarning(trck_id, lib_mode):
     dlg.ShowModal()
     dlg.Destroy()
+def ICPcorregistration(fre):
+    msg = _("The fiducial registration error is: ") + str(round(fre, 2)) + '\n' + \
+          _("Would you like to improve accuracy?")
+    if sys.platform == 'darwin':
+        dlg = wx.MessageDialog(None, "", msg,
+                               wx.YES_NO)
+    else:
+        dlg = wx.MessageDialog(None, msg, "InVesalius 3",
+                               wx.YES_NO)
+
+    if dlg.ShowModal() == wx.ID_YES:
+        flag = True
+    else:
+        flag = False
+
+    dlg.Destroy()
+    return flag
 def ShowEnterMarkerID(default):
     msg = _("Edit marker ID")
@@ -665,7 +665,7 @@ class NeuronavigationPanel(wx.Panel):
             for n in [0, 1, 2]:
                 self.numctrls_coord[btn_id][n].SetValue(float(coord[n]))
-    def OnICP(self, evt):
+    def OnICP(self):
         dialog = dlg.ICPCorregistrationDialog(nav_prop=(self.tracker_id, self.trk_init, self.ref_mode_id))
         if dialog.ShowModal() == wx.ID_OK:
             self.m_icp, point_coord, transformed_points = dialog.GetValue()
@@ -682,9 +682,14 @@ class NeuronavigationPanel(wx.Panel):
         if ctrl.GetValue() and evt and (self.m_icp is not None):
             self.icp = True
             self.icp_button.Enable(0)
+            dcr.CoordinateCorregistrateNoObject.icp = True
+            dcr.CoordinateCorregistrateNoObject.m_icp = self.m_icp
         else:
             self.icp_button.Enable(1)
             self.icp = False
+            dcr.CoordinateCorregistrateNoObject.icp = False
+
+        print(self.icp, self.m_icp)
         Publisher.sendMessage("Update ICP matrix", m_icp=self.m_icp, flag=self.icp)
     def OnNavigate(self, evt, btn):
@@ -838,6 +843,9 @@ class NeuronavigationPanel(wx.Panel):
                         jobs.start()
                         # del jobs
+                    if dlg.ICPcorregistration(fre):
+                        self.OnICP()
+
     def ResetImageFiducials(self):
         for m in range(0, 3):
             self.btns_coord[m].SetValue(False)
	@@ -849,6 +849,23 @@ def ShowNavigationTrackerWarning(trck_id, lib_mode):		@@ -849,6 +849,23 @@ def ShowNavigationTrackerWarning(trck_id, lib_mode):
849	dlg.ShowModal()	849	dlg.ShowModal()
850	dlg.Destroy()	850	dlg.Destroy()
851		851
		852	+def ICPcorregistration(fre):
		853	+ msg = _("The fiducial registration error is: ") + str(round(fre, 2)) + '\n' + \
		854	+ _("Would you like to improve accuracy?")
		855	+ if sys.platform == 'darwin':
		856	+ dlg = wx.MessageDialog(None, "", msg,
		857	+ wx.YES_NO)
		858	+ else:
		859	+ dlg = wx.MessageDialog(None, msg, "InVesalius 3",
		860	+ wx.YES_NO)
		861	+
		862	+ if dlg.ShowModal() == wx.ID_YES:
		863	+ flag = True
		864	+ else:
		865	+ flag = False
		866	+
		867	+ dlg.Destroy()
		868	+ return flag
852		869
853	def ShowEnterMarkerID(default):	870	def ShowEnterMarkerID(default):
854	msg = _("Edit marker ID")	871	msg = _("Edit marker ID")