Changeset caf3a08f in sasview

Timestamp:

Sep 10, 2011 7:00:33 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:

83eb1b52

Parents:

06772f6

Message:

add functon to output result to excel

Location:

sansguiframe/src/sans/guiframe

Files:

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

sansguiframe/src/sans/guiframe/data_processor.py

@@ -655 +655 @@
         selection_sizer = wx.GridBagSizer(5,5)
         button_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        text = "Open with SansView"
+        text = "Open with %s" % self.parent.application_name 
         self.local_app_selected = wx.RadioButton(self, -1, text,
                                                 style=wx.RB_GROUP)
@@ -664 +664 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.onselect,
                     id=self.external_app_selected.GetId())
-        text = "Save to file"
+        text = "Save to File"
         self.save_to_file = wx.CheckBox(self, -1, text)
         self.Bind(wx.EVT_CHECKBOX, self.onselect,
@@ -671 +671 @@
         self.external_app_selected.SetValue(False)
         self.save_to_file.SetValue(False)
-        button_OK = wx.Button(self, wx.ID_OK, "Ok")
+        button_close = wx.Button(self, wx.ID_OK, "Close")
+        button_OK = wx.Button(self, wx.ID_CANCEL, "Apply")
         button_OK.SetFocus()
         hint = ""
@@ -689 +690 @@
         #contruction the sizer contaning button
         button_sizer.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+
+        button_sizer.Add(button_close, 0,
+                        wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         button_sizer.Add(button_OK, 0,
                                 wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -204 +204 @@
                     self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         self.path = PATH_APP
+        self.application_name = APPLICATION_NAME 
         ## Application manager
         self._input_file = None
@@ -298 +299 @@
         ext = ".csv"
         file_name = "Batch_" + str(plugin_name)+ "_" + time_str + ext
-        #Neeed to save configuration for later 
+        #Need to save configuration for later 
         dlg = BatchOutputDialog(parent=self, data=data, 
                                 file_name=file_name,
                                 details=details)
         flag = None
-        if dlg.ShowModal() == wx.ID_OK:
+        if dlg.ShowModal() == wx.ID_CANCEL:
             flag = dlg.flag
+            dlg.Show(True)
+        else:
             dlg.Destroy()
         if flag == 1:
@@ -310 +313 @@
             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)
+            self.deplay_in_external_app(data=data, file_name=file_name,
+                                         plugin_name=plugin_name)
         
     def write_batch_output(self, data, file_name, details=""):
@@ -352 +357 @@
         fd.close()
             
-    def deplay_in_external_app(self, data, file_name):
+    def deplay_in_external_app(self, data, file_name, plugin_name):
         """
         Display data in the another application , by default Excel
         """
+        try:
+            from win32com.client import Dispatch
+            excel_app = Dispatch('Excel.Application')     
+            wb = excel_app.Workbooks.Open(file_name) 
+            excel_app.Visible = 1
+        except:
+            msg = "Error occured when calling Excel\n"
+            msg += "Check that Excel in installed in this machine or \n"
+            msg += "Check that %s really exists.\n" % str(file_name)
+            wx.PostEvent(self, StatusEvent(status=msg,
+                                             info="error"))
+            
          
     def on_batch_selection(self, event):