Cleaning and fixing merge

Renan
1 parent 37c0026b
Showing 3 changed files with 6 additions and 3 deletions Show diff stats
invesalius/gui/dialogs.py
invesalius/gui/task_navigator.py
invesalius/navigation/tracker.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
@@ -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
@@ -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()
...	...	@@ -2920,6 +2920,11 @@ class FFillSegmentationOptionsDialog(wx.Dialog):
2920	2920	sizer.Add(0, 0, (14, 0))
2921	2921	except TypeError:
2922	2922	sizer.AddStretchSpacer((14, 0))
	2923	+ sizer.Add(self.close_btn, (15, 0), (1, 6), flag=wx.ALIGN_RIGHT\|wx.RIGHT, border=5)
	2924	+ try:
	2925	+ sizer.Add(0, 0, (16, 0))
	2926	+ except TypeError:
	2927	+ sizer.AddStretchSpacer((16, 0))
2923	2928
2924	2929	self.SetSizer(sizer)
2925	2930	sizer.Fit(self)
...	...	@@ -3307,7 +3312,6 @@ class ObjectCalibrationDialog(wx.Dialog):
3307	3312	self.pedal_connection = pedal_connection
3308	3313
3309	3314	self.trk_init, self.tracker_id = tracker.GetTrackerInfo()
3310		- #self.TrackerCoordinates = nav_prop[2]
3311	3315	self.obj_ref_id = 2
3312	3316	self.obj_name = None
3313	3317	self.polydata = None
...	...
...	...	@@ -1654,7 +1654,7 @@ class MarkersPanel(wx.Panel):
1654	1654	def OnChangeCurrentSession(self, new_session_id):
1655	1655	self.current_session = new_session_id
1656	1656
1657		- def CreateMarker(self, coord=None, colour=None, size=None, label='*', is_target=0, seed=None, head=None, robot=None, session_id=None):
	1657	+ def CreateMarker(self, coord=None, colour=None, size=None, label='*', is_target=False, seed=None, head=None, robot=None, session_id=None):
1658	1658	new_marker = self.Marker()
1659	1659	new_marker.coord = coord or self.current_coord
1660	1660	new_marker.colour = colour or self.marker_colour
...	...
...	...	@@ -79,7 +79,6 @@ class Tracker():
79	79	self.event_coord.set()
80	80	self.event_robot.set()
81	81	self.thread_coord.join()
82		- #get the robot thread??
83	82	self.event_coord.clear()
84	83	self.event_robot.clear()
85	84
...	...