Changeset 2841

Timestamp:

May 29, 2017 9:08:41 AM (6 years ago)

Author:

vondreele

Message:

fix DData & RBmodel selection tables to allow use of up/down arrows - SetFocus? issues

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASIIddataGUI.py

@@ -797 +797 @@
         oldFocus = wx.Window.FindFocus()
         G2plt.PlotSizeStrainPO(G2frame,data,G2frame.hist)
-        oldFocus.SetFocus()
         wx.CallLater(100,RepaintHistogramInfo)
+        wx.CallAfter(oldFocus.SetFocus)
        
     def RepaintHistogramInfo(Scroll=0):

trunk/GSASIIphsGUI.py

@@ -6138 +6138 @@
             rbObj = data['RBModels']['Residue'][rbId]
             data['Drawing']['viewPoint'][0] = rbObj['Orig'][0]
+            data['Drawing']['Quaternion'] = rbObj['Orient'][0]
             G2frame.bottomSizer =  ResrbSizer(rbObj)
             mainSizer.Add(G2frame.bottomSizer)
@@ -6145 +6146 @@
             RigidBodies.Scroll(0,Scroll)
             G2frame.dataFrame.SendSizeEvent()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
+            G2plt.PlotStructure(G2frame,data)
             oldFocus.SetFocus()
         
@@ -6181 +6182 @@
             rbObj = data['RBModels']['Residue'][0]
             data['Drawing']['viewPoint'][0] = rbObj['Orig'][0]
+            data['Drawing']['Quaternion'] = rbObj['Orient'][0]
             select = wx.ListBox(RigidBodies,choices=RBnames,style=wx.LB_SINGLE,size=(-1,120))
             select.SetSelection(RBnames.index(rbName))
@@ -6190 +6192 @@
             mainSizer.Add(G2frame.bottomSizer)
             G2frame.dataFrame.SetStatusText('NB: Rotation vector is in crystallographic space')
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
+            G2plt.PlotStructure(G2frame,data)
         if 'Vector' in data['RBModels'] and len(data['RBModels']['Vector']):
             mainSizer.Add((5,5),0)