Commit 2560d18f90d7531c09628da93a24b49e0b4196c6
Committed by
GitHub
Exists in
master
Merge branch 'master' into markers-list-improvements
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
invesalius/data/viewer_volume.py
... | ... | @@ -707,7 +707,7 @@ class Viewer(wx.Panel): |
707 | 707 | self.index = False |
708 | 708 | |
709 | 709 | def SetNewColor(self, index, color): |
710 | - self.staticballs[index].GetProperty().SetColor(color) | |
710 | + self.staticballs[index].GetProperty().SetColor([round(s/255.0, 3) for s in color]) | |
711 | 711 | self.Refresh() |
712 | 712 | |
713 | 713 | def OnTargetMarkerTransparency(self, status, index): | ... | ... |
invesalius/gui/task_navigator.py
... | ... | @@ -340,7 +340,7 @@ class NeuronavigationPanel(wx.Panel): |
340 | 340 | |
341 | 341 | # ComboBox for spatial tracker device selection |
342 | 342 | tracker_options = [_("Select tracker:")] + self.tracker.get_trackers() |
343 | - select_tracker_elem = wx.ComboBox(self, -1, "", | |
343 | + select_tracker_elem = wx.ComboBox(self, -1, "", size=(145, -1), | |
344 | 344 | choices=tracker_options, style=wx.CB_DROPDOWN|wx.CB_READONLY) |
345 | 345 | |
346 | 346 | tooltip = wx.ToolTip(_("Choose the tracking device")) |
... | ... | @@ -1481,6 +1481,7 @@ class MarkersPanel(wx.Panel): |
1481 | 1481 | # a marker with is_target=0 (False), and then call __set_marker_as_target |
1482 | 1482 | if marker.is_target: |
1483 | 1483 | self.__set_marker_as_target(len(self.markers)-1) |
1484 | + | |
1484 | 1485 | except: |
1485 | 1486 | wx.MessageBox(_("Invalid markers file."), _("InVesalius 3")) |
1486 | 1487 | ... | ... |