Download as
Browse Code »

Commit 974b0ed16e8121d33d1fe904533efb146b5fff80

Authored by Thiago Franco de Moraes
1 parent 86c43bdd
Exists in wxgtk3_bkp

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 @974b0ed
... ... @@ -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 @974b0ed
... ... @@ -336,34 +336,34 @@ class MaskProperties(wx.Panel):
336 336 ## LINE 1
337 337  
338 338 # Combo related to mask naem
339   - combo_mask_name = wx.ComboBox(self, -1, "", choices= MASK_LIST,
340   - style=wx.CB_DROPDOWN|wx.CB_READONLY)
341   - combo_mask_name.SetSelection(0) # wx.CB_SORT
342   - if sys.platform != 'win32':
343   - combo_mask_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
344   - self.combo_mask_name = combo_mask_name
  339 + #combo_mask_name = wx.ComboBox(self, -1, "", choices= MASK_LIST,
  340 + #style=wx.CB_DROPDOWN|wx.CB_READONLY)
  341 + #combo_mask_name.SetSelection(0) # wx.CB_SORT
  342 + #if sys.platform != 'win32':
  343 + #combo_mask_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
  344 + #self.combo_mask_name = combo_mask_name
345 345  
346 346 # Mask colour
347   - button_colour= csel.ColourSelect(self, 111,colour=(0,255,0),size=(-1,22))
348   - self.button_colour = button_colour
  347 + #button_colour= csel.ColourSelect(self, 111,colour=(0,255,0),size=(-1,22))
  348 + #self.button_colour = button_colour
349 349  
350 350 # Sizer which represents the first line
351   - line1 = wx.BoxSizer(wx.HORIZONTAL)
352   - line1.Add(combo_mask_name, 1, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 2)
353   - line1.Add(button_colour, 0, wx.TOP|wx.LEFT|wx.RIGHT, 2)
354   -
355   - ## LINE 2
356   - text_thresh = wx.StaticText(self, -1,
357   - _("Set predefined or manual threshold:"))
358   -
359   - ## LINE 3
360   - combo_thresh = wx.ComboBox(self, -1, "", size=(15,-1),
361   - choices=[],#THRESHOLD_LIST
362   - style=wx.CB_DROPDOWN|wx.CB_READONLY)
363   - combo_thresh.SetSelection(0)
364   - if sys.platform != 'win32':
365   - combo_thresh.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
366   - self.combo_thresh = combo_thresh
  351 + #line1 = wx.BoxSizer(wx.HORIZONTAL)
  352 + #line1.Add(combo_mask_name, 1, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 2)
  353 + #line1.Add(button_colour, 0, wx.TOP|wx.LEFT|wx.RIGHT, 2)
  354 +
  355 + ### LINE 2
  356 + #text_thresh = wx.StaticText(self, -1,
  357 + #_("Set predefined or manual threshold:"))
  358 +
  359 + ### LINE 3
  360 + #combo_thresh = wx.ComboBox(self, -1, "", size=(15,-1),
  361 + #choices=[],#THRESHOLD_LIST
  362 + #style=wx.CB_DROPDOWN|wx.CB_READONLY)
  363 + #combo_thresh.SetSelection(0)
  364 + #if sys.platform != 'win32':
  365 + #combo_thresh.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
  366 + #self.combo_thresh = combo_thresh
367 367  
368 368 ## LINE 4
369 369 gradient = grad.GradientCtrl(self, -1, -5000, 5000, 0, 5000,
... ... @@ -372,9 +372,9 @@ class MaskProperties(wx.Panel):
372 372  
373 373 # Add all lines into main sizer
374 374 sizer = wx.BoxSizer(wx.VERTICAL)
375   - sizer.Add(line1, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 5)
376   - sizer.Add(text_thresh, 1, wx.GROW|wx.EXPAND|wx.ALL, 5)
377   - sizer.Add(combo_thresh, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
  375 + #sizer.Add(line1, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 5)
  376 + #sizer.Add(text_thresh, 1, wx.GROW|wx.EXPAND|wx.ALL, 5)
  377 + #sizer.Add(combo_thresh, 1, wx.GROW|wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
378 378 sizer.Add(gradient, 1, wx.EXPAND|wx.TOP|wx.LEFT|wx.RIGHT|wx.BOTTOM, 6)
379 379 sizer.Fit(self)
380 380  
... ... @@ -388,7 +388,7 @@ class MaskProperties(wx.Panel):
388 388 self.threshold_modes = proj.threshold_modes
389 389 self.threshold_modes_names = []
390 390 self.bind_evt_gradient = True
391   - self.__bind_events()
  391 + #self.__bind_events()
392 392 self.__bind_events_wx()
393 393  
394 394  
... ... @@ -432,9 +432,9 @@ class MaskProperties(wx.Panel):
432 432 def __bind_events_wx(self):
433 433 self.Bind(grad.EVT_THRESHOLD_CHANGED, self.OnSlideChanged, self.gradient)
434 434 self.Bind(grad.EVT_THRESHOLD_CHANGING, self.OnSlideChanging, self.gradient)
435   - self.combo_thresh.Bind(wx.EVT_COMBOBOX, self.OnComboThresh)
436   - self.combo_mask_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)
437   - self.button_colour.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
  435 + #self.combo_thresh.Bind(wx.EVT_COMBOBOX, self.OnComboThresh)
  436 + #self.combo_mask_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)
  437 + #self.button_colour.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
438 438  
439 439 def SelectMaskName(self, pubsub_evt):
440 440 index = pubsub_evt.data
... ...