Changeset c553b18 in sasview

Timestamp:

Sep 9, 2011 1:21:48 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:

baf1ef3

Parents:

8dcc4539

Message:

remember the last folder opened/saved

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (4 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -1571 +1571 @@
             error_message += str(sys.exc_value) + "\n"
             print error_message
-        print "_default_save_location", self._default_save_location  
+ 
     def load_folder(self, path):
         """
@@ -1678 +1678 @@
         """
         ## Default file location for save
-        self._default_save_location = os.getcwd()
+        #self._default_save_location = os.getcwd()
         if self._current_perspective is  None:
             return

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/data_loader.py

@@ -83 +83 @@
         """
         path = None
+        self._default_save_location = self.parent._default_save_location
         if self._default_save_location == None:
             self._default_save_location = os.getcwd()
@@ -123 +124 @@
         """
         path = None
+        self._default_save_location = self.parent._default_save_location
         if self._default_save_location == None:
             self._default_save_location = os.getcwd()

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -80 +80 @@
         self.x_size = None
         ## Default locations
-        self._default_save_location = os.getcwd() 
+        #self._default_save_location = os.getcwd() 
         self.size = None       
         ## Graph        
@@ -620 +620 @@
             try:
                 self._default_save_location = os.path.dirname(path)
+                self.parent._default_save_location = self._default_save_location
             except:
                 pass    
@@ -633 +634 @@
         path = None
         wildcard = "Text files (*.txt)|*.txt|"\
-        "CanSAS 1D files(*.xml)|*.xml" 
+                    "CanSAS 1D files(*.xml)|*.xml" 
+        default_name = self.plots[self.graph.selected_plottable].label
+        if default_name.count('.') > 0:
+            default_name = default_name.split('.')[0]
+        default_name += "_out"
+        if self.parent != None:
+            self._default_save_location = self.parent._default_save_location
         dlg = wx.FileDialog(self, "Choose a file",
                             self._default_save_location,
-                             "", wildcard , wx.SAVE)
+                            default_name, wildcard , wx.SAVE)
        
         if dlg.ShowModal() == wx.ID_OK:
@@ -673 +680 @@
             try:
                 self._default_save_location = os.path.dirname(path)
+                self.parent._default_save_location = self._default_save_location
             except:
                 pass    

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -746 +746 @@
         """
         id = str(evt.GetId())
+        if self.parent != None:
+            self._default_save_location = self.parent._default_save_location
         if id in self.action_ids:         
             
@@ -784 +786 @@
                 try:
                     self._default_save_location = os.path.dirname(path)
+                    self.parent._default_save_location = \
+                                            self._default_save_location 
                 except:
                     pass