Commit fa85ee4564538af0520812b2c3e485c8d209537b
1 parent
78bd360e
Exists in
master
and in
6 other branches
EHN: #53 - show/hide text improvements
Showing
3 changed files
with
22 additions
and
4 deletions
Show diff stats
invesalius/data/viewer_slice.py
| @@ -131,14 +131,15 @@ class Viewer(wx.Panel): | @@ -131,14 +131,15 @@ class Viewer(wx.Panel): | ||
| 131 | self.__configure_scroll() | 131 | self.__configure_scroll() |
| 132 | 132 | ||
| 133 | def HideTextActors(self, change_status=True): | 133 | def HideTextActors(self, change_status=True): |
| 134 | - self.wl_text.Hide() | 134 | + if self.wl_text: |
| 135 | + self.wl_text.Hide() | ||
| 135 | [t.Hide() for t in self.orientation_texts] | 136 | [t.Hide() for t in self.orientation_texts] |
| 136 | self.interactor.Render() | 137 | self.interactor.Render() |
| 137 | if change_status: | 138 | if change_status: |
| 138 | self.on_text = False | 139 | self.on_text = False |
| 139 | 140 | ||
| 140 | def ShowTextActors(self): | 141 | def ShowTextActors(self): |
| 141 | - if self.on_wl: | 142 | + if self.on_wl and self.wl_text: |
| 142 | self.wl_text.Show() | 143 | self.wl_text.Show() |
| 143 | [t.Show() for t in self.orientation_texts] | 144 | [t.Show() for t in self.orientation_texts] |
| 144 | self.Update() | 145 | self.Update() |
invesalius/data/viewer_volume.py
| @@ -118,6 +118,21 @@ class Viewer(wx.Panel): | @@ -118,6 +118,21 @@ class Viewer(wx.Panel): | ||
| 118 | ps.Publisher().subscribe(self.OnEnableStyle, 'Enable style') | 118 | ps.Publisher().subscribe(self.OnEnableStyle, 'Enable style') |
| 119 | ps.Publisher().subscribe(self.OnDisableStyle, 'Disable style') | 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 | def __bind_events_wx(self): | 136 | def __bind_events_wx(self): |
| 122 | #self.Bind(wx.EVT_SIZE, self.OnSize) | 137 | #self.Bind(wx.EVT_SIZE, self.OnSize) |
| 123 | pass | 138 | pass |
| @@ -158,8 +173,9 @@ class Viewer(wx.Panel): | @@ -158,8 +173,9 @@ class Viewer(wx.Panel): | ||
| 158 | 173 | ||
| 159 | if state == const.STATE_WL: | 174 | if state == const.STATE_WL: |
| 160 | self.on_wl = True | 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 | else: | 179 | else: |
| 164 | self.on_wl = False | 180 | self.on_wl = False |
| 165 | self.text.Hide() | 181 | self.text.Hide() |
invesalius/gui/frame.py
| @@ -785,6 +785,7 @@ class LayoutToolBar(wx.ToolBar): | @@ -785,6 +785,7 @@ class LayoutToolBar(wx.ToolBar): | ||
| 785 | 785 | ||
| 786 | self.AddLabelTool(ID_LAYOUT, "",bitmap=self.BMP_WITHOUT_MENU, shortHelp= "Hide task panel") | 786 | self.AddLabelTool(ID_LAYOUT, "",bitmap=self.BMP_WITHOUT_MENU, shortHelp= "Hide task panel") |
| 787 | self.AddCheckTool(ID_TEXT, bitmap=BMP_TEXT, shortHelp= "Hide texts") | 787 | self.AddCheckTool(ID_TEXT, bitmap=BMP_TEXT, shortHelp= "Hide texts") |
| 788 | + self.ToggleTool(ID_TEXT, True) | ||
| 788 | 789 | ||
| 789 | self.Realize() | 790 | self.Realize() |
| 790 | 791 |