Changeset 73197d0 in sasview

Timestamp:

Sep 9, 2011 3:57:52 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:

3bc6090

Parents:

7f76f89

Message:

working on batch gui

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (2 diffs)
• gui_manager.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -21 +21 @@
 FUNC_DICT = {"sqrt": "math.sqrt",
              "pow": "math.sqrt"}
+
+
+
 def parse_string(sentence, list):
     """
@@ -618 +621 @@
       
       
+class BatchOutputDialog(wx.Dialog):
+    """
+    Allow to select where the result of batch will be displayed or stored
+    """
+    def __init__(self, parent=None, data=None, *args, **kwds):
+        """
+        :param parent: Window instantiating this dialog
+        :param result: result to display in a grid or export to an external 
+                application.
+        """
+        kwds['style'] = wx.CAPTION|wx.SYSTEM_MENU 
+        wx.Dialog.__init__(self, parent, *args, **kwds)
+        self.parent = parent
+        self.data = data
+        self.flag = 1
+        self.SetSize((300, 200))
+        self.local_app_selected = None
+        self.external_app_selected = None
+        self.save_to_file = None
+        self._do_layout()
+
+    def _do_layout(self):
+        """
+        Draw the content of the current dialog window
+        """
+        vbox = wx.BoxSizer(wx.VERTICAL)
+        box_description= wx.StaticBox(self, -1,str("Batch Outputs"))
+        hint_sizer = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        selection_sizer = wx.GridBagSizer(5,5)
+        button_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        text = "Open with SansView"
+        self.local_app_selected = wx.RadioButton(self, -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.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.Bind(wx.EVT_CHECKBOX, self.onselect,
+                    id=self.save_to_file.GetId())
+        self.local_app_selected.SetValue(True)
+        self.external_app_selected.SetValue(False)
+        self.save_to_file.SetValue(False)
+  
+        button_OK = wx.Button(self, wx.ID_OK, "Ok")
+        button_OK.SetFocus()
+        hint = ""
+        hint_sizer.Add(wx.StaticText(self, -1, hint))
+        hint_sizer.Add(selection_sizer)
+        #draw area containing radio buttons
+        ix = 0
+        iy = 0
+        selection_sizer.Add(self.local_app_selected, (iy, ix),
+                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        iy += 1
+        selection_sizer.Add(self.external_app_selected, (iy, ix),
+                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        iy += 1
+        selection_sizer.Add(self.save_to_file, (iy, ix),
+                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        #contruction the sizer contaning button
+        button_sizer.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        button_sizer.Add(button_OK, 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(button_sizer, 0 , wx.TOP|wx.BOTTOM, 10)
+        self.SetSizer(vbox)
+        
+    def onselect(self, event=None):
+        """
+        Receive event and display data into third party application
+        or save data to file.
+        
+        """
+        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():
+            self.flag = 1
+        else:
+            self.flag = 2
+        return self.flag
+    
+  
+        
 if __name__ == "__main__":
     app = wx.App()

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -32 +32 @@
 from sans.guiframe.gui_style import GUIFRAME
 from sans.guiframe.gui_style import GUIFRAME_ID
-#from sans.guiframe.events import NewLoadedDataEvent
 from sans.guiframe.data_panel import DataPanel
 from sans.guiframe.panel_base import PanelBase
 from sans.guiframe.gui_toolbar import GUIToolBar
 from sans.guiframe.data_processor import GridFrame
+from sans.guiframe.data_processor import BatchOutputDialog
 from sans.guiframe.events import EVT_NEW_BATCH
 from sans.dataloader.loader import Loader
@@ -288 +288 @@
         Display data into a grid in batch mode and show the grid
         """
-        self.batch_frame.set_data(data)
-        self.batch_frame.Show(True)
-        
-        
+        #Neeed to save configuration for later 
+        dlg = BatchOutputDialog(self, data)
+        flag = None
+        if dlg.ShowModal() == wx.ID_OK:
+            flag = dlg.onselect()
+            dlg.Destroy()
+        if flag == 1:
+            self.batch_frame.set_data(data)
+            self.batch_frame.Show(True)
+        elif flag == 2:
+            self.deplay_in_external_app(data)
+        
+    def save_batch_into_file(self, data):
+        """
+        Save data into file. default extension is .csv
+        """
+    def deplay_in_external_app(self, data):
+        """
+        Display data in the another application , by default Excel
+        """
     def on_batch_selection(self, event):
         """