From 66d069ae0c7722bb7c7eeff66fbfcd7c2e3e742d Mon Sep 17 00:00:00 2001 From: tatiana Date: Wed, 24 Feb 2010 15:12:56 +0000 Subject: [PATCH] ENH: Toolbar icons / constants for measurements and annotation --- invesalius/constants.py | 5 +++-- invesalius/data/viewer_slice.py | 3 +++ invesalius/gui/frame.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/invesalius/constants.py b/invesalius/constants.py index 152aef2..779d576 100644 --- a/invesalius/constants.py +++ b/invesalius/constants.py @@ -441,8 +441,9 @@ VOLUME_STATE_SEED = 2001 STATE_ANGULAR_MEASURE = 3002 -TOOL_STATES = [ STATE_WL, STATE_SPIN, STATE_ZOOM, - STATE_ZOOM_SL, STATE_PAN] +TOOL_STATES = [STATE_WL, STATE_SPIN, STATE_ZOOM, + STATE_ZOOM_SL, STATE_PAN, STATE_MEASURE_DISTANCE, + STATE_MEASURE_ANGLE, STATE_ANNOTATE] TOOL_SLICE_STATES = [SLICE_STATE_CROSS, SLICE_STATE_SCROLL] diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index cfe69fb..97c489c 100755 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -203,6 +203,9 @@ class Viewer(wx.Panel): }, const.STATE_DEFAULT: { + }, + const.STATE_MEASURE_DISTANCE: + { } } if state == const.SLICE_STATE_CROSS: diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index e494de0..7b6adca 100755 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -813,8 +813,8 @@ class ObjectToolBar(wx.ToolBar): """ d = const.ICON_DIR if sys.platform == 'darwin': - path = os.path.join(d, "tool_rotate_original.gif") - BMP_ROTATE = wx.Bitmap(path, wx.BITMAP_TYPE_GIF) + path = os.path.join(d, "tool_rotate_original.png") + BMP_ROTATE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG) path = os.path.join(d, "tool_translate_original.png") BMP_MOVE =wx.Bitmap(path, wx.BITMAP_TYPE_PNG) -- libgit2 0.21.2