Ok and cancel button in select parts dialog

Thiago Franco de Moraes
1 parent 6d45778d
Showing 2 changed files with 27 additions and 6 deletions Show diff stats
invesalius/data/styles.py
invesalius/gui/dialogs.py
@@ -1904,20 +1904,28 @@ class SelectMaskPartsInteractorStyle(DefaultInteractorStyle):
             self.dlg.Show()
     def CleanUp(self):
-        if (self.dlg is not None) and (self.config.dlg_visible):
+        if self.dlg is None:
+            return
+
+        dialog_return = self.dlg.button_clicked
+
+        if self.config.dlg_visible:
             self.config.dlg_visible = False
             self.dlg.Destroy()
             self.dlg = None
         if self.config.mask:
-            self.config.mask.name = self.config.mask_name
-            self.viewer.slice_._add_mask_into_proj(self.config.mask)
-            self.viewer.slice_.SelectCurrentMask(self.config.mask.index)
-            Publisher.sendMessage('Change mask selected', self.config.mask.index)
-            self.config.mask = None
+            if dialog_return == wx.OK:
+                self.config.mask.name = self.config.mask_name
+                self.viewer.slice_._add_mask_into_proj(self.config.mask)
+                self.viewer.slice_.SelectCurrentMask(self.config.mask.index)
+                Publisher.sendMessage('Change mask selected', self.config.mask.index)
+
             del self.viewer.slice_.aux_matrices['SELECT']
             self.viewer.slice_.to_show_aux = ''
             Publisher.sendMessage('Reload actual slice')
+            self.config.mask = None
+
     def OnSelect(self, obj, evt):
         if (self.viewer.slice_.buffer_slices[self.orientation].mask is None):
@@ -2024,6 +2024,8 @@ class SelectPartsOptionsDialog(wx.Dialog):
         self.config = config
+        self.button_clicked = wx.CANCEL
+
         self._init_gui()
     def _init_gui(self):
@@ -2097,10 +2099,21 @@ class SelectPartsOptionsDialog(wx.Dialog):
         sizer.Fit(self)
         self.Layout()
+        self.btn_ok.Bind(wx.EVT_BUTTON, self.OnOk)
+        self.btn_cancel.Bind(wx.EVT_BUTTON, self.OnCancel)
+
         self.target_name.Bind(wx.EVT_CHAR, self.OnChar)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnSetRadio)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
+    def OnOk(self, evt):
+        self.button_clicked = wx.OK
+        self.Close()
+
+    def OnCancel(self, evt):
+        self.button_clicked = wx.CANCEL
+        self.Close()
+
     def OnChar(self, evt):
         evt.Skip()
         self.config.mask_name = self.target_name.GetValue()