Changeset 0899c82 in sasview

Timestamp:

Jul 8, 2012 4:15:15 PM (12 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:

9696a10b

Parents:

e4cd34c

Message:

Added copy/paste on grid cells

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (15 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• local_perspectives/plotting/Plotter2D.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -132 +132 @@
         self.list_plot_panels = {}
         self.default_col_width = 75
-        self.EnableEditing(False)
+        self.EnableEditing(True)
         if self.GetNumberCols() > 0:
             self.default_col_width =  self.GetColSize(0)
@@ -139 +139 @@
         self.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.on_selected_cell)
         self.Bind(wx.grid.EVT_GRID_CMD_CELL_CHANGE, self.on_edit_cell)
-        
+        self.Bind(wx.grid.EVT_GRID_CELL_RIGHT_CLICK, self.onContextMenu)
         
     def on_edit_cell(self, event):
@@ -459 +459 @@
             self.data.update(item)
             
-        if len(self.data) + len(self.data_inputs) +len(self.data_outputs) == 0:
-            self.EnableEditing(False)
-        else:
-            self.EnableEditing(True)
+        #if len(self.data) + len(self.data_inputs) +len(self.data_outputs) == 0:
+        #    self.EnableEditing(False)
+        #else:
+        #    self.EnableEditing(True)
         if  len(self.data_outputs) > 0:
             self._cols = self.GetNumberCols()
@@ -541 +541 @@
         return self._rows
     
+    def onContextMenu(self, event):
+        """
+        Default context menu 
+        """
+        id = wx.NewId()
+        c_menu = wx.Menu()
+        copy_menu = c_menu.Append(id, '&Copy', 'Copy cell values')
+        wx.EVT_MENU(self, id, self.on_copy)
+        
+        id = wx.NewId()
+        paste_menu = c_menu.Append(id, '&Paste', 'Paste cell values')
+        wx.EVT_MENU(self, id, self.on_paste)
+        # enable from flag
+        has_selection = False
+        selected_cel = self.selected_cells
+        if len(selected_cel) > 0:
+            _row, _col = selected_cel[0]
+            has_selection = self.IsInSelection(_row, _col)
+        copy_menu.Enable(has_selection)
+        try:
+            # mouse event pos
+            pos_evt = event.GetPosition()
+            self.PopupMenu(c_menu, pos_evt)
+        except:
+            return
+    
+    def on_copy(self, event):
+        """
+        On copy event from the contextmenu
+        """
+        self.Copy()
+
+    def on_paste(self, event):
+        """
+        On paste event from the contextmenu
+        """
+        self.data = {}
+        self.Paste()
+    
 class Notebook(nb, PanelBase):
     """
@@ -574 +613 @@
         self.AddPage(grid, "", True)
         pos = self.GetPageIndex(grid)
-        title = "Grid" + str(self.gpage_num)
+        title = "Table" + str(self.gpage_num)
         self.SetPageText(pos, title)
         self.SetSelection(pos)
@@ -815 +854 @@
         grid.on_remove_column(event=None)
         
-        
 class GridPanel(SPanel):
     def __init__(self, parent, data_inputs=None,
@@ -898 +936 @@
                                                                     str(col))
                         wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+                             StatusEvent(status=msg, info="error"))
+                        return None
             else:
                 axis.append(None) 
@@ -934 +973 @@
                     wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
                                                                 info="error"))
-                    #time.sleep(0.5)
                     continue
                 else:
@@ -1119 +1157 @@
             col = column_names[col_name]
             axis = self.get_plot_axis(col, list)
+            if axis == None:
+                return None
             sentence = sentence.replace(tok, 
                                         "numpy.array(%s)" % str(axis))
@@ -1292 +1332 @@
         
         self.edit = wx.Menu()
+
+        self.copy_menu = self.edit.Append(-1, 'Copy', 'Copy cells')
+        wx.EVT_MENU(self, self.copy_menu.GetId(), self.on_copy)
+        self.paste_menu = self.edit.Append(-1, 'Paste', 'Paste Cells')
+        wx.EVT_MENU(self, self.paste_menu.GetId(), self.on_paste)
         hint = "Insert column before the selected column"
         self.insert_before_menu = wx.Menu()
-        self.insert_sub_menu = self.edit.AppendSubMenu(self.insert_before_menu, 
+        self.insertb_sub_menu = self.edit.AppendSubMenu(self.insert_before_menu, 
                                                       'Insert Before', hint)
- 
+        hint = "Insert column after the selected column"
+        self.insert_after_menu = wx.Menu()
+        self.inserta_sub_menu = self.edit.AppendSubMenu(self.insert_after_menu, 
+                                                      'Insert After', hint)
         hint = "Remove the selected column"
         self.remove_menu = self.edit.Append(-1, 'Remove Column', hint)
@@ -1304 +1352 @@
         menubar.Append(self.edit, "&Edit")
         self.Bind(wx.EVT_CLOSE, self.on_close)
+    
+    def on_copy(self, event):
+        """
+        On Copy
+        """
+        pos = self.panel.notebook.GetSelection()
+        grid = self.panel.notebook.GetPage(pos)
+        grid.Copy()
+        
+    def on_paste(self, event):
+        """
+        On Paste
+        """
+        pos = self.panel.notebook.GetSelection()
+        grid = self.panel.notebook.GetPage(pos)
+        grid.on_paste(event)
+     
     def GetLabelText(self, id):
         """
+        Get Label Text
         """
         for item in self.insert_before_menu.GetMenuItems():
@@ -1314 +1380 @@
     def on_remove_column(self, event):
         """
+        On remove column
         """
         pos = self.panel.notebook.GetSelection()
@@ -1321 +1388 @@
     def on_menu_open(self, event):
         """
-        
+        On menu open
         """
         if self.edit == event.GetMenu():
@@ -1328 +1395 @@
             grid = self.panel.notebook.GetPage(pos)
             col_list = grid.GetSelectedCols()
+            #has_selection = False
+            #selected_cel = grid.selected_cells
+            #if len(selected_cel) > 0:
+            #    has_selection = True
+            #self.copy_menu.Enable(has_selection)
+            
+            has_selection = False
+            selected_cel = grid.selected_cells
+            if len(selected_cel) > 0:
+                _row, _col = selected_cel[0]
+                has_selection = grid.IsInSelection(_row, _col)
+            self.copy_menu.Enable(has_selection)
+        
             if len(col_list) > 0:
                 self.remove_menu.Enable(True)
@@ -1333 +1413 @@
                 self.remove_menu.Enable(False)
             if len(col_list) == 0 or len(col_list) > 1:
-                self.insert_sub_menu.Enable(False)
-                
+                self.insertb_sub_menu.Enable(False)
+                self.inserta_sub_menu.Enable(False)
                 label = "Insert Column Before"
-                self.insert_sub_menu.SetText(label)
+                self.insertb_sub_menu.SetText(label)
+                label = "Insert Column After"
+                self.inserta_sub_menu.SetText(label)
             else:
-                self.insert_sub_menu.Enable(True)
+                self.insertb_sub_menu.Enable(True)
+                self.inserta_sub_menu.Enable(True)
                 
                 col = col_list[0]
-                #GetColLabelValue(self, col)
                 col_name = grid.GetCellValue(row=0, col=col)
                 label = "Insert Column Before " + str(col_name)
-                self.insert_sub_menu.SetText(label)
+                self.insertb_sub_menu.SetText(label)
                 for item in self.insert_before_menu.GetMenuItems():
                     self.insert_before_menu.DeleteItem(item)
                 grid.insert_col_menu(menu=self.insert_before_menu, 
+                                     label=col_name, window=self)
+                label = "Insert Column After " + str(col_name)
+                self.inserta_sub_menu.SetText(label)
+                for item in self.insert_after_menu.GetMenuItems():
+                    self.insert_after_menu.DeleteItem(item)
+                grid.insert_after_col_menu(menu=self.insert_after_menu, 
                                      label=col_name, window=self)
         event.Skip()

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -35 +35 @@
 from sans.guiframe.panel_base import PanelBase
 from sans.guiframe.gui_style import GUIFRAME_ICON
-from binder import BindArtist
+from danse.common.plottools.binder import BindArtist
 from appearanceDialog import appearanceDialog
 from graphAppearance import graphAppearance

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -28 +28 @@
 from sans.guiframe.events import SlicerEvent
 from sans.guiframe.utils import PanelMenu
-from binder import BindArtist
+from danse.common.plottools.binder import BindArtist
 from Plotter1D import ModelPanel1D
 from danse.common.plottools.toolbar import NavigationToolBar