Changeset 2326 for trunk/GSASIIexprGUI.py

Timestamp:

Jun 15, 2016 9:21:13 PM (7 years ago)

Author:

vondreele

Message:

add more to angle calc

File:

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

trunk/GSASIIexprGUI.py

@@ -830 +830 @@
         dlg.Destroy()
         self.Oatom = ''
-        self.Tatoms = ['','']
+        self.Tatoms = ''
         self.Draw()
 
@@ -851 +851 @@
             wx.CallAfter(self.Draw)            
 
-        def OnTargAtom(event):
+        def OnTargAtoms(event):
             Obj = event.GetEventObject()
-            self.Tatom = Obj.GetValue()
+            self.Tatoms = Obj.GetValue()
             wx.CallAfter(self.Draw)
 
@@ -880 +880 @@
         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]]
+            neigh = G2mth.FindAllNeighbors(Phase,self.Oatom,aNames)[0]
+            mainSizer.Add(wx.StaticText(self.panel,label=' A-O-B angle for A,B: '),0,WACV)
+            bNames = ['',]
+            if neigh:
+#                GSASIIpath.IPyBreak()
+                for iA,aName in enumerate(neigh):
+                    for cName in neigh[iA+1:]:
+                        bNames.append('%s;%s'%(aName[0].replace(' ',''),cName[0].replace(' ','')))
+                targAtoms = wx.ComboBox(self.panel,value=self.Tatoms,choices=bNames,
+                    style=wx.CB_READONLY|wx.CB_DROPDOWN)
+                targAtoms.Bind(wx.EVT_COMBOBOX,OnTargAtoms)
+                mainSizer.Add(targAtoms,0,WACV)
 
 
@@ -907 +913 @@
 
     def GetSelection(self):
-        return []
+        return self.pName,self.Oatom,self.Tatoms
 
     def OnOk(self,event):