Changeset 2321 for trunk/GSASIIexprGUI.py

Timestamp:

Jun 15, 2016 7:10:38 AM (7 years ago)

Author:

vondreele

Message:

start on CalcDistSig? & AddAngleDialog? from tablet

File:

• trunk/GSASIIexprGUI.py (modified) (4 diffs)

trunk/GSASIIexprGUI.py

@@ -710 +710 @@
         self.Oatom = ''
         self.Tatom = ''
-        
         self.Draw()
         
@@ -825 +824 @@
         self.header = header
         self.pName = Phases.keys()[0]
+        DisAglCtls = {}
+        dlg = G2gd.DisAglDialog(self.panel,DisAglCtls,self.Phases[self.pName]['General'],Reset=False)
+        if dlg.ShowModal() == wx.ID_OK:
+            Phases[self.pName]['General']['DisAglCtls'] = dlg.GetData()
+        dlg.Destroy()
         self.Oatom = ''
-        
+        self.Tatoms = ['','']
         self.Draw()
 
@@ -834 +838 @@
             Obj = event.GetEventObject()
             self.pName = Obj.GetValue()
-            self.Draw()
+            self.Oatom = ''
+            DisAglCtls = {}
+            dlg = G2gd.DisAglDialog(self.panel,DisAglCtls,self.Phases[self.pName]['General'],Reset=False)
+            if dlg.ShowModal() == wx.ID_OK:
+                self.Phases[self.pName]['General']['DisAglCtls'] = dlg.GetData()
+            dlg.Destroy()
+            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()
+            wx.CallAfter(self.Draw)
 
         self.panel.Destroy()
@@ -860 +874 @@
 #        GSASIIpath.IPyBreak()
         atomSizer = wx.BoxSizer(wx.HORIZONTAL)
-        atomSizer.Add(wx.StaticText(self.panel,label=' Origin atom: '),0,WACV)
+        atomSizer.Add(wx.StaticText(self.panel,label=' Origin atom (O in A-O-B): '),0,WACV)
         origAtom = wx.ComboBox(self.panel,value=self.Oatom,choices=aNames,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         origAtom.Bind(wx.EVT_COMBOBOX,OnOrigAtom)
-        atomSizer.Add(origAtom,0,WACV)
-        
+        atomSizer.Add(origAtom,0,WACV)        
         mainSizer.Add(atomSizer)
+        mainSizer.Add(wx.StaticText(self.panel,label=' A-O-B angle for A,B: '),0,WACV)
+        neigh = []
+        if self.Oatom:
+#            GSASIIpath.IPyBreak()
+            neigh = G2mth.FindAllNeighbors(Phase,self.Oatom,aNames)
+        bNames = ['',]
+        if neigh:
+            bNames = [item[0]+' d=%.3f'%(item[1]) for item in neigh[0]]