Changeset ff50c51 in sasview

Timestamp:

Jun 17, 2015 5:58:11 AM (10 years ago)

Author:

smk78

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:

abc29de

Parents:

20eeb00 (diff), c85b0ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Files:

• src/sas/guiframe/data_processor.py (modified) (2 diffs)
• sasview/media/README.txt (added)
• sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (added)
• sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (added)
• sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (added)
• sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (added)
• sasview/test/1d_data/P123_D2O_10_percent.xml (added)
• sasview/test/1d_data/P123_D2O_30_percent.xml (added)
• sasview/test/1d_data/P123_D2O_40_percent.xml (added)
• sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (added)
• sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (added)
• sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (added)

src/sas/guiframe/data_processor.py

@@ -85 +85 @@
         self.SetupScrolling()
 
+
+class GridCellEditor(sheet.CCellEditor):
+    """ Custom cell editor """
+    def __init__(self, grid):
+        super(GridCellEditor, self).__init__(grid)
+
+    def EndEdit(self, row, col, grid, previous):
+        """ 
+            Commit editing the current cell. Returns True if the value has changed.
+            @param previous: previous value in the cell
+        """
+        changed = False                             # Assume value not changed
+        val = self._tc.GetValue()                   # Get value in edit control
+        if val != self._startValue:                 # Compare
+            changed = True                          # If different then changed is True
+            grid.GetTable().SetValue(row, col, val) # Update the table
+        self._startValue = ''                       # Clear the class' start value
+        self._tc.SetValue('')                       # Clear contents of the edit control
+        return changed
+
+
 class GridPage(sheet.CSheet):
     """
@@ -91 +112 @@
         """
         """
-        sheet.CSheet.__init__(self, parent)
+        #sheet.CSheet.__init__(self, parent)
+        
+        # The following is the __init__ from CSheet. ##########################
+        # We re-write it here because the class is broken in wx 3.0,
+        # such that the cell editor is not able to receive the right
+        # number of parameters when it is called. The only way to
+        # pick a different cell editor is apparently to re-write the __init__.
+        wx.grid.Grid.__init__(self, parent, -1)
+
+        # Init variables
+        self._lastCol = -1              # Init last cell column clicked
+        self._lastRow = -1              # Init last cell row clicked
+        self._selected = None           # Init range currently selected
+                                        # Map string datatype to default renderer/editor
+        self.RegisterDataType(wx.grid.GRID_VALUE_STRING,
+                              wx.grid.GridCellStringRenderer(),
+                              GridCellEditor(self))
+
+        self.CreateGrid(4, 3)           # By default start with a 4 x 3 grid
+        self.SetColLabelSize(18)        # Default sizes and alignment
+        self.SetRowLabelSize(50)
+        self.SetRowLabelAlignment(wx.ALIGN_RIGHT, wx.ALIGN_BOTTOM)
+        self.SetColSize(0, 75)          # Default column sizes
+        self.SetColSize(1, 75)
+        self.SetColSize(2, 75)
+
+        # Sink events
+        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_RANGE_SELECT, self.OnRangeSelect)
+        self.Bind(wx.grid.EVT_GRID_ROW_SIZE, self.OnRowSize)
+        self.Bind(wx.grid.EVT_GRID_COL_SIZE, self.OnColSize)
+        self.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnCellChange)
+        self.Bind(wx.grid.EVT_GRID_SELECT_CELL, self.OnGridSelectCell)
+        # This ends the __init__ section for CSheet. ##########################
 
         self.AdjustScrollbars()