Download as
Browse Code »

Commit 66d069ae0c7722bb7c7eeff66fbfcd7c2e3e742d

Authored by tatiana
1 parent 58af85f1
Exists in master and in 6 other branches beta3, beta4, inv3.0.1, invesalius-libift, usp-navegador, wxgtk3_b5

ENH: Toolbar icons / constants for measurements and annotation

Showing 3 changed files with 8 additions and 4 deletions   Show diff stats
invesalius/constants.py
  Diff comments   View file @66d069a
@@ -441,8 +441,9 @@ VOLUME_STATE_SEED = 2001 @@ -441,8 +441,9 @@ VOLUME_STATE_SEED = 2001
441 STATE_ANGULAR_MEASURE = 3002 441 STATE_ANGULAR_MEASURE = 3002
442 442
443 443
444 -TOOL_STATES = [ STATE_WL, STATE_SPIN, STATE_ZOOM,  
445 - STATE_ZOOM_SL, STATE_PAN] 444 +TOOL_STATES = [STATE_WL, STATE_SPIN, STATE_ZOOM,
  445 + STATE_ZOOM_SL, STATE_PAN, STATE_MEASURE_DISTANCE,
  446 + STATE_MEASURE_ANGLE, STATE_ANNOTATE]
446 447
447 TOOL_SLICE_STATES = [SLICE_STATE_CROSS, SLICE_STATE_SCROLL] 448 TOOL_SLICE_STATES = [SLICE_STATE_CROSS, SLICE_STATE_SCROLL]
448 449
invesalius/data/viewer_slice.py
  Diff comments   View file @66d069a
@@ -203,6 +203,9 @@ class Viewer(wx.Panel): @@ -203,6 +203,9 @@ class Viewer(wx.Panel):
203 }, 203 },
204 const.STATE_DEFAULT: 204 const.STATE_DEFAULT:
205 { 205 {
  206 + },
  207 + const.STATE_MEASURE_DISTANCE:
  208 + {
206 } 209 }
207 } 210 }
208 if state == const.SLICE_STATE_CROSS: 211 if state == const.SLICE_STATE_CROSS:
invesalius/gui/frame.py
  Diff comments   View file @66d069a
@@ -813,8 +813,8 @@ class ObjectToolBar(wx.ToolBar): @@ -813,8 +813,8 @@ class ObjectToolBar(wx.ToolBar):
813 """ 813 """
814 d = const.ICON_DIR 814 d = const.ICON_DIR
815 if sys.platform == 'darwin': 815 if sys.platform == 'darwin':
816 - path = os.path.join(d, "tool_rotate_original.gif")  
817 - BMP_ROTATE = wx.Bitmap(path, wx.BITMAP_TYPE_GIF) 816 + path = os.path.join(d, "tool_rotate_original.png")
  817 + BMP_ROTATE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG)
818 818
819 path = os.path.join(d, "tool_translate_original.png") 819 path = os.path.join(d, "tool_translate_original.png")
820 BMP_MOVE =wx.Bitmap(path, wx.BITMAP_TYPE_PNG) 820 BMP_MOVE =wx.Bitmap(path, wx.BITMAP_TYPE_PNG)