Changeset 2235

Timestamp:

May 2, 2016 9:26:24 AM (6 years ago)

Author:

vondreele

Message:

trap typos in matrix/vector input for Transform GUI

File:

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

trunk/GSASIIgrid.py

@@ -356 +356 @@
             ix,iy = Ind[Obj.GetId()]
             val = Obj.GetValue()
-            if '/' in val:
-                vals = val.split('/')
-                self.Trans[iy,ix] = float(vals[0])/float(vals[1])
-            else:    
-                self.Trans[iy,ix] = float(Obj.GetValue())
+            try:
+                if '/' in val:
+                    vals = val.split('/')
+                    self.Trans[iy,ix] = float(vals[0])/float(vals[1])
+                else:    
+                    self.Trans[iy,ix] = float(Obj.GetValue())
+            except ValueError:
+                pass
             Obj.SetValue('%5.3f'%(self.Trans[iy,ix]))
             
@@ -367 +370 @@
             iy = Ind[Obj.GetId()]
             val = Obj.GetValue()
-            if '/' in val:
-                vals = val.split('/')
-                self.Vec[iy] = float(vals[0])/float(vals[1])
-            else:    
-                self.Vec[iy] = float(Obj.GetValue())
+            try:
+                if '/' in val:
+                    vals = val.split('/')
+                    self.Vec[iy] = float(vals[0])/float(vals[1])
+                else:    
+                    self.Vec[iy] = float(Obj.GetValue())
+            except ValueError:
+                pass
             Obj.SetValue('%5.3f'%(self.Vec[iy]))
                 
@@ -520 +526 @@
 ################################################################################
 class RotationDialog(wx.Dialog):
-    ''' Get Rotate & translate matrix & vector
+    ''' Get Rotate & translate matrix & vector - currently not used
+    needs rethinking - possible use to rotate a group of atoms about some
+    vector/origin + translation
     
     '''