Changeset ba535a6 in sasview

Timestamp:

Apr 9, 2010 11:01:36 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

2fc9243

Parents:

f71c2de

Message:

change open in menu file to load data

Location:

guiframe

Files:

• gui_manager.py (modified) (3 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)

guiframe/gui_manager.py

@@ -46 +46 @@
 import logging
 
+
+
+def quit_guiframe(parent=None):
+    """
+        Pop up message to make sure the user wants to quit the application
+    """
+    message = "Do you really want to quit \n"
+    message += "this application?"
+    dial = wx.MessageDialog(parent, message, 'Question',
+                       wx.YES_NO|wx.NO_DEFAULT|wx.ICON_QUESTION)
+    if dial.ShowModal() == wx.ID_YES:
+        return True
+    else:
+        return False
+    
 class Plugin:
     """
@@ -484 +499 @@
         
         id = wx.NewId()
-        self.filemenu.Append(id, '&Open', 'Open a file')
+        self.filemenu.Append(id, '&Load Data', 'Load data file into the application')
         wx.EVT_MENU(self, id, self._on_open)
         #self.filemenu.AppendSeparator()
@@ -710 +725 @@
             Quit the application
         """
-        import sys
-        wx.Frame.Close(self)
-        wx.Exit()
-        sys.exit()
-
-  
+        flag = quit_guiframe(parent=self)
+        if flag:
+            import sys
+            wx.Frame.Close(self)
+            wx.Exit()
+            sys.exit()
+
     def _check_update(self, event=None): 
         """

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -327 +327 @@
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):
                 new_plot.group_id = self.plots[self.graph.selected_plottable].group_id
-                new_plot.id = self.plots[self.graph.selected_plottable].id
+                if hasattr(self.plots[self.graph.selected_plottable],"id"):
+                    new_plot.id = self.plots[self.graph.selected_plottable].id
+                else:
+                    new_plot.id = str(time.time())
             else:
                 new_plot.group_id = str(time.time())
@@ -408 +411 @@
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):
                 new_plot.group_id = self.plots[self.graph.selected_plottable].group_id
-                new_plot.id = self.plots[self.graph.selected_plottable].id
+                if hasattr(self.plots[self.graph.selected_plottable],"id"):
+                    new_plot.id = self.plots[self.graph.selected_plottable].id
+                else:
+                    new_plot.id = str(time.time())
             else:
                 new_plot.group_id = str(time.time())