From 75cc013ef37202efca7d801b65c9cd8f0b05f1c5 Mon Sep 17 00:00:00 2001
From: Renan <renan_hiroshi@hotmail.com>
Date: Mon, 11 Oct 2021 08:39:49 +0300
Subject: [PATCH] Cleaning and fixing merge

---
 invesalius/gui/dialogs.py        | 6 +++++-
 invesalius/gui/task_navigator.py | 2 +-
 invesalius/navigation/tracker.py | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py
index 832d67b..31555e6 100644
--- a/invesalius/gui/dialogs.py
+++ b/invesalius/gui/dialogs.py
@@ -2920,6 +2920,11 @@ class FFillSegmentationOptionsDialog(wx.Dialog):
             sizer.Add(0, 0, (14, 0))
         except TypeError:
             sizer.AddStretchSpacer((14, 0))
+        sizer.Add(self.close_btn, (15, 0), (1, 6), flag=wx.ALIGN_RIGHT|wx.RIGHT, border=5)
+        try:
+            sizer.Add(0, 0, (16, 0))
+        except TypeError:
+            sizer.AddStretchSpacer((16, 0))
 
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -3307,7 +3312,6 @@ class ObjectCalibrationDialog(wx.Dialog):
         self.pedal_connection = pedal_connection
 
         self.trk_init, self.tracker_id = tracker.GetTrackerInfo()
-        #self.TrackerCoordinates = nav_prop[2]
         self.obj_ref_id = 2
         self.obj_name = None
         self.polydata = None
diff --git a/invesalius/gui/task_navigator.py b/invesalius/gui/task_navigator.py
index 3e682f8..f74a766 100644
--- a/invesalius/gui/task_navigator.py
+++ b/invesalius/gui/task_navigator.py
@@ -1654,7 +1654,7 @@ class MarkersPanel(wx.Panel):
     def OnChangeCurrentSession(self, new_session_id):
         self.current_session = new_session_id
 
-    def CreateMarker(self, coord=None, colour=None, size=None, label='*', is_target=0, seed=None, head=None, robot=None, session_id=None):
+    def CreateMarker(self, coord=None, colour=None, size=None, label='*', is_target=False, seed=None, head=None, robot=None, session_id=None):
         new_marker = self.Marker()
         new_marker.coord = coord or self.current_coord
         new_marker.colour = colour or self.marker_colour
diff --git a/invesalius/navigation/tracker.py b/invesalius/navigation/tracker.py
index 766ff58..3e0cdf4 100644
--- a/invesalius/navigation/tracker.py
+++ b/invesalius/navigation/tracker.py
@@ -79,7 +79,6 @@ class Tracker():
                     self.event_coord.set()
                     self.event_robot.set()
                     self.thread_coord.join()
-                    #get the robot thread??
                     self.event_coord.clear()
                     self.event_robot.clear()
 
--
libgit2 0.21.2