Changeset 1633 for trunk/GSASIIphsGUI.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/GSASIIphsGUI.py (modified) (6 diffs)

trunk/GSASIIphsGUI.py

@@ -2081 +2081 @@
             waveSizer.Add(waveHead)
             if len(waveBlk):
-                CSI = G2spc.GetSSfxuinel(xyz,uij,SGData,SSGData)
                 for iwave,wave in enumerate(waveBlk):
+                    if not iwave:
+                        CSI = G2spc.GetSSfxuinel(waveType,xyz,uij,SGData,SSGData)
+                    else:
+                        CSI = G2spc.GetSSfxuinel('Fourier',xyz,uij,SGData,SSGData)
                     waveName = 'Fourier'
                     if Stype == 'Sfrac':
@@ -2190 +2193 @@
                         if generalData['Type'] != 'magnetic' and Stype == 'Smag':
                             break
-                        mainSizer.Add(WaveSizer(atom[-1][SS]['waveType'],atom[-1][SS][Stype],Stype,typeNames[Stype],Labels[Stype]))
-                        
+                        mainSizer.Add(WaveSizer(atom[-1][SS]['waveType'],atom[-1][SS][Stype],Stype,typeNames[Stype],Labels[Stype]))                        
         SetPhaseWindow(G2frame.dataFrame,waveData,mainSizer)
                        
@@ -2198 +2200 @@
         mapData = generalData['4DmapData']
         reflName = mapData['RefList']
+        generalData['Map']['Flip'] = False
         if not reflName:
             G2frame.ErrorDialog('Fourier map','No reflections defined for Fourier map')
@@ -5034 +5037 @@
             screenSize = wx.ClientDisplayRect()
             Size = pgbar.GetSize()
-            Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x
-            pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
-            pgbar.SetSize(Size)
+            if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+                pgbar.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+                pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
         else:
             pgbar = None
@@ -5626 +5629 @@
         screenSize = wx.ClientDisplayRect()
         Size = pgbar.GetSize()
-        Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x
-        pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
-        pgbar.SetSize(Size)
+        if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+            pgbar.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+            pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
         try:
             newMap,new4Dmap = G2mth.SSChargeFlip(data,reflDict,pgbar)
@@ -5674 +5677 @@
         screenSize = wx.ClientDisplayRect()
         Size = pgbar.GetSize()
-        Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x
-        pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
-        pgbar.SetSize(Size)
+        if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+            pgbar.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+            pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
         try:
             mapData.update(G2mth.ChargeFlip(data,reflDict,pgbar))