Changeset 1590

Timestamp:

Dec 1, 2014 4:08:22 PM (9 years ago)

Author:

toby

Message:

update grid cell editor for wx2.9+ change (see ​http://wxpython.org/migrationguide.php); create a GridCellAttr? for each Set...Attr()call

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -2288 +2288 @@
         self._tc.SetSelection(0, self._tc.GetLastPosition())
 
-    def EndEdit(self, row, col, grid):
+    def EndEdit(self, row, col, grid, oldVal=None):
         changed = False
 
+        self.nextval = self.startValue
         val = self._tc.GetValue().lower()
-        
         if val != self.startValue:
             changed = True
@@ -2311 +2311 @@
                     val = 'cosd('+val.strip('c')+')'
             try:
-                val = float(eval(val))
-            except (SyntaxError,NameError):
+                self.nextval = val = float(eval(val))
+            except (SyntaxError,NameError,ZeroDivisionError):
                 val = self.startValue
-            grid.GetTable().SetValue(row, col, val) # update the table
+                return None
+            
+            if oldVal is None: # this arg appears in 2.9+; before, we should go ahead & change the table
+                grid.GetTable().SetValue(row, col, val) # update the table
+            # otherwise self.ApplyEdit gets called
 
         self.startValue = ''
         self._tc.SetValue('')
         return changed
+    
+    def ApplyEdit(self, row, col, grid):
+        """ Called only in wx >= 2.9
+        Save the value of the control into the grid if EndEdit() returns as True
+        """
+        grid.GetTable().SetValue(row, col, self.nextval) # update the table
 
     def Reset(self):

trunk/GSASIIphsGUI.py

@@ -1292 +1292 @@
             attr.SetEditor(G2gd.GridFractionEditor(Atoms))
             for c in range(colX,colX+3):
+                attr = wx.grid.GridCellAttr()
+                attr.IncRef()               #fix from Jim Hester
+                attr.SetEditor(G2gd.GridFractionEditor(Atoms))
                 Atoms.SetColAttr(c, attr)
             for i in range(colU11-1,colU11+6):