Changeset 2317 for trunk/GSASIIexprGUI.py

Timestamp:

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

Author:

vondreele

Message:

missing/exercise directories

File:

• trunk/GSASIIexprGUI.py (modified) (2 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):