Commit 9a71385e327a7fc91159a59ac09a58ca090b6352

Authored by Thiago Franco de Moraes
1 parent be816908

Fixed the problems with cancel button when closing invesalius

invesalius/control.py
@@ -193,7 +193,7 @@ class Controller(): @@ -193,7 +193,7 @@ class Controller():
193 Publisher.sendMessage("Enable state project", False) 193 Publisher.sendMessage("Enable state project", False)
194 Publisher.sendMessage('Set project name') 194 Publisher.sendMessage('Set project name')
195 Publisher.sendMessage("Stop Config Recording") 195 Publisher.sendMessage("Stop Config Recording")
196 - #Publisher.sendMessage("Exit") 196 + Publisher.sendMessage("Exit")
197 elif answer == 1: 197 elif answer == 1:
198 self.ShowDialogSaveProject() 198 self.ShowDialogSaveProject()
199 utils.debug("Save changes and close") 199 utils.debug("Save changes and close")
@@ -201,7 +201,7 @@ class Controller(): @@ -201,7 +201,7 @@ class Controller():
201 Publisher.sendMessage("Enable state project", False) 201 Publisher.sendMessage("Enable state project", False)
202 Publisher.sendMessage('Set project name') 202 Publisher.sendMessage('Set project name')
203 Publisher.sendMessage("Stop Config Recording") 203 Publisher.sendMessage("Stop Config Recording")
204 - #Publisher.sendMessage("Exit") 204 + Publisher.sendMessage("Exit")
205 elif answer == -1: 205 elif answer == -1:
206 utils.debug("Cancel") 206 utils.debug("Cancel")
207 else: 207 else:
@@ -209,11 +209,11 @@ class Controller(): @@ -209,11 +209,11 @@ class Controller():
209 Publisher.sendMessage("Enable state project", False) 209 Publisher.sendMessage("Enable state project", False)
210 Publisher.sendMessage('Set project name') 210 Publisher.sendMessage('Set project name')
211 Publisher.sendMessage("Stop Config Recording") 211 Publisher.sendMessage("Stop Config Recording")
212 - #Publisher.sendMessage("Exit") 212 + Publisher.sendMessage("Exit")
213 213
214 else: 214 else:
215 Publisher.sendMessage('Stop Config Recording') 215 Publisher.sendMessage('Stop Config Recording')
216 - #Publisher.sendMessage('Exit') 216 + Publisher.sendMessage('Exit')
217 217
218 218
219 ########################### 219 ###########################
@@ -254,10 +254,6 @@ class Controller(): @@ -254,10 +254,6 @@ class Controller():
254 self.Slice.window_level = proj.level 254 self.Slice.window_level = proj.level
255 self.Slice.window_width = proj.window 255 self.Slice.window_width = proj.window
256 256
257 - mask = msk.Mask()  
258 - mask._set_class_index(proj.last_mask_index)  
259 - self.mask_dict_copy = proj.mask_dict.copy()  
260 -  
261 Publisher.sendMessage('Update threshold limits list', 257 Publisher.sendMessage('Update threshold limits list',
262 proj.threshold_range) 258 proj.threshold_range)
263 259
invesalius/gui/frame.py
@@ -348,7 +348,6 @@ class Frame(wx.Frame): @@ -348,7 +348,6 @@ class Frame(wx.Frame):
348 Close all project data. 348 Close all project data.
349 """ 349 """
350 Publisher.sendMessage('Close Project') 350 Publisher.sendMessage('Close Project')
351 - Publisher.sendMessage('Exit')  
352 351
353 def OnMenuClick(self, evt): 352 def OnMenuClick(self, evt):
354 """ 353 """