Download as
Browse Code »

Commit 1b4040d70dbcff12514fb264e376f11bc0bb6617

Authored by sotodela
1 parent 5ae0b7a0
Exists in master

Work in progress

Showing 1 changed file with 13 additions and 8 deletions   Show diff stats
invesalius/gui/task_navigator.py
  Diff comments   View file @1b4040d
... ... @@ -359,7 +359,7 @@ class NeuronavigationPanel(wx.Panel):
359 359  
360 360 self.nav_status = False
361 361 self.tracker_fiducial_being_set = None
362   - self.current_coord = 0, 0, 0
  362 + self.current_coord = 0, 0, 0, None, None, None
363 363  
364 364 # Initialize list of buttons and numctrls for wx objects
365 365 self.btns_set_fiducial = [None, None, None, None, None, None]
... ... @@ -704,7 +704,7 @@ class NeuronavigationPanel(wx.Panel):
704 704 if self.btns_set_fiducial[n].GetValue():
705 705 coord = self.numctrls_fiducial[n][0].GetValue(),\
706 706 self.numctrls_fiducial[n][1].GetValue(),\
707   - self.numctrls_fiducial[n][2].GetValue(), 0, 0, 0
  707 + self.numctrls_fiducial[n][2].GetValue(), None, None, None
708 708  
709 709 Publisher.sendMessage('Set image fiducial', fiducial_name=fiducial_name, coord=coord[0:3])
710 710  
... ... @@ -1144,9 +1144,9 @@ class MarkersPanel(wx.Panel):
1144 1144 x : float = 0
1145 1145 y : float = 0
1146 1146 z : float = 0
1147   - alpha : float = 0
1148   - beta : float = 0
1149   - gamma : float = 0
  1147 + alpha : float = None
  1148 + beta : float = None
  1149 + gamma : float = None
1150 1150 r : float = 0
1151 1151 g : float = 1
1152 1152 b : float = 0
... ... @@ -1161,6 +1161,7 @@ class MarkersPanel(wx.Panel):
1161 1161 # x, y, z, alpha, beta, gamma can be jointly accessed as coord
1162 1162 @property
1163 1163 def coord(self):
  1164 + print(self.alpha)
1164 1165 return list((self.x, self.y, self.z, self.alpha, self.beta, self.gamma),)
1165 1166  
1166 1167 @coord.setter
... ... @@ -1253,8 +1254,8 @@ class MarkersPanel(wx.Panel):
1253 1254  
1254 1255 self.session = ses.Session()
1255 1256  
1256   - self.current_coord = 0, 0, 0, 0, 0, 0
1257   - self.current_angle = 0, 0, 0
  1257 + self.current_coord = 0, 0, 0, None, None, None
  1258 + self.current_angle = None, None, None
1258 1259 self.current_seed = 0, 0, 0
1259 1260 self.current_robot_target_matrix = [None] * 9
1260 1261 self.markers = []
... ... @@ -1688,12 +1689,16 @@ class MarkersPanel(wx.Panel):
1688 1689 size=self.arrow_marker_size,
1689 1690 color=new_marker.colour,
1690 1691 coord=new_marker.coord)
  1692 + elif new_marker.coord[5] is None:
  1693 + Publisher.sendMessage('Add marker', ball_id=len(self.markers),
  1694 + size=new_marker.size,
  1695 + colour=new_marker.colour,
  1696 + coord=new_marker.coord[:3])
1691 1697 else:
1692 1698 Publisher.sendMessage('Add marker', ball_id=len(self.markers),
1693 1699 size=new_marker.size,
1694 1700 colour=new_marker.colour,
1695 1701 coord=new_marker.coord[:3])
1696   - print("marker marker",new_marker.size)
1697 1702  
1698 1703  
1699 1704 self.markers.append(new_marker)
... ...