Streamlined head surface creation

invesalius/constants.py

@@ -820,6 +820,15 @@
 BRAIN_INTENSITY_MTMS = 8
 BRAIN_UUID = 9
 
+# Page order in the coregistration panel
+
+HEAD_PAGE = 0
+IMAGE_PAGE = 1
+TRACKER_PAGE = 2
+REFINE_PAGE = 3
+STYLUS_PAGE = 4
+STIMULATOR_PAGE = 5
+
 # ------------ Navigation defaults -------------------
 
 MARKER_COLOUR = (1.0, 1.0, 0.0)

invesalius/data/surface.py

@@ -315,13 +315,16 @@ def OnLargestSurface(self):
         Create a new surface, based on largest part of the last
         selected surface.
         """
+        progress_dialog = dialogs.SelectLargestSurfaceProgressWindow()
+        progress_dialog.Update()
         index = self.last_surface_index
         proj = prj.Project()
         surface = proj.surface_dict[index]
 
         new_polydata = pu.SelectLargestPart(surface.polydata)
         new_index = self.CreateSurfaceFromPolydata(new_polydata)
         Publisher.sendMessage("Show single surface", index=new_index, visibility=True)
+        progress_dialog.Close()
 
     def OnImportCustomBinFile(self, filename):
         import os

invesalius/gui/deep_learning_seg_dialog.py

@@ -48,7 +48,14 @@
 
 class DeepLearningSegmenterDialog(wx.Dialog):
     def __init__(
-        self, parent, title, has_torch=True, has_plaidml=True, has_theano=True, segmenter=None
+        self,
+        parent,
+        title,
+        auto_segment=False,
+        has_torch=True,
+        has_plaidml=True,
+        has_theano=True,
+        segmenter=None,
     ):
         wx.Dialog.__init__(
             self,
@@ -68,6 +75,7 @@ def __init__(
         #  self.pg_dialog = None
         self.torch_devices = TORCH_DEVICES
         self.plaidml_devices = PLAIDML_DEVICES
+        self.auto_segment = auto_segment
 
         self.backends = backends
 
@@ -87,6 +95,9 @@ def __init__(
         self.OnSetBackend()
         self.HideProgress()
 
+        if self.auto_segment:
+            self.OnSegment(self)
+
     def _init_gui(self):
         self.cb_backends = wx.ComboBox(
             self,
@@ -332,6 +343,10 @@ def AfterSegment(self):
         self.elapsed_time_timer.Stop()
         self.apply_segment_threshold()
 
+        if self.auto_segment:
+            self.OnClose(self)
+            Publisher.sendMessage("Brain segmentation completed")
+
     def SetProgress(self, progress):
         self.progress.SetValue(int(progress * 100))
         wx.GetApp().Yield()
@@ -361,8 +376,9 @@ def OnTickTimer(self, evt):
             if progress == np.inf:
                 progress = 1
                 self.AfterSegment()
-            progress = max(0, min(progress, 1))
-            self.SetProgress(float(progress))
+            else:
+                progress = max(0, min(progress, 1))
+                self.SetProgress(float(progress))
 
     def OnClose(self, evt):
         #  self.segmenter.stop = True
@@ -393,14 +409,15 @@ def ShowProgress(self):
 
 
 class BrainSegmenterDialog(DeepLearningSegmenterDialog):
-    def __init__(self, parent):
+    def __init__(self, parent, auto_segment=False):
         super().__init__(
             parent=parent,
             title=_("Brain segmentation"),
             has_torch=True,
             has_plaidml=True,
             has_theano=True,
             segmenter=segment.BrainSegmentProcess,
+            auto_segment=auto_segment,
         )
 
 

invesalius/gui/default_tasks.py

@@ -331,7 +331,6 @@ def __init__(self, parent):
                 elif name == _("Configure 3D surface"):
                     self.__id_surface = item.GetId()
 
-        fold_panel.Expand(fold_panel.GetFoldPanel(0))
         self.fold_panel = fold_panel
         self.image_list = image_list
 
@@ -342,6 +341,12 @@ def __init__(self, parent):
         self.SetSizerAndFit(sizer)
         self.__bind_events()
 
+        # Show the navigation panel in navigation mode; otherwise, show the imports panel
+        if mode == const.MODE_NAVIGATOR:
+            self.fold_panel.Expand(self.fold_panel.GetFoldPanel(1))
+        else:
+            self.fold_panel.Expand(self.fold_panel.GetFoldPanel(0))
+
     def __bind_events(self):
         session = ses.Session()
         mode = session.GetConfig("mode")

invesalius/gui/dialogs.py

@@ -1978,6 +1978,44 @@ def GetValue(self) -> Dict[str, Union[str, int, bool]]:
         }
 
 
+class SelectLargestSurfaceProgressWindow:
+    def __init__(self):
+        title = "InVesalius 3"
+        message = "Creating a new surface form the largest contiguous region..."
+        style = wx.PD_APP_MODAL | wx.PD_CAN_ABORT
+        parent = wx.GetApp().GetTopWindow()
+        self.dlg = wx.ProgressDialog(title, message, parent=parent, style=style)
+        self.dlg.Show()
+
+    def Update(self, msg: Optional[str] = None, value=None) -> None:
+        if msg is None:
+            self.dlg.Pulse()
+        else:
+            self.dlg.Pulse(msg)
+
+    def Close(self) -> None:
+        self.dlg.Destroy()
+
+
+class RemoveNonVisibleFacesProgressWindow:
+    def __init__(self):
+        title = "InVesalius 3"
+        message = "Removing non-visible faces..."
+        style = wx.PD_APP_MODAL | wx.PD_CAN_ABORT
+        parent = wx.GetApp().GetTopWindow()
+        self.dlg = wx.ProgressDialog(title, message, parent=parent, style=style)
+        self.dlg.Show()
+
+    def Update(self, msg: Optional[str] = None, value=None) -> None:
+        if msg is None:
+            self.dlg.Pulse()
+        else:
+            self.dlg.Pulse(msg)
+
+    def Close(self) -> None:
+        self.dlg.Destroy()
+
+
 class SurfaceTransparencyDialog(wx.Dialog):
     def __init__(
         self, parent: Optional[wx.Window], surface_index: int = 0, transparency: int = 0