Download as
Browse Code »

Commit 53373521ca54e6da9006c1cce319017857b4f685

Authored by Thiago Franco de Moraes
Committed by thiago
1 parent cadb0d83
Exists in wxgtk3_b5

The gradient widget is working

Showing 2 changed files with 35 additions and 34 deletions   Show diff stats
invesalius/gui/default_tasks.py
  Diff comments   View file @5337352
... ... @@ -102,7 +102,7 @@ class Panel(wx.Panel):
102 102  
103 103 sizer = wx.BoxSizer(wx.VERTICAL)
104 104 #sizer.Add(UpperTaskPanel(self), 5, wx.EXPAND|wx.GROW)
105   - #sizer.Add(UpperTaskPanel(self), 16, wx.EXPAND|wx.GROW)
  105 + sizer.Add(UpperTaskPanel(self), 16, wx.EXPAND|wx.GROW)
106 106  
107 107 #sizer.Add(LowerTaskPanel(self), 3, wx.EXPAND|wx.GROW)
108 108 sizer.Add(LowerTaskPanel(self), 6, wx.EXPAND|wx.GROW)
... ... @@ -209,8 +209,9 @@ class UpperTaskPanel(wx.Panel):
209 209 if int(session.mode) == const.MODE_RP:
210 210 tasks = [(_("Load data"), importer.TaskPanel),
211 211 (_("Select region of interest"), slice_.TaskPanel),
212   - (_("Configure 3D surface"), surface.TaskPanel),
213   - (_("Export data"), exporter.TaskPanel)]
  212 + #(_("Configure 3D surface"), surface.TaskPanel),
  213 + (_("Export data"), exporter.TaskPanel)
  214 + ]
214 215 elif int(session.mode) == const.MODE_NAVIGATOR:
215 216 tasks = [(_("Load data"), importer.TaskPanel),
216 217 (_("Select region of interest"), slice_.TaskPanel),
... ...
invesalius/gui/task_slice.py
  Diff comments   View file @5337352
... ... @@ -311,34 +311,34 @@ class MaskProperties(wx.Panel):
311 311 ## LINE 1
312 312  
313 313 # Combo related to mask naem
314   - combo_mask_name = wx.ComboBox(self, -1, "", choices= MASK_LIST,
315   - style=wx.CB_DROPDOWN|wx.CB_READONLY)
316   - combo_mask_name.SetSelection(0) # wx.CB_SORT
317   - if sys.platform != 'win32':
318   - combo_mask_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
319   - self.combo_mask_name = combo_mask_name
  314 + #combo_mask_name = wx.ComboBox(self, -1, "", choices= MASK_LIST,
  315 + #style=wx.CB_DROPDOWN|wx.CB_READONLY)
  316 + #combo_mask_name.SetSelection(0) # wx.CB_SORT
  317 + #if sys.platform != 'win32':
  318 + #combo_mask_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
  319 + #self.combo_mask_name = combo_mask_name
320 320  
321 321 # Mask colour
322   - button_colour= csel.ColourSelect(self, 111,colour=(0,255,0),size=(-1,22))
323   - self.button_colour = button_colour
  322 + #button_colour= csel.ColourSelect(self, 111,colour=(0,255,0),size=(-1,22))
  323 + #self.button_colour = button_colour
324 324  
325 325 # Sizer which represents the first line
326   - line1 = wx.BoxSizer(wx.HORIZONTAL)
327   - line1.Add(combo_mask_name, 1, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 2)
328   - line1.Add(button_colour, 0, wx.TOP|wx.LEFT|wx.RIGHT, 2)
329   -
330   - ## LINE 2
331   - text_thresh = wx.StaticText(self, -1,
332   - _("Set predefined or manual threshold:"))
333   -
334   - ## LINE 3
335   - combo_thresh = wx.ComboBox(self, -1, "", size=(15,-1),
336   - choices=[],#THRESHOLD_LIST
337   - style=wx.CB_DROPDOWN|wx.CB_READONLY)
338   - combo_thresh.SetSelection(0)
339   - if sys.platform != 'win32':
340   - combo_thresh.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
341   - self.combo_thresh = combo_thresh
  326 + #line1 = wx.BoxSizer(wx.HORIZONTAL)
  327 + #line1.Add(combo_mask_name, 1, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 2)
  328 + #line1.Add(button_colour, 0, wx.TOP|wx.LEFT|wx.RIGHT, 2)
  329 +
  330 + ### LINE 2
  331 + #text_thresh = wx.StaticText(self, -1,
  332 + #_("Set predefined or manual threshold:"))
  333 +
  334 + ### LINE 3
  335 + #combo_thresh = wx.ComboBox(self, -1, "", size=(15,-1),
  336 + #choices=[],#THRESHOLD_LIST
  337 + #style=wx.CB_DROPDOWN|wx.CB_READONLY)
  338 + #combo_thresh.SetSelection(0)
  339 + #if sys.platform != 'win32':
  340 + #combo_thresh.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
  341 + #self.combo_thresh = combo_thresh
342 342  
343 343 ## LINE 4
344 344 gradient = grad.GradientCtrl(self, -1, -5000, 5000, 0, 5000,
... ... @@ -347,9 +347,9 @@ class MaskProperties(wx.Panel):
347 347  
348 348 # Add all lines into main sizer
349 349 sizer = wx.BoxSizer(wx.VERTICAL)
350   - sizer.Add(line1, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 5)
351   - sizer.Add(text_thresh, 1, wx.GROW|wx.EXPAND|wx.ALL, 5)
352   - sizer.Add(combo_thresh, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
  350 + #sizer.Add(line1, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 5)
  351 + #sizer.Add(text_thresh, 1, wx.GROW|wx.EXPAND|wx.ALL, 5)
  352 + #sizer.Add(combo_thresh, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
353 353 sizer.Add(gradient, 1, wx.EXPAND|wx.TOP|wx.LEFT|wx.RIGHT|wx.BOTTOM, 6)
354 354 sizer.Fit(self)
355 355  
... ... @@ -363,7 +363,7 @@ class MaskProperties(wx.Panel):
363 363 self.threshold_modes = proj.threshold_modes
364 364 self.threshold_modes_names = []
365 365 self.bind_evt_gradient = True
366   - self.__bind_events()
  366 + #self.__bind_events()
367 367 self.__bind_events_wx()
368 368  
369 369  
... ... @@ -407,9 +407,9 @@ class MaskProperties(wx.Panel):
407 407 def __bind_events_wx(self):
408 408 self.Bind(grad.EVT_THRESHOLD_CHANGED, self.OnSlideChanged, self.gradient)
409 409 self.Bind(grad.EVT_THRESHOLD_CHANGING, self.OnSlideChanging, self.gradient)
410   - self.combo_thresh.Bind(wx.EVT_COMBOBOX, self.OnComboThresh)
411   - self.combo_mask_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)
412   - self.button_colour.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
  410 + #self.combo_thresh.Bind(wx.EVT_COMBOBOX, self.OnComboThresh)
  411 + #self.combo_mask_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)
  412 + #self.button_colour.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
413 413  
414 414 def SelectMaskName(self, pubsub_evt):
415 415 index = pubsub_evt.data
... ...