Changeset 6694604 in sasview

Timestamp:

Jun 29, 2011 6:16:54 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

944b1a6

Parents:

0145a25

Message:

minor fixes including paste info

Files:

• guiframe/gui_manager.py (modified) (2 diffs)
• sansview/perspectives/fitting/basepage.py (modified) (4 diffs)

guiframe/gui_manager.py

@@ -1187 +1187 @@
         wx.EVT_MENU(self, GUIFRAME_ID.REDO_ID, self.on_redo_panel)
         self._edit_menu.AppendSeparator()
-        self._edit_menu.Append(GUIFRAME_ID.COPY_ID, '&Copy', 
+        self._edit_menu.Append(GUIFRAME_ID.COPY_ID, '&Copy Params', 
                                'Copy parameter values')
         wx.EVT_MENU(self, GUIFRAME_ID.COPY_ID, self.on_copy_panel)
-        self._edit_menu.Append(GUIFRAME_ID.PASTE_ID, '&Paste', 
+        self._edit_menu.Append(GUIFRAME_ID.PASTE_ID, '&Paste Params', 
                                'Paste parameter values')
         wx.EVT_MENU(self, GUIFRAME_ID.PASTE_ID, self.on_paste_panel)
         self._edit_menu.AppendSeparator()
         
-        self._edit_menu.Append(GUIFRAME_ID.PREVIEW_ID, '&Report',
+        self._edit_menu.Append(GUIFRAME_ID.PREVIEW_ID, '&Report Results',
                                'Preview current panel')
         wx.EVT_MENU(self, GUIFRAME_ID.PREVIEW_ID, self.on_preview_panel)
@@ -1201 +1201 @@
         #                       'Print current panel')
         #wx.EVT_MENU(self, GUIFRAME_ID.PRINT_ID, self.on_print_panel)
-        self._edit_menu.Append(GUIFRAME_ID.RESET_ID, '&Reset', 
+        self._edit_menu.Append(GUIFRAME_ID.RESET_ID, '&Reset Page', 
                                'Reset current panel')
         wx.EVT_MENU(self, GUIFRAME_ID.RESET_ID, self.on_reset_panel)

sansview/perspectives/fitting/basepage.py

@@ -538 +538 @@
             event.Skip()
         # It seems MAC needs wxCallAfter
-        flag = wx.CallAfter(self.get_copy)
+        wx.CallAfter(self.get_copy)
         
         # messages depending on the flag
-        self._copy_info(flag)
+        self._copy_info(None)
         
     def on_paste(self, event):
@@ -551 +551 @@
         # It seems MAC needs wxCallAfter for the setvalues 
         # for multiple textctrl items, otherwise it tends to crash once a while.
-        flag = wx.CallAfter(self.get_paste)
-        
+        wx.CallAfter(self.get_paste)
         # messages depending on the flag
-        self._copy_info(flag)
+        self._copy_info(True)
         
     def _copy_info(self, flag):
@@ -2697 +2696 @@
             text = data.GetText()
             wx.TheClipboard.Close()
-            
+    
         return None
     
@@ -2773 +2772 @@
             self._get_paste_helper(self.str_parameters, 
                                    self.orientation_params, context)
-            
+   
         return True