Changeset 4062

Timestamp:

Jul 15, 2019 9:02:11 AM (4 years ago)

Author:

vondreele

Message:

small fixes to G2plot - make indexed lines 3,3 dashed orange lines, width=1.5 - looks better & different from upper limit line
removed commented out CurLim? code
small fixes to G2pwdGUI - 'cell inc' --> 'cell step' perhaps a bit more obvious, fixed 2 probable bugs in PDF code

Location:

trunk

Files:

• GSASIIplot.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIplot.py

@@ -3210 +3210 @@
                     DifLine = Plot1.plot(X[Ibeg:Ifin],DZ[Ibeg:Ifin],colors[3],picker=1.,label='_diff')                    #(Io-Ic)/sig(Io)
                     Plot1.axhline(0.,color='k')
-#                    try:
-#                        CurLims = [np.min(DZ[Ibeg:Ifin])*1.2,np.max(DZ[Ibeg:Ifin])*1.2]
-#                        for i in range(2):
-#                            if not G2frame.UseLimits['dylims'][i]: continue
-#                            CurLims[i] = float(G2frame.FixedLimits['dylims'][i])
-#                        if all(np.isfinite(CurLims)): Plot1.set_ylim(CurLims)
-#                    except:
-#                        pass
 
                 if Page.plotStyle['logPlot']:
@@ -3313 +3305 @@
     if PickId and not G2frame.Contour:
         Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
+        orange = [255/256.,128/256.,0.]
         if G2frame.GPXtree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
             peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Index Peak List'))
@@ -3325 +3318 @@
                         Plot.axvline(peak[0],color='b')
             for hkl in G2frame.HKL:
-                clr = 'r'
+                clr = orange
                 if len(hkl) > 6 and hkl[3]:
                     clr = 'g'
                 if Page.plotStyle['qPlot']:
-                    Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=(1,3),lw=2.5)
+                    Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=(3,3),lw=1.5)
                 if Page.plotStyle['dPlot']:
-                    Plot.axvline(G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=(1,3),lw=2.5)
+                    Plot.axvline(G2lat.Pos2dsp(Parms,hkl[-2]),color=clr,dashes=(3,3),lw=1.5)
                 else:
-                    Plot.axvline(hkl[-2],color=clr,dashes=(1,3),lw=2.5)
+                    Plot.axvline(hkl[-2],color=clr,dashes=(3,3),lw=1.5)
         elif Page.plotStyle.get('WgtDiagnostic',False):
             pass # skip reflection markers

trunk/GSASIIpwdGUI.py

@@ -3271 +3271 @@
         Limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits'))[1]
         if 'C' in Inst['Type'][0] or 'PKS' in Inst['Type'][0]:
-            wave = G2mth.getWave(Inst)
             dmin = G2lat.Pos2dsp(Inst,Limits[1])
         else:
@@ -4359 +4358 @@
             volVal.SetBackgroundColour(VERY_LIGHT_GREY)
             littleSizer.Add(volVal,0,WACV)
-    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label='cell inc',style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)
+    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label='cell step',style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)
     shiftChoices = [ '0.01%','0.05%','0.1%','0.5%', '1.0%','2.5%','5.0%']
-    shiftSel = wx.Choice(G2frame.dataWindow,choices=shiftChoices,size=(75,-1))
+    shiftSel = wx.Choice(G2frame.dataWindow,choices=shiftChoices)
     shiftSel.SetSelection(3)
     littleSizer.Add(shiftSel)
@@ -6601 +6600 @@
             wx.CallAfter(UpdatePDFGrid,G2frame,data)
             #UpdatePDFGrid(G2frame,data)
-            wx.CallAfter(OnComputePDF,tc.event)
+            wx.CallAfter(OnComputePDF,event)
         
         sampleSizer = wx.BoxSizer(wx.VERTICAL)
@@ -6897 +6896 @@
                 for item in data:
                     if item[:] not in ['Sample','I(Q)','S(Q)','F(Q)','G(R)']:
-                        File.write(item+':'+unicode(data[item])+'\n')
+                        File.write(item+':'+data[item]+'\n')
                 File.close()
                 print ('PDF controls saved to: '+filename)