Changeset 4c01978 in sasview

Timestamp:

Mar 25, 2011 11:09:31 AM (14 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:

fcc5680

Parents:

d18e208

Message:

add new menu item to load project and load application

Location:

guiframe

Files:

• config.py (modified) (1 diff)
• gui_manager.py (modified) (5 diffs)

guiframe/config.py

@@ -46 +46 @@
 #PLUGIN_STATE_EXTENSIONS = ['.prv','.fitv', '.inv']
 #APPLICATION_STATE_EXTENSION = '.svs'
-#WLIST = ['SansView files (*.svs)|*.svs','P(r) files (*.prv)|*.prv',
+#PLUGINS_WLIST = ['P(r) files (*.prv)|*.prv',
 #                  'Fitting files (*.fitv)|*.fitv',
 #                  'Invariant files (*.inv)|*.inv']
-
+#APPLICATION_WLIST = 'SansView files (*.svs)|*.svs'
+APPLICATION_WLIST = ''
+APPLICATION_STATE_EXTENSION = None
+PLUGINS_WLIST = []
 PLUGIN_STATE_EXTENSIONS = []
-APPLICATION_STATE_EXTENSION = None
-WLIST = []
 SPLASH_SCREEN_PATH = "images/danse_logo.png"     
 DEFAULT_STYLE = GUIFRAME.SINGLE_APPLICATION

guiframe/gui_manager.py

@@ -53 +53 @@
 #read some constants from config
 APPLICATION_STATE_EXTENSION = config.APPLICATION_STATE_EXTENSION
-
 APPLICATION_NAME = config.__appname__
 SPLASH_SCREEN_PATH = config.SPLASH_SCREEN_PATH
@@ -70 +69 @@
 EXTENSIONS = PLUGIN_STATE_EXTENSIONS + extension_list
 try:
-    WLIST = '|'.join(config.WLIST)
+    PLUGINS_WLIST = '|'.join(config.PLUGINS_WLIST)
 except:
-    WLIST = ''
-
+    PLUGINS_WLIST = ''
+APPLICATION_WLIST = config.APPLICATION_WLIST
 
 class ViewerFrame(wx.Frame):
@@ -798 +797 @@
         self._file_menu = wx.Menu()
         style = self.__gui_style & GUIFRAME.DATALOADER_ON
+        style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
         if style == GUIFRAME.DATALOADER_ON:
-            # some menu of plugin to be seen under file menu
-            hint_load_file = "Read state's files and load"
-            hint_load_file += " them into the application"
+            if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
+                # some menu of plugin to be seen under file menu
+                hint_load_file = "Read state's files and load"
+                hint_load_file += " them into the application"
+                id = wx.NewId()
+                self._save_appl_menu = self._file_menu.Append(id, 
+                                        '&Load Application', hint_load_file)
+                wx.EVT_MENU(self, id, self._on_open_state_application)
+                
             id = wx.NewId()
+            hint_load_file = "read all applications states save previously"
             self._save_appl_menu = self._file_menu.Append(id, 
-                                    '&Open State from File', hint_load_file)
-            wx.EVT_MENU(self, id, self._on_open_state)
-            id = wx.NewId()
-            self._save_appl_menu = self._file_menu.Append(id, 
+                                    '&Load Project', hint_load_file)
+            wx.EVT_MENU(self, id, self._on_open_state_project)
+           
+            if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
+                self._file_menu.AppendSeparator()
+                id = wx.NewId()
+                self._save_appl_menu = self._file_menu.Append(id, 
                                                           '&Save Application',
                                  'Save state of the current active application')
-            wx.EVT_MENU(self, id, self._on_save_application)
+                wx.EVT_MENU(self, id, self._on_save_application)
             id = wx.NewId()
             self._file_menu.Append(id, '&Save Project',
@@ -1069 +1079 @@
             print error_message
            
-            
-    def _on_open_state(self, event):
+      
+    def _on_open_state_application(self, event):
         """
         """
@@ -1080 +1090 @@
                             "Choose a file", 
                             self._default_save_location, "",
-                             WLIST)
+                             PLUGINS_WLIST)
+        if dlg.ShowModal() == wx.ID_OK:
+            path = dlg.GetPath()
+            if path is not None:
+                self._default_save_location = os.path.dirname(path)
+        dlg.Destroy()
+        self.load_state(path=path)  
+            
+    def _on_open_state_project(self, event):
+        """
+        """
+        path = None
+        if self._default_save_location == None:
+            self._default_save_location = os.getcwd()
+ 
+        dlg = wx.FileDialog(self, 
+                            "Choose a file", 
+                            self._default_save_location, "",
+                             APPLICATION_WLIST)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()