Changeset c4ae1c2 in sasview for invariantview/src/sans

Timestamp:

Sep 9, 2011 2:15:01 PM (13 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:

2f81957

Parents:

baf1ef3

Message:

correction: default folder for inv and pr

File:

• invariantview/src/sans/perspectives/invariant/invariant_panel.py (modified) (2 diffs)

invariantview/src/sans/perspectives/invariant/invariant_panel.py

@@ -95 +95 @@
         self.reset_panel()
         self._reset_state_list()
-        
+        ## Default file location for save
+        self._default_save_location = os.getcwd()        
         if self.parent is not None:
             msg = ""
             wx.PostEvent(self.parent,StatusEvent(status=msg, info="info"))
-            
-        ## Default file location for save
-        self._default_save_location = os.getcwd()
+            self._default_save_location =\
+                        self.parent._default_save_location
+        
         self._set_bookmark_flag(False)
     
@@ -1173 +1174 @@
         # Ask the user the location of the file to write to.
         path = None
+        if self.parent != None:
+            self._default_save_location =\
+             self.parent._default_save_location
+        if self._default_save_location == None:
+            self._default_save_location = os.getcwd()
         dlg = wx.FileDialog(self, "Choose a file",
-                            self._default_save_location, "", "*.inv", wx.SAVE)
+                            self._default_save_location, \
+                            self.window_caption, "*.inv", wx.SAVE)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
             self._default_save_location = os.path.dirname(path)
+            if self.parent != None:
+                self.parent._default_save_location =\
+                    self._default_save_location
         else:
             return None