Changeset dcb0834 in sasview

Timestamp:

Feb 9, 2012 6:37:38 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4a9bce1

Parents:

223a154

Message:

enabled the exit confirm dialog

Files:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -21 +21 @@
 from binder import BindArtist
 from matplotlib.font_manager import FontProperties
-try:
-    from mpl_toolkits.mplot3d import Axes3D
-    PLOT_3D_ON = True
-except:
-    PLOT_3D_ON = False
+
 #from matplotlib import cm
 #from matplotlib.ticker import LinearLocator, FixedLocator, FormatStrFormatter
@@ -41 +37 @@
 import copy
 import numpy
+
+PLOT_3D_ON = False
+try:
+    from mpl_toolkits.mplot3d import Axes3D
+    PLOT_3D_ON = True
+except:
+    pass
 
 def show_tree(obj,d=0):

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2081 +2081 @@
         Pop up message to make sure the user wants to quit the application
         """
-        return True
-        #message = "\nDo you really want to exit this application?        \n\n"
-        #dial = wx.MessageDialog(self, message, 'Confirm Exit',
-        #                   wx.YES_NO|wx.YES_DEFAULT|wx.ICON_QUESTION)
-        #if dial.ShowModal() == wx.ID_YES:
-        #    return True
-        #else:
-        #    return False    
+        message = "\nDo you really want to exit this application?        \n\n"
+        dial = wx.MessageDialog(self, message, 'Confirm Exit',
+                           wx.YES_NO|wx.YES_DEFAULT|wx.ICON_QUESTION)
+        if dial.ShowModal() == wx.ID_YES:
+            return True
+        else:
+            return False    
         
     def Close(self, event=None):