Changeset 2317

Timestamp:

Jun 13, 2016 11:26:25 AM (7 years ago)

Author:

vondreele

Message:

missing/exercise directories

Location:

trunk

Files:

• Exercises/CF Xray single crystal (deleted)
• Exercises/CFXraySingleCrystal (added)
• Exercises/MerohedralTwins (added)
• Exercises/StackingFaults-I (added)
• Exercises/StackingFaults-II (added)
• Exercises/StackingFaults-III (added)
• GSASIIexprGUI.py (modified) (2 diffs)
• GSASIIgrid.py (modified) (3 diffs)

trunk/GSASIIexprGUI.py

@@ -724 +724 @@
                 self.Phases[self.pName]['General']['DisAglCtls'] = dlg.GetData()
             dlg.Destroy()
-            self.Draw()
+            wx.CallAfter(self.Draw)
             
         def OnOrigAtom(event):
             Obj = event.GetEventObject()
             self.Oatom = Obj.GetValue()
-            self.Draw()
+            wx.CallAfter(self.Draw)
             
         def OnTargAtom(event):
             Obj = event.GetEventObject()
             self.Tatom = Obj.GetValue()
-            self.Draw()
+            wx.CallAfter(self.Draw)
 
         self.panel.Destroy()
@@ -791 +791 @@
 
     def GetSelection(self):
-        exprObj = G2obj.ExpressionObj()
-        exprObj.LoadExpression(
-            self.expr,
-            self.exprVarLst,
-            self.varSelect,
-            self.varName,
-            self.varValue,
-            self.varRefflag,
-            )
-        if self.depVarDict:
-            exprObj.SetDepVar(self.dependentVar)
-        return exprObj
+        return self.pName,self.Oatom,self.Tatom
 
     def OnOk(self,event):

trunk/GSASIIgrid.py

@@ -1465 +1465 @@
             help='Add a new pseudo-variable')
         self.SequentialPvars.Append(
-            id=wxADDSEQDIST, kind=wx.ITEM_NORMAL,text='Calc Distance',
+            id=wxADDSEQDIST, kind=wx.ITEM_NORMAL,text='Add Distance',
             help='Add a new bond distance pseudo-variable')
         self.SequentialPvars.Append(
@@ -2767 +2767 @@
     def AddNewDistPseudoVar(event):
         print 'Add bond distance pseudo-variable here - TBD'
+        obj = None
         dlg = G2exG.BondDialog(
             G2frame.dataDisplay,Phases,PSvarDict,
@@ -2772 +2773 @@
             VarLabel = "New Bond")
         if dlg.ShowModal() == wx.ID_OK:
-            #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]
+            pName,Oatom,Tatom = dlg.GetSelection()
+            if Tatom:
+                Phase = Phases[pName]
+                General = Phase['General']
+                Cell = General['Cell'][1:7]
+                Amat = G2lat.cell2AB(Cell)[0]
+                # create an expression object
+                obj = G2obj.ExpressionObj()
+                obj.expression = 'Dist(%s,%s)'%(Oatom,Tatom.split(' d=')[0].replace(' ',''))
+                obj.distance_stuff = {'Amat':Amat,}
+                obj.distance_atoms = [1,2]
         else: 
             dlg.Destroy()