Changeset 83eb1b52 in sasview

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

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (8 diffs)
• gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -622 +622 @@
       
       
-class BatchOutputDialog(wx.Dialog):
+class BatchOutputFrame(wx.Frame):
     """
     Allow to select where the result of batch will be displayed or stored
     """
-    def __init__(self, parent=None, data=None, file_name="",
+    def __init__(self, parent, data=None, file_name="",
                  details="", *args, **kwds):
         """
@@ -634 +634 @@
         """
         #kwds['style'] = wx.CAPTION|wx.SYSTEM_MENU 
-        wx.Dialog.__init__(self, parent, *args, **kwds)
+        wx.Frame.__init__(self, parent, *args, **kwds)
         self.parent = parent
+        self.panel = wx.Panel(self)
         self.file_name = file_name
         self.details = details
@@ -651 +652 @@
         """
         vbox = wx.BoxSizer(wx.VERTICAL)
-        box_description= wx.StaticBox(self, -1,str("Batch Outputs"))
+        box_description = wx.StaticBox(self.panel, -1, str("Batch Outputs"))
         hint_sizer = wx.StaticBoxSizer(box_description, wx.VERTICAL)
-        selection_sizer = wx.GridBagSizer(5,5)
+        selection_sizer = wx.GridBagSizer(5, 5)
         button_sizer = wx.BoxSizer(wx.HORIZONTAL)
         text = "Open with %s" % self.parent.application_name 
-        self.local_app_selected = wx.RadioButton(self, -1, text,
+        self.local_app_selected = wx.RadioButton(self.panel, -1, text,
                                                 style=wx.RB_GROUP)
         self.Bind(wx.EVT_RADIOBUTTON, self.onselect,
                     id=self.local_app_selected.GetId())
         text = "Open with Excel"
-        self.external_app_selected  = wx.RadioButton(self, -1, text)
+        self.external_app_selected  = wx.RadioButton(self.panel, -1, text)
         self.Bind(wx.EVT_RADIOBUTTON, self.onselect,
                     id=self.external_app_selected.GetId())
         text = "Save to File"
-        self.save_to_file = wx.CheckBox(self, -1, text)
+        self.save_to_file = wx.CheckBox(self.panel, -1, text)
         self.Bind(wx.EVT_CHECKBOX, self.onselect,
                     id=self.save_to_file.GetId())
@@ -671 +672 @@
         self.external_app_selected.SetValue(False)
         self.save_to_file.SetValue(False)
-        button_close = wx.Button(self, wx.ID_OK, "Close")
-        button_OK = wx.Button(self, wx.ID_CANCEL, "Apply")
-        button_OK.SetFocus()
+        button_close = wx.Button(self.panel, -1, "Close")
+        button_close.Bind(wx.EVT_BUTTON, id=button_close.GetId(),
+                           handler=self.on_close)
+        button_apply = wx.Button(self.panel, -1, "Apply")
+        button_apply.Bind(wx.EVT_BUTTON, id=button_apply.GetId(),
+                        handler=self.on_apply)
+        button_apply.SetFocus()
         hint = ""
-        hint_sizer.Add(wx.StaticText(self, -1, hint))
+        hint_sizer.Add(wx.StaticText(self.panel, -1, hint))
         hint_sizer.Add(selection_sizer)
         #draw area containing radio buttons
@@ -693 +698 @@
         button_sizer.Add(button_close, 0,
                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        button_sizer.Add(button_OK, 0,
+        button_sizer.Add(button_apply, 0,
                                 wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         vbox.Add(hint_sizer,  0, wx.EXPAND|wx.ALL, 10)
-        vbox.Add(wx.StaticLine(self, -1),  0, wx.EXPAND, 0)
+        vbox.Add(wx.StaticLine(self.panel, -1),  0, wx.EXPAND, 0)
         vbox.Add(button_sizer, 0 , wx.TOP|wx.BOTTOM, 10)
         self.SetSizer(vbox)
+        
+    def on_apply(self, event):
+        """
+        Get the user selection and display output to the selected application
+        """
+        if self.flag == 1:
+            self.parent.open_with_localapp(self.data)
+        elif self.flag == 2:
+            self.parent.open_with_externalapp(data=self.data, 
+                                           file_name=self.file_name,
+                                           details=self.details)
+    def on_close(self, event):
+        """
+        close the Window
+        """
+        self.Close()
         
     def onselect(self, event=None):
@@ -711 +732 @@
             location = os.getcwd()
             if self.parent is not None: 
-                location = self.parent._default_save_location
+                location = os.path.dirname(self.file_name)
                 dlg = wx.FileDialog(self, "Save Project file",
                             location, self.file_name, ext, wx.SAVE)
@@ -717 +738 @@
                 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, 
+                        self.parent.write_batch_tofile(data=self.data, 
                                                file_name=path,
                                                details=self.details)
-        
         if self.local_app_selected.GetValue():
             self.flag = 1
@@ -731 +749 @@
             self.flag = 2
         return self.flag
-    
-    def save_file(self):
-        """
-        Save inot file
-        """
-        
     
   

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