Changeset e54dbc3e in sasview for src/sas

Timestamp:

Jun 18, 2015 10:16:47 AM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

3c2011e

Parents:

9bf64f6

Message:

Fix cut/paste issue.

File:

• src/sas/guiframe/data_processor.py (modified) (8 diffs)

src/sas/guiframe/data_processor.py

@@ -141 +141 @@
         self.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.OnLeftClick)
         self.Bind(wx.grid.EVT_GRID_CELL_RIGHT_CLICK, self.OnRightClick)
-        self.Bind(wx.grid.EVT_GRID_CELL_LEFT_DCLICK, self.OnLeftDoubleClick)
+        #self.Bind(wx.grid.EVT_GRID_CELL_LEFT_DCLICK, self.OnLeftDoubleClick)
         self.Bind(wx.grid.EVT_GRID_RANGE_SELECT, self.OnRangeSelect)
         self.Bind(wx.grid.EVT_GRID_ROW_SIZE, self.OnRowSize)
@@ -187 +187 @@
         if self.GetNumberCols() > 0:
             self.default_col_width = self.GetColSize(0)
-        self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)
-        self.Bind(wx.grid.EVT_GRID_LABEL_RIGHT_CLICK, self.on_right_click)
-        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)
-
+        #self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)
+        #self.Bind(wx.grid.EVT_GRID_LABEL_RIGHT_CLICK, self.on_right_click)
+        #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 OnLeftClick(self, event):
+        sheet.CSheet.OnLeftClick(self, event)
+        self.on_selected_cell(event)
+        
     def on_edit_cell(self, event):
         """
@@ -211 +215 @@
         row, col = event.GetRow(), event.GetCol()
         cell = (row, col)
-        event.Skip()
         if not flag and not flag_shift:
             self.selected_cols = []
@@ -273 +276 @@
             if cell_row > 0 and cell_row < self.max_row_touse:
                 self.axis_value.append(self.GetCellValue(cell_row, cell_col))
+        event.Skip()
 
     def on_left_click(self, event):
@@ -278 +282 @@
         Catch the left click on label mouse event
         """
-        event.Skip()
         flag = event.CmdDown() or event.ControlDown()
 
@@ -317 +320 @@
             if not self.axis_label:
                 self.axis_label = " "
+        event.Skip()
 
     def on_right_click(self, event):
@@ -1385 +1389 @@
         wx.EVT_MENU(self, self.save_menu.GetId(), self.on_save_page)
 
+        # To add the edit menu, call add_edit_menu() here.
+        self.edit = None
+        self.Bind(wx.EVT_MENU_OPEN, self.on_menu_open)
+        
+        self.Bind(wx.EVT_CLOSE, self.on_close)
+
+    def add_edit_menu(self, menubar):
         self.edit = wx.Menu()
 
@@ -1414 +1425 @@
         self.remove_menu = self.edit.Append(-1, 'Remove Column', hint)
         wx.EVT_MENU(self, self.remove_menu.GetId(), self.on_remove_column)
-
-        self.Bind(wx.EVT_MENU_OPEN, self.on_menu_open)
         menubar.Append(self.edit, "&Edit")
-        self.Bind(wx.EVT_CLOSE, self.on_close)
 
     def on_copy(self, event):