Download as
Browse Code »

Commit fa85ee4564538af0520812b2c3e485c8d209537b

Authored by tatiana
1 parent 78bd360e
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

EHN: #53 - show/hide text improvements

Showing 3 changed files with 22 additions and 4 deletions   Show diff stats
invesalius/data/viewer_slice.py
  Diff comments   View file @fa85ee4
... ... @@ -131,14 +131,15 @@ class Viewer(wx.Panel):
131 131 self.__configure_scroll()
132 132  
133 133 def HideTextActors(self, change_status=True):
134   - self.wl_text.Hide()
  134 + if self.wl_text:
  135 + self.wl_text.Hide()
135 136 [t.Hide() for t in self.orientation_texts]
136 137 self.interactor.Render()
137 138 if change_status:
138 139 self.on_text = False
139 140  
140 141 def ShowTextActors(self):
141   - if self.on_wl:
  142 + if self.on_wl and self.wl_text:
142 143 self.wl_text.Show()
143 144 [t.Show() for t in self.orientation_texts]
144 145 self.Update()
... ...
invesalius/data/viewer_volume.py
  Diff comments   View file @fa85ee4
... ... @@ -118,6 +118,21 @@ class Viewer(wx.Panel):
118 118 ps.Publisher().subscribe(self.OnEnableStyle, 'Enable style')
119 119 ps.Publisher().subscribe(self.OnDisableStyle, 'Disable style')
120 120  
  121 + ps.Publisher().subscribe(self.OnHideText,
  122 + 'Hide text actors on viewers')
  123 +
  124 + ps.Publisher().subscribe(self.OnShowText,
  125 + 'Show text actors on viewers')
  126 +
  127 + def OnHideText(self, pubsub_evt):
  128 + self.text.Hide()
  129 + self.interactor.Render()
  130 +
  131 + def OnShowText(self, pubsub_evt):
  132 + if self.on_wl:
  133 + self.text.Show()
  134 + self.interactor.Render()
  135 +
121 136 def __bind_events_wx(self):
122 137 #self.Bind(wx.EVT_SIZE, self.OnSize)
123 138 pass
... ... @@ -158,8 +173,9 @@ class Viewer(wx.Panel):
158 173  
159 174 if state == const.STATE_WL:
160 175 self.on_wl = True
161   - self.text.Show()
162   - self.interactor.Render()
  176 + if self.raycasting_volume:
  177 + self.text.Show()
  178 + self.interactor.Render()
163 179 else:
164 180 self.on_wl = False
165 181 self.text.Hide()
... ...
invesalius/gui/frame.py
  Diff comments   View file @fa85ee4
... ... @@ -785,6 +785,7 @@ class LayoutToolBar(wx.ToolBar):
785 785  
786 786 self.AddLabelTool(ID_LAYOUT, "",bitmap=self.BMP_WITHOUT_MENU, shortHelp= "Hide task panel")
787 787 self.AddCheckTool(ID_TEXT, bitmap=BMP_TEXT, shortHelp= "Hide texts")
  788 + self.ToggleTool(ID_TEXT, True)
788 789  
789 790 self.Realize()
790 791  
... ...