Changeset 1212

Timestamp:

Jan 31, 2014 3:51:20 PM (11 years ago)

Author:

vondreele

Message:

fix scaling of log images

File:

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

trunk/GSASIIplot.py ¶

@@ -2298 +2298 @@
             return
         if PickName == 'Masks':
-            if event.key in ['p','f','s','a','r']:
+            if event.key in ['l','p','f','s','a','r']:
                 G2frame.MaskKey = event.key
                 OnStartMask(G2frame)
@@ -2508 +2508 @@
                             else:
                                 arcs[aN][1][1] = int(G2img.GetAzm(Xpos,Ypos,Data))
-                    for poly in G2frame.polyList:
+                    for poly in G2frame.polyList:   #merging points problem here & how can we insert a point?
                         if Obj == poly[0]:
                             ind = G2frame.itemPicked.contains(G2frame.mousePicked)[1]['ind'][0]
@@ -2560 +2560 @@
             Page.keyPress = OnImPlotKeyPress
         elif G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Masks',]:
-            Page.Choice = (' key press','s: spot mask','a: arc mask','r: ring mask',
+            Page.Choice = (' key press','l: log(I) on','s: spot mask','a: arc mask','r: ring mask',
                 'p: polygon mask','f: frame mask',)
+            if G2frame.logPlot:
+                Page.Choice[1] = 'l: log(I) off'
             Page.keyPress = OnImPlotKeyPress
         elif G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Stress/Strain',]:
@@ -2600 +2602 @@
             
         if newImage:                    
+            Imin,Imax = Data['range'][1]
             MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]),Zlim[1])
             MaskA = ma.getmaskarray(MA)
@@ -2605 +2608 @@
             AM = G2img.ImageCompress(MaskA,imScale)
             if G2frame.logPlot:
+                A = np.where(A>Imin,np.where(A<Imax,A,0),0)
                 A = np.where(A>0,np.log(A),0)
                 AM = np.where(AM>0,np.log(AM),0)