Changeset 83eb1b52 in sasview for sansguiframe/src/sans/guiframe/gui_manager.py

Timestamp:

Sep 12, 2011 10:18:19 AM (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:

dc79cfc

Parents:

caf3a08f

Message:

modify batch dialog to frame window

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -38 +38 @@
 from sans.guiframe.gui_toolbar import GUIToolBar
 from sans.guiframe.data_processor import GridFrame
-from sans.guiframe.data_processor import BatchOutputDialog
+from sans.guiframe.data_processor import BatchOutputFrame
 from sans.guiframe.events import EVT_NEW_BATCH
 from sans.dataloader.loader import Loader
@@ -299 +299 @@
         ext = ".csv"
         file_name = "Batch_" + str(plugin_name)+ "_" + time_str + ext
+        file_name = self._default_save_location + str(file_name)
         #Need to save configuration for later 
-        dlg = BatchOutputDialog(parent=self, data=data, 
+        frame = BatchOutputFrame(parent=self, data=data, 
                                 file_name=file_name,
                                 details=details)
-        flag = None
-        if dlg.ShowModal() == wx.ID_CANCEL:
-            flag = dlg.flag
-            dlg.Show(True)
-        else:
-            dlg.Destroy()
-        if flag == 1:
-            self.batch_frame.set_data(data)
-            self.batch_frame.Show(True)
-        elif flag == 2:
-            file_name = self._default_save_location + str(file_name)
-            if not os.path.exists(file_name):
-                self.write_batch_output(data=data, file_name=file_name,
-                                               details=details)
-            self.deplay_in_external_app(data=data, file_name=file_name,
-                                         plugin_name=plugin_name)
-        
-    def write_batch_output(self, data, file_name, details=""):
+        frame.Show(True)
+    
+    def open_with_localapp(self, data):
+        """
+        Display value of data into the application grid
+        :param data: dictionary of string and list of items
+        """
+        self.batch_frame.set_data(data)
+        self.batch_frame.Show(True)
+        
+    def write_batch_tofile(self, data, file_name, details=""):
         """
         Helper to write result from batch into cvs file
         """
-        
+        self._default_save_location = os.path.dirname(file_name)
+        file_name = os.path.basename(file_name)
         if data is None or file_name is None or file_name.strip() == "":
             return
@@ -357 +352 @@
         fd.close()
             
-    def deplay_in_external_app(self, data, file_name, plugin_name):
+    def open_with_externalapp(self, data, file_name, details=""):
         """
         Display data in the another application , by default Excel
         """
+        if not os.path.exists(file_name):
+            self.write_batch_tofile(data=data, file_name=file_name,
+                                               details=details)
         try:
             from win32com.client import Dispatch