Changeset 23cdeab in sasview

Timestamp:

May 10, 2011 12:01:52 PM (14 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:

4cac267a

Parents:

31f9c172

Message:

fixed a MAC problem, not saving a status file unless the file extension is typed in

Files:

• guiframe/gui_manager.py (modified) (2 diffs)
• invariantview/perspectives/invariant/invariant_panel.py (modified) (1 diff)
• prview/perspectives/pr/inversion_panel.py (modified) (1 diff)
• sansview/perspectives/fitting/basepage.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -1384 +1384 @@
     def _on_save_project(self, event):
         """
-        save the state of the current active application
+        save the state of the SansView as *.svs
         """
         ## Default file location for save
@@ -1413 +1413 @@
           
         # Write the XML document
+        extens = APPLICATION_STATE_EXTENSION
+        fName = os.path.splitext(path)[0] + extens
         if doc != None:
-            fd = open(path, 'w')
+            fd = open(fName, 'w')
             fd.write(doc.toprettyxml())
             fd.close()

invariantview/perspectives/invariant/invariant_panel.py

@@ -1182 +1182 @@
         
         dlg.Destroy()
-        
-        self._manager.save_file(filepath=path, state=self.state)
+        # MAC always needs the extension for saving
+        extens = ".inv"
+        # Make sure the ext included in the file name
+        fName = os.path.splitext(path)[0] + extens
+        self._manager.save_file(filepath=fName, state=self.state)
         
     def _show_message(self, mssg='',msg='Warning'):

prview/perspectives/pr/inversion_panel.py

@@ -271 +271 @@
         
         state = self.get_state()
-            
-        self._manager.save_data(filepath=path, prstate=state)
+        
+        # MAC always needs the extension for saving
+        extens = ".prv"
+        # Make sure the ext included in the file name
+        fName = os.path.splitext(path)[0] + extens
+        self._manager.save_data(filepath=fName, prstate=state)
         
         return state

sansview/perspectives/fitting/basepage.py

@@ -524 +524 @@
         else:
             return None
+        # MAC always needs the extension for saving
+        extens = ".fitv"
+        # Make sure the ext included in the file name
+        fName = os.path.splitext(path)[0] + extens
         #the manager write the state into file
-        self._manager.save_fit_state(filepath=path, fitstate=new_state)
+        self._manager.save_fit_state(filepath=fName, fitstate=new_state)
         return new_state