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

trunk/GSASIIplot.py

@@ -2853 +2853 @@
                 ccof.append(spos[0][3:])
         wave += G2mth.posFourier(tau,np.array(scof),np.array(ccof))
-    Title = MapType+' modulation map for atom '+atom[0]+    \
+    if mapData['Flip']:
+        Title = 'Charge flip'
+    else:
+        Title = MapType
+    Title += ' map for atom '+atom[0]+    \
         ' at %.4f %.4f %.4f'%(atxyz[0],atxyz[1],atxyz[2])
     ix = -np.array(np.rint(rhoSize[:3]*atxyz),dtype='i')
@@ -2873 +2877 @@
     Plot.set_xlabel('t')
     Plot.set_ylabel(r'$\mathsf{\Delta}$%s'%(Ax))
-    Slab = np.concatenate((slab,slab),axis=1)
-    Plot.contour(Slab,20,extent=(0.,2.,-.5+Off*.005,.5+Off*.005))
+    Slab = np.hstack((slab,slab,slab))
+    Plot.contour(Slab[:,:21],20,extent=(0.,2.,-.5+Off*.005,.5+Off*.005))
     Page.canvas.draw()
    
@@ -4032 +4036 @@
     B4mat = np.concatenate((np.concatenate((Bmat,[[0],[0],[0]]),axis=1),[[0,0,0,1],]),axis=0)
     SGData = generalData['SGData']
+    if generalData['Type'] in ['modulated','magnetic']:
+        SSGData = generalData['SSGData']
     Mydir = generalData['Mydir']
     atomData = data['Atoms']
@@ -4108 +4114 @@
     shiftDown = False
     ctrlDown = False
+    G2frame.tau = 0.
     
     def OnKeyBox(event):
@@ -4215 +4222 @@
             SetPeakRoll(dirDict[key])
             SetMapPeaksText(mapPeaks)
+        elif key in ['+','-','0'] and generalData['Type'] in ['modulated','magnetic']:
+            if key == '0':
+                G2frame.tau = 0.
+            elif key =='+':
+                G2frame.tau += 0.05
+            elif key =='-':
+                G2frame.tau -= 0.05
+            G2frame.tau %= 1.   #force 0-1 range
         Draw('key')
             
@@ -4991 +5006 @@
     else:
         choice = [' save as/key:','jpeg','tiff','bmp','c: center on 1/2,1/2,1/2','n: next','p: previous']
+    if generalData['Type'] in ['modulated','magnetic',] and len(drawAtoms):
+        choice += ['+: increase tau','-: decrease tau','0: set tau = 0']
+
     cb = wx.ComboBox(G2frame.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,choices=choice)
     cb.Bind(wx.EVT_COMBOBOX, OnKeyBox)