Changeset 2639 for trunk/GSASIIctrls.py

Timestamp:

Jan 17, 2017 4:46:55 PM (7 years ago)

Author:

toby

Message:

fix GridFractionEditor? bug on Ubuntu 16.10

File:

• trunk/GSASIIctrls.py (modified) (3 diffs)

trunk/GSASIIctrls.py

@@ -2946 +2946 @@
 
         self.nextval = self.startValue
-        val = self._tc.GetValue().lower()
+        val = self._tc.GetValue().lower().strip()
         if val != self.startValue:
             changed = True
             neg = False
-            if '-' in val:
+            if val.startswith('-'):
                 neg = True
-            if '/' in val and '.' not in val:
-                val += '.'
-            elif 's' in val and not 'sind(' in val:
-                if neg:
-                    val = '-sind('+val.strip('-s')+')'
-                else:
-                    val = 'sind('+val.strip('s')+')'
-            elif 'c' in val and not 'cosd(' in val:
-                if neg:
-                    val = '-cosd('+val.strip('-c')+')'
-                else:
-                    val = 'cosd('+val.strip('c')+')'
-            try:
-                self.nextval = val = float(eval(val))
-            except (SyntaxError,NameError,ZeroDivisionError):
-                val = self.startValue
+                val = val[1:]
+            # allow old GSAS s20 and c20 etc for sind(20) and cosd(20)
+            if val.startswith('s') and '(' not in val:
+                val = 'sind('+val.strip('s')+')'
+            elif val.startswith('c') and '(' not in val:
+                val = 'cosd('+val.strip('c')+')'
+            if neg:
+                val = '-' + val
+            val = G2py3.FormulaEval(val)
+            if val:
+                self.nextval = val
+            else:
                 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
@@ -2998 +2993 @@
     def OnChar(self, evt):
         key = evt.GetKeyCode()
-        if key == 15:
-            return
-        if key > 255:
+        if key < 32 or key >= 127:
             evt.Skip()
-            return
-        char = chr(key)
-        if char in '.+-/0123456789cosind()':
-            self._tc.WriteText(char)
-        else:
+        elif chr(key).lower() in '.+-*/0123456789cosind()':
             evt.Skip()
+        else:
+            evt.StopPropagation()
             
 ################################################################################
@@ -4250 +4241 @@
     frm.Show(True)
     
+    #======================================================================
+    # test Grid with GridFractionEditor
+    #======================================================================
+    tbl = [[1.,2.,3.],[1.1,2.1,3.1]]
+    colTypes = 3*[wg.GRID_VALUE_FLOAT+':10,5',]
+    Gtbl = Table(tbl,types=colTypes,rowLabels=['a','b'],colLabels=['1','2','3'])
+    Grid = GSGrid(frm)
+    Grid.SetTable(Gtbl,True)
+    for i in (0,1,2):
+        attr = wx.grid.GridCellAttr()
+        attr.IncRef()
+        attr.SetEditor(GridFractionEditor(Grid))
+        Grid.SetColAttr(i, attr)
+    frm.SetSize((400,200))
+    app.MainLoop()
+    sys.exit()
+    #======================================================================
+    # test Tutorial access
+    #======================================================================
     dlg = OpenTutorial(frm)
     if dlg.ShowModal() == wx.ID_OK: