Changeset 2316 for trunk/GSASIIgrid.py

Timestamp:

Jun 12, 2016 8:22:48 PM (7 years ago)

Author:

toby

Message:

prototype distance calc.

File:

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

trunk/GSASIIgrid.py

@@ -1465 +1465 @@
             help='Add a new pseudo-variable')
         self.SequentialPvars.Append(
-            id=wxADDSEQDIST, kind=wx.ITEM_NORMAL,text='Add dist',
+            id=wxADDSEQDIST, kind=wx.ITEM_NORMAL,text='Calc Distance',
             help='Add a new bond distance pseudo-variable')
         self.SequentialPvars.Append(
-            id=wxADDSEQANGLE, kind=wx.ITEM_NORMAL,text='Add angle',
+            id=wxADDSEQANGLE, kind=wx.ITEM_NORMAL,text='Calc Angle',
             help='Add a new bond angle pseudo-variable')
         self.SequentialPvars.Append(
@@ -2772 +2772 @@
             VarLabel = "New Bond")
         if dlg.ShowModal() == wx.ID_OK:
-            obj = dlg.GetSelection()
+            #obj = dlg.GetSelection()
+            # create an expression object
+            obj = G2obj.ExpressionObj()
+            obj.expression = 'Dist(1,2)'
+            obj.distance_stuff = np.array([[0,1,1,-1]])
+            obj.distance_atoms = [1,2]
         else: 
             dlg.Destroy()
@@ -2778 +2783 @@
         dlg.Destroy()
         if obj:
-            calcobj = G2obj.ExpressionCalcObj(obj)
-            Controls['SeqPseudoVars'][calcobj.eObj.expression] = obj
+            Controls['SeqPseudoVars'][obj.expression] = obj
             UpdateSeqResults(G2frame,data,G2frame.dataDisplay.GetSize()) # redisplay variables