From fa85ee4564538af0520812b2c3e485c8d209537b Mon Sep 17 00:00:00 2001
From: tatiana <tatiana.alchueyr@gmail.com>
Date: Mon, 4 Jan 2010 20:01:52 +0000
Subject: [PATCH] EHN: #53 - show/hide text improvements

---
 invesalius/data/viewer_slice.py  |  5 +++--
 invesalius/data/viewer_volume.py | 20 ++++++++++++++++++--
 invesalius/gui/frame.py          |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py
index 754a42a..676f781 100755
--- a/invesalius/data/viewer_slice.py
+++ b/invesalius/data/viewer_slice.py
@@ -131,14 +131,15 @@ class Viewer(wx.Panel):
         self.__configure_scroll()
 
     def HideTextActors(self, change_status=True):
-        self.wl_text.Hide()
+        if self.wl_text:
+            self.wl_text.Hide()
         [t.Hide() for t in self.orientation_texts]
         self.interactor.Render()
         if change_status:
             self.on_text = False
 
     def ShowTextActors(self):
-        if self.on_wl:
+        if self.on_wl and self.wl_text:
             self.wl_text.Show()
         [t.Show() for t in self.orientation_texts]
         self.Update()
diff --git a/invesalius/data/viewer_volume.py b/invesalius/data/viewer_volume.py
index da05d63..5783a5c 100755
--- a/invesalius/data/viewer_volume.py
+++ b/invesalius/data/viewer_volume.py
@@ -118,6 +118,21 @@ class Viewer(wx.Panel):
         ps.Publisher().subscribe(self.OnEnableStyle, 'Enable style')
         ps.Publisher().subscribe(self.OnDisableStyle, 'Disable style')
 
+        ps.Publisher().subscribe(self.OnHideText,
+                                 'Hide text actors on viewers')
+
+        ps.Publisher().subscribe(self.OnShowText,
+                                 'Show text actors on viewers')
+
+    def OnHideText(self, pubsub_evt):
+        self.text.Hide()
+        self.interactor.Render()
+
+    def OnShowText(self, pubsub_evt):
+        if self.on_wl:
+            self.text.Show()
+            self.interactor.Render()
+
     def __bind_events_wx(self):
         #self.Bind(wx.EVT_SIZE, self.OnSize)
         pass
@@ -158,8 +173,9 @@ class Viewer(wx.Panel):
 
         if state == const.STATE_WL:
             self.on_wl = True
-            self.text.Show()
-            self.interactor.Render()
+            if self.raycasting_volume:
+                self.text.Show()
+                self.interactor.Render()
         else:
             self.on_wl = False
             self.text.Hide()
diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py
index e9e89b8..3a0e67f 100755
--- a/invesalius/gui/frame.py
+++ b/invesalius/gui/frame.py
@@ -785,6 +785,7 @@ class LayoutToolBar(wx.ToolBar):
 
         self.AddLabelTool(ID_LAYOUT, "",bitmap=self.BMP_WITHOUT_MENU, shortHelp= "Hide task panel")
         self.AddCheckTool(ID_TEXT, bitmap=BMP_TEXT, shortHelp= "Hide texts")
+        self.ToggleTool(ID_TEXT, True)
 
         self.Realize()
 
--
libgit2 0.21.2