Changeset 2417 for trunk/GSASIIplot.py

Timestamp:

Aug 10, 2016 2:24:34 PM (7 years ago)

Author:

vondreele

Message:

fix PDF graphic errors

File:

• trunk/GSASIIplot.py (modified) (8 diffs)

trunk/GSASIIplot.py

@@ -2143 +2143 @@
             if G2frame.Contour:
                 G2frame.Cmax = min(1.0,G2frame.Cmax*1.2)
-            elif Pattern[0]['Offset'][0] < 100.:
-                Pattern[0]['Offset'][0] += 1.
+            elif Page.Offset[1] < 100.:
+               Page.Offset[1] += 1.
         elif event.key == 'd':
             if G2frame.Contour:
                 G2frame.Cmax = max(0.0,G2frame.Cmax*0.8)
-            elif Pattern[0]['Offset'][0] > 0.:
-                Pattern[0]['Offset'][0] -= 1.
+            elif Page.Offset[1] > 0.:
+                Page.Offset[1] -= 1.
         elif event.key == 'l':
-            Pattern[0]['Offset'][1] -= 1.
+            Page.Offset[0] -= 1.
         elif event.key == 'r':
-            Pattern[0]['Offset'][1] += 1.
+            Page.Offset[0] += 1.
         elif event.key == 'o':
-            Pattern[0]['Offset'] = [0,0]
+            Page.Offset = [0,0]
+        elif event.key == 'm':
+            G2frame.SinglePlot = not G2frame.SinglePlot
         elif event.key == 'c':
             newPlot = True
             G2frame.Contour = not G2frame.Contour
-            if not G2frame.Contour:
+            if G2frame.Contour:
                 G2frame.SinglePlot = False
                 Pattern[0]['Offset'] = [0.,0.]
@@ -2228 +2230 @@
         Page.canvas.mpl_connect('key_press_event', OnPlotKeyPress)
         Page.canvas.mpl_connect('motion_notify_event', OnMotion)
+        Page.Offset = [0,0]
     
     G2frame.G2plotNB.RaisePageNoRefresh(Page)
@@ -2237 +2240 @@
     else:
         Page.Choice = (' key press','l: offset left','r: offset right','d: offset down','u: offset up',
-            'o: reset offset','t: toggle legend','c: contour on','s: toggle single plot')
+            'o: reset offset','t: toggle legend','c: contour on',
+            'm: toggle multiplot','s: toggle single plot')
     Page.keyPress = OnPlotKeyPress
     PatternId = G2frame.PatternId
-    PickId = G2frame.PickId
     Plot.set_title(type)
     if type == 'G(R)':
@@ -2262 +2265 @@
         item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
         while item:
-            if 'PDF' in G2frame.PatternTree.GetItemText(item):
+            if 'PDF' in G2frame.PatternTree.GetItemText(item).split()[0]:
                 name = type+G2frame.PatternTree.GetItemText(item)[4:]
                 Id = G2gd.GetPatternTreeItemId(G2frame,item,name)
@@ -2269 +2272 @@
                     Pattern.append(name)
                     PlotList.append(Pattern)
-            item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
+            item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)                
+                    
     PDFdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls'))
     numbDen = G2pwd.GetNumDensity(PDFdata['ElList'],PDFdata['Form Vol'])
@@ -2289 +2293 @@
     for N,Pattern in enumerate(PlotList):
         xye = Pattern[1]
-        if PickId:
-            ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId)
         X = xye[0]
         if not lenX:
             lenX = len(X)           
-        Y = xye[1]+offset*N
-        if G2frame.Contour:
+        if G2frame.Contour and len(Pattern)>1:
+            Y = xye[1]
             if lenX == len(X):
                 ContourY.append(N)
@@ -2303 +2305 @@
                 Plot.set_ylabel('Data sequence',fontsize=12)
         else:
-            X = xye[0]+Pattern[0].get('Offset',[0,0])[1]*.005*N
-            if ifpicked:
-                Plot.plot(X,Y,colors[N%6]+'+',picker=3.,clip_on=False)
-                Page.canvas.SetToolTipString('')
+            X = xye[0]+Page.Offset[0]*.005*N
+            Y = xye[1]+Page.Offset[1]*.01*N
+            if G2frame.Legend:
+                Plot.plot(X,Y,colors[N%6],picker=False,label='Azm:'+Pattern[2].split('=')[1])
             else:
-                if G2frame.Legend:
-                    Plot.plot(X,Y,colors[N%6],picker=False,label='Azm:'+Pattern[2].split('=')[1])
-                else:
-                    Plot.plot(X,Y,colors[N%6],picker=False)
+                Plot.plot(X,Y,colors[N%6],picker=False)
             if type == 'G(R)':
                 Plot.plot(Xb,Yb,color='k',dashes=(5,5))
@@ -2318 +2317 @@
             elif type == 'S(Q)':
                 Plot.axhline(1.,color=wx.BLACK)
-    if G2frame.Contour:
+    if G2frame.Contour and len(Pattern)>1:
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
         Img = Plot.imshow(ContourZ,cmap=acolor,vmin=0,vmax=Ymax*G2frame.Cmax,interpolation=G2frame.Interpolate,