Changing mask being previewd on volume when changing mask

Thiago Franco de Moraes
1 parent e02c9d5b
Showing 4 changed files with 14 additions and 2 deletions Show diff stats
invesalius/control.py
invesalius/data/mask.py
invesalius/data/slice_.py
invesalius/session.py
@@ -1115,7 +1115,7 @@ class Controller():
                 pass
         if err_msg:
-            dialog.MessageBox(None, "It was not possible to launch new instance of InVesalius3 dsfa dfdsfa sdfas fdsaf asdfasf dsaa", err_msg)
+            dialog.MessageBox(None, "It was not possible to launch new instance of InVesalius3", err_msg)
     def show_mask_preview(self, index, flag=True):
         proj = prj.Project()
@@ -1126,6 +1126,7 @@ class Controller():
         Publisher.sendMessage("Reload actual slice")
     def enable_mask_preview(self):
+        ses.Session().mask_3d_preview = True
         mask = self.Slice.current_mask
         if mask is not None:
             self.Slice.do_threshold_to_all_slices(mask)
@@ -1134,6 +1135,7 @@ class Controller():
             Publisher.sendMessage("Render volume viewer")
     def disable_mask_preview(self):
+        ses.Session().mask_3d_preview = False
         mask = self.Slice.current_mask
         if mask is not None:
             Publisher.sendMessage("Remove mask preview", mask_3d_actor=mask.volume._actor)
@@ -248,6 +248,9 @@ class Mask():
     def on_show(self):
         self.history._config_undo_redo(self.is_shown)
+        if ses.Session().mask_3d_preview:
+            Publisher.sendMessage('Show mask preview', index=self.index, flag=bool(self.is_shown))
+            Publisher.sendMessage("Render volume viewer")
     def create_3d_preview(self):
         if self.volume is None:
@@ -1178,6 +1178,10 @@ class Slice(metaclass=utils.Singleton):
     def SelectCurrentMask(self, index):
         "Insert mask data, based on given index, into pipeline."
+        if self.current_mask:
+            self.current_mask.is_shown = False
+            self.current_mask.on_show()
+
         proj = Project()
         future_mask = proj.GetMask(index)
         future_mask.is_shown = True
@@ -1394,6 +1398,8 @@ class Slice(metaclass=utils.Singleton):
         Publisher.sendMessage("Add mask", mask=mask)
         if show:
+            if self.current_mask:
+                self.current_mask.is_shown = False
             self.current_mask = mask
             Publisher.sendMessage("Show mask", index=mask.index, value=True)
             Publisher.sendMessage("Change mask selected", index=mask.index)
@@ -54,6 +54,7 @@ class Session(metaclass=Singleton):
     def __init__(self):
         self.project_path = ()
         self.temp_item = False
+        self.mask_3d_preview = False
         self._values = collections.defaultdict(dict, {
             'session': {
@@ -128,7 +129,7 @@ class Session(metaclass=Singleton):
         return object.__getattribute__(self, '_values')[session][key]
     def __setattr__(self, name, value):
-        if name in ("temp_item", "_map_attrs", "_values", "project_path"):
+        if name in ("temp_item", "_map_attrs", "_values", "project_path", "mask_3d_preview"):
             return object.__setattr__(self, name, value)
         else:
             session, key = self._map_attrs[name]