Changeset 850525c in sasview for sansguiframe/src/sans/guiframe/data_processor.py

Timestamp:

Sep 9, 2011 5:24:12 PM (13 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:

06772f6

Parents:

6446f87

Message:

working data processor

File:

• sansguiframe/src/sans/guiframe/data_processor.py (modified) (5 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -6 +6 @@
 import math
 import re
+import os
 import sys
 import copy
@@ -625 +626 @@
     Allow to select where the result of batch will be displayed or stored
     """
-    def __init__(self, parent=None, data=None, *args, **kwds):
+    def __init__(self, parent=None, data=None, file_name="",
+                 details="", *args, **kwds):
         """
         :param parent: Window instantiating this dialog
@@ -631 +633 @@
                 application.
         """
-        kwds['style'] = wx.CAPTION|wx.SYSTEM_MENU 
+        #kwds['style'] = wx.CAPTION|wx.SYSTEM_MENU 
         wx.Dialog.__init__(self, parent, *args, **kwds)
         self.parent = parent
+        self.file_name = file_name
+        self.details = details
         self.data = data
         self.flag = 1
@@ -667 +671 @@
         self.external_app_selected.SetValue(False)
         self.save_to_file.SetValue(False)
-  
         button_OK = wx.Button(self, wx.ID_OK, "Ok")
         button_OK.SetFocus()
@@ -700 +703 @@
         """
         if self.save_to_file.GetValue():
-            self.flag = 3
-            if self.parent is not None and  self.data is not None:
-                self.parent.save_batch_into_file(self.data)
-        elif self.local_app_selected.GetValue():
+            reader, ext = os.path.splitext(self.file_name)
+            path = None
+            location = os.getcwd()
+            if self.parent is not None: 
+                location = self.parent._default_save_location
+                dlg = wx.FileDialog(self, "Save Project file",
+                            location, self.file_name, ext, wx.SAVE)
+                path = None
+                if dlg.ShowModal() == wx.ID_OK:
+                    path = dlg.GetPath()
+                    if self.parent is not None:
+                        self.parent._default_save_location = os.path.dirname(path)
+                dlg.Destroy()
+                if path != None:
+                    if self.parent is not None and  self.data is not None:
+                        self.parent.write_batch_output(data=self.data, 
+                                               file_name=path,
+                                               details=self.details)
+        
+        if self.local_app_selected.GetValue():
             self.flag = 1
         else:
             self.flag = 2
         return self.flag
+    
+    def save_file(self):
+        """
+        Save inot file
+        """
+