Changeset 1633 for trunk/GSASIIpwdGUI.py

Timestamp:

Jan 22, 2015 10:09:11 AM (8 years ago)

Author:

vondreele

Message:

fix wx 3.0.x problem with Size on Progress bars in G2phsGUI & G2pwdGUI
4D charge flipping fixes - allow shifting 4D contour map L/R

File:

• trunk/GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIpwdGUI.py

@@ -452 +452 @@
                 screenSize = wx.ClientDisplayRect()
                 Size = dlg.GetSize()
-                dlg2.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
+                if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+                    dlg2.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+                    dlg2.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
                 try:
                     peaks['sigDict'],result,sig,Rvals,varyList,parmDict,fullvaryList,badVary = G2pwd.DoPeakFit(FitPgm,peaks['peaks'],
@@ -511 +513 @@
         screenSize = wx.ClientDisplayRect()
         Size = dlg.GetSize()
-        dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
+        if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+            dlg.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+            dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
         try:
             peaks['sigDict'] = G2pwd.DoPeakFit(FitPgm,peaks['peaks'],background,limits,inst,inst2,data,[],oneCycle,controls,dlg)[0]