Download as
Browse Code »

Commit 04664234ff272923dd771052f676fc8389897d1a

Authored by Thiago Franco de Moraes
1 parent 2e32edc7
Exists in mactoolbar_bkp

Added more toolbars as auitoolbar

Showing 1 changed file with 62 additions and 56 deletions   Show diff stats
invesalius/gui/frame.py
  Diff comments   View file @0466423
@@ -184,46 +184,43 @@ class Frame(wx.Frame): @@ -184,46 +184,43 @@ class Frame(wx.Frame):
184 # This is pretty tricky -- order on win32 is inverted when 184 # This is pretty tricky -- order on win32 is inverted when
185 # compared to linux2 & darwin 185 # compared to linux2 & darwin
186 if sys.platform == 'win32': 186 if sys.platform == 'win32':
187 - #t1 = ProjectToolBar(self)  
188 - #t2 = HistoryToolBar(self)  
189 - #t3 = LayoutToolBar(self)  
190 - #t4 = ObjectToolBar(self) 187 + t1 = ProjectToolBar(self)
  188 + t2 = HistoryToolBar(self)
  189 + t3 = LayoutToolBar(self)
  190 + t4 = ObjectToolBar(self)
191 t5 = SliceToolBar(self) 191 t5 = SliceToolBar(self)
192 else: 192 else:
193 - #t5 = ProjectToolBar(self)  
194 - #t4 = HistoryToolBar(self)  
195 - #t3 = LayoutToolBar(self)  
196 - #t2 = ObjectToolBar(self) 193 + t5 = ProjectToolBar(self)
  194 + t4 = HistoryToolBar(self)
  195 + t3 = LayoutToolBar(self)
  196 + t2 = ObjectToolBar(self)
197 t1 = SliceToolBar(self) 197 t1 = SliceToolBar(self)
198 198
199 199
200 - #self.SetToolBar(t1)  
201 - #t1.Realize()  
202 -  
203 aui_manager.AddPane(t1, wx.aui.AuiPaneInfo(). 200 aui_manager.AddPane(t1, wx.aui.AuiPaneInfo().
204 Name("General Features Toolbar"). 201 Name("General Features Toolbar").
205 ToolbarPane().Top().Floatable(False). 202 ToolbarPane().Top().Floatable(False).
206 LeftDockable(False).RightDockable(False)) 203 LeftDockable(False).RightDockable(False))
207 204
208 - #aui_manager.AddPane(t2, wx.aui.AuiPaneInfo().  
209 - #Name("Layout Toolbar").  
210 - #ToolbarPane().Top().Floatable(False).  
211 - #LeftDockable(False).RightDockable(False)) 205 + aui_manager.AddPane(t2, wx.aui.AuiPaneInfo().
  206 + Name("Layout Toolbar").
  207 + ToolbarPane().Top().Floatable(False).
  208 + LeftDockable(False).RightDockable(False))
212 209
213 - #aui_manager.AddPane(t3, wx.aui.AuiPaneInfo().  
214 - #Name("Project Toolbar").  
215 - #ToolbarPane().Top().Floatable(False).  
216 - #LeftDockable(False).RightDockable(False)) 210 + aui_manager.AddPane(t3, wx.aui.AuiPaneInfo().
  211 + Name("Project Toolbar").
  212 + ToolbarPane().Top().Floatable(False).
  213 + LeftDockable(False).RightDockable(False))
217 214
218 - #aui_manager.AddPane(t4, wx.aui.AuiPaneInfo().  
219 - #Name("Slice Toolbar").  
220 - #ToolbarPane().Top().Floatable(False).  
221 - #LeftDockable(False).RightDockable(False)) 215 + aui_manager.AddPane(t4, wx.aui.AuiPaneInfo().
  216 + Name("Slice Toolbar").
  217 + ToolbarPane().Top().Floatable(False).
  218 + LeftDockable(False).RightDockable(False))
222 219
223 - #aui_manager.AddPane(t5, wx.aui.AuiPaneInfo().  
224 - #Name("History Toolbar").  
225 - #ToolbarPane().Top().Floatable(False).  
226 - #LeftDockable(False).RightDockable(False)) 220 + aui_manager.AddPane(t5, wx.aui.AuiPaneInfo().
  221 + Name("History Toolbar").
  222 + ToolbarPane().Top().Floatable(False).
  223 + LeftDockable(False).RightDockable(False))
227 224
228 aui_manager.Update() 225 aui_manager.Update()
229 self.aui_manager = aui_manager 226 self.aui_manager = aui_manager
@@ -1012,14 +1009,14 @@ class ProjectToolBar(wx.ToolBar): @@ -1012,14 +1009,14 @@ class ProjectToolBar(wx.ToolBar):
1012 # ------------------------------------------------------------------ 1009 # ------------------------------------------------------------------
1013 # ------------------------------------------------------------------ 1010 # ------------------------------------------------------------------
1014 1011
1015 -class ObjectToolBar(wx.ToolBar): 1012 +class ObjectToolBar(AuiToolBar):
1016 """ 1013 """
1017 Toolbar related to general object operations, including: zoom 1014 Toolbar related to general object operations, including: zoom
1018 move, rotate, brightness/contrast, etc. 1015 move, rotate, brightness/contrast, etc.
1019 """ 1016 """
1020 def __init__(self, parent): 1017 def __init__(self, parent):
1021 style = wx.TB_FLAT|wx.TB_NODIVIDER | wx.TB_DOCKABLE 1018 style = wx.TB_FLAT|wx.TB_NODIVIDER | wx.TB_DOCKABLE
1022 - wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, 1019 + AuiToolBar.__init__(self, parent, -1, wx.DefaultPosition,
1023 wx.DefaultSize, style) 1020 wx.DefaultSize, style)
1024 1021
1025 self.SetToolBitmapSize(wx.Size(32,32)) 1022 self.SetToolBitmapSize(wx.Size(32,32))
@@ -1112,40 +1109,47 @@ class ObjectToolBar(wx.ToolBar): @@ -1112,40 +1109,47 @@ class ObjectToolBar(wx.ToolBar):
1112 #BMP_ANNOTATE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG) 1109 #BMP_ANNOTATE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG)
1113 1110
1114 # Create tool items based on bitmaps 1111 # Create tool items based on bitmaps
1115 - self.AddLabelTool(const.STATE_ZOOM, 1112 + self.AddTool(const.STATE_ZOOM,
1116 "", 1113 "",
1117 - shortHelp =_("Zoom"),  
1118 - bitmap=BMP_ZOOM, 1114 + BMP_ZOOM,
  1115 + wx.NullBitmap,
  1116 + short_help_string =_("Zoom"),
1119 kind = wx.ITEM_CHECK) 1117 kind = wx.ITEM_CHECK)
1120 - self.AddLabelTool(const.STATE_ZOOM_SL, 1118 + self.AddTool(const.STATE_ZOOM_SL,
1121 "", 1119 "",
1122 - shortHelp = _("Zoom based on selection"),  
1123 - bitmap = BMP_ZOOM_SELECT, 1120 + BMP_ZOOM_SELECT,
  1121 + wx.NullBitmap,
  1122 + short_help_string = _("Zoom based on selection"),
1124 kind = wx.ITEM_CHECK) 1123 kind = wx.ITEM_CHECK)
1125 - self.AddLabelTool(const.STATE_SPIN, 1124 + self.AddTool(const.STATE_SPIN,
1126 "", 1125 "",
1127 - shortHelp = _("Rotate"),  
1128 - bitmap = BMP_ROTATE, 1126 + BMP_ROTATE,
  1127 + wx.NullBitmap,
  1128 + short_help_string = _("Rotate"),
1129 kind = wx.ITEM_CHECK) 1129 kind = wx.ITEM_CHECK)
1130 - self.AddLabelTool(const.STATE_PAN, 1130 + self.AddTool(const.STATE_PAN,
1131 "", 1131 "",
1132 - shortHelp = _("Move"),  
1133 - bitmap = BMP_MOVE, 1132 + BMP_MOVE,
  1133 + wx.NullBitmap,
  1134 + short_help_string = _("Move"),
1134 kind = wx.ITEM_CHECK) 1135 kind = wx.ITEM_CHECK)
1135 - self.AddLabelTool(const.STATE_WL, 1136 + self.AddTool(const.STATE_WL,
1136 "", 1137 "",
1137 - shortHelp = _("Constrast"),  
1138 - bitmap = BMP_CONTRAST, 1138 + BMP_CONTRAST,
  1139 + wx.NullBitmap,
  1140 + short_help_string = _("Constrast"),
1139 kind = wx.ITEM_CHECK) 1141 kind = wx.ITEM_CHECK)
1140 - self.AddLabelTool(const.STATE_MEASURE_DISTANCE, 1142 + self.AddTool(const.STATE_MEASURE_DISTANCE,
1141 "", 1143 "",
1142 - shortHelp = _("Measure distance"),  
1143 - bitmap = BMP_DISTANCE, 1144 + BMP_DISTANCE,
  1145 + wx.NullBitmap,
  1146 + short_help_string = _("Measure distance"),
1144 kind = wx.ITEM_CHECK) 1147 kind = wx.ITEM_CHECK)
1145 - self.AddLabelTool(const.STATE_MEASURE_ANGLE, 1148 + self.AddTool(const.STATE_MEASURE_ANGLE,
1146 "", 1149 "",
1147 - shortHelp = _("Measure angle"),  
1148 - bitmap = BMP_ANGLE, 1150 + BMP_ANGLE,
  1151 + wx.NullBitmap,
  1152 + short_help_string = _("Measure angle"),
1149 kind = wx.ITEM_CHECK) 1153 kind = wx.ITEM_CHECK)
1150 #self.AddLabelTool(const.STATE_ANNOTATE, 1154 #self.AddLabelTool(const.STATE_ANNOTATE,
1151 # "", 1155 # "",
@@ -1169,9 +1173,10 @@ class ObjectToolBar(wx.ToolBar): @@ -1169,9 +1173,10 @@ class ObjectToolBar(wx.ToolBar):
1169 Untoggle all items on toolbar. 1173 Untoggle all items on toolbar.
1170 """ 1174 """
1171 for id in const.TOOL_STATES: 1175 for id in const.TOOL_STATES:
1172 - state = self.GetToolState(id) 1176 + state = self.GetToolToggled(id)
1173 if state: 1177 if state:
1174 self.ToggleTool(id, False) 1178 self.ToggleTool(id, False)
  1179 + self.Update()
1175 1180
1176 def _ToggleLinearMeasure(self, pubsub_evt): 1181 def _ToggleLinearMeasure(self, pubsub_evt):
1177 """ 1182 """
@@ -1183,7 +1188,7 @@ class ObjectToolBar(wx.ToolBar): @@ -1183,7 +1188,7 @@ class ObjectToolBar(wx.ToolBar):
1183 Publisher.sendMessage('Enable style', id) 1188 Publisher.sendMessage('Enable style', id)
1184 Publisher.sendMessage('Untoggle slice toolbar items') 1189 Publisher.sendMessage('Untoggle slice toolbar items')
1185 for item in const.TOOL_STATES: 1190 for item in const.TOOL_STATES:
1186 - state = self.GetToolState(item) 1191 + state = self.GetToolToggled(item)
1187 if state and (item != id): 1192 if state and (item != id):
1188 self.ToggleTool(item, False) 1193 self.ToggleTool(item, False)
1189 1194
@@ -1198,7 +1203,7 @@ class ObjectToolBar(wx.ToolBar): @@ -1198,7 +1203,7 @@ class ObjectToolBar(wx.ToolBar):
1198 Publisher.sendMessage('Enable style', id) 1203 Publisher.sendMessage('Enable style', id)
1199 Publisher.sendMessage('Untoggle slice toolbar items') 1204 Publisher.sendMessage('Untoggle slice toolbar items')
1200 for item in const.TOOL_STATES: 1205 for item in const.TOOL_STATES:
1201 - state = self.GetToolState(item) 1206 + state = self.GetToolToggled(item)
1202 if state and (item != id): 1207 if state and (item != id):
1203 self.ToggleTool(item, False) 1208 self.ToggleTool(item, False)
1204 1209
@@ -1208,7 +1213,7 @@ class ObjectToolBar(wx.ToolBar): @@ -1208,7 +1213,7 @@ class ObjectToolBar(wx.ToolBar):
1208 should be toggle each time). 1213 should be toggle each time).
1209 """ 1214 """
1210 id = evt.GetId() 1215 id = evt.GetId()
1211 - state = self.GetToolState(id) 1216 + state = self.GetToolToggled(id)
1212 if state and ((id == const.STATE_MEASURE_DISTANCE) or\ 1217 if state and ((id == const.STATE_MEASURE_DISTANCE) or\
1213 (id == const.STATE_MEASURE_ANGLE)): 1218 (id == const.STATE_MEASURE_ANGLE)):
1214 Publisher.sendMessage('Fold measure task') 1219 Publisher.sendMessage('Fold measure task')
@@ -1220,7 +1225,7 @@ class ObjectToolBar(wx.ToolBar): @@ -1220,7 +1225,7 @@ class ObjectToolBar(wx.ToolBar):
1220 Publisher.sendMessage('Disable style', id) 1225 Publisher.sendMessage('Disable style', id)
1221 1226
1222 for item in const.TOOL_STATES: 1227 for item in const.TOOL_STATES:
1223 - state = self.GetToolState(item) 1228 + state = self.GetToolToggled(item)
1224 if state and (item != id): 1229 if state and (item != id):
1225 self.ToggleTool(item, False) 1230 self.ToggleTool(item, False)
1226 evt.Skip() 1231 evt.Skip()
@@ -1328,12 +1333,13 @@ class SliceToolBar(AuiToolBar): @@ -1328,12 +1333,13 @@ class SliceToolBar(AuiToolBar):
1328 Untoggle all items on toolbar. 1333 Untoggle all items on toolbar.
1329 """ 1334 """
1330 for id in const.TOOL_SLICE_STATES: 1335 for id in const.TOOL_SLICE_STATES:
1331 - state = self.GetToolState(id) 1336 + state = self.GetToolToggled(id)
1332 if state: 1337 if state:
1333 self.ToggleTool(id, False) 1338 self.ToggleTool(id, False)
1334 if id == const.SLICE_STATE_CROSS: 1339 if id == const.SLICE_STATE_CROSS:
1335 msg = 'Set cross visibility' 1340 msg = 'Set cross visibility'
1336 Publisher.sendMessage(msg, 0) 1341 Publisher.sendMessage(msg, 0)
  1342 + self.Update()
1337 1343
1338 def OnToggle(self, evt): 1344 def OnToggle(self, evt):
1339 """ 1345 """