Changeset 3366

Timestamp:

Apr 30, 2018 12:36:18 PM (5 years ago)

Author:

vondreele

Message:

add linescan for expanded plot region

File:

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

trunk/GSASIIplot.py

@@ -5600 +5600 @@
     G2frame.cid = None
     #Dsp = lambda tth,wave: wave/(2.*npsind(tth/2.))
-    global Data,Masks,StrSta,Plot1  # RVD: these are needed for multiple image controls/masks 
+    global Data,Masks,StrSta,Plot1,Page  # RVD: these are needed for multiple image controls/masks 
     colors=['b','g','r','c','m','k'] 
     Data = G2frame.GPXtree.GetItemPyData(
@@ -5837 +5837 @@
                 pick.set_data([[arcxI[-1],arcxO[-1]],[arcyI[-1],arcyO[-1]]])
             elif 'linescan' in itemPicked:
+                xlim = Plot1.get_xlim()
                 azm = Data['linescan'][1]-AzmthOff
                 dspI = wave/(2.0*sind(0.1/2.0))
@@ -5852 +5853 @@
                 np.seterr(invalid=olderr['invalid'])
                 Plot1.plot(xy[0],xy[1])
-                Plot1.set_xlim(Data['IOtth'])
+                Plot1.set_xlim(xlim)
                 Plot1.set_xscale("linear")                                                  
                 Plot1.set_title('Line scan at azm= %6.1f'%(azm+AzmthOff))
@@ -6033 +6034 @@
         '''Called when the mouse is released inside an image plot window
         '''
+        global Page
         try:
             treeItem = G2frame.GPXtree.GetItemText(G2frame.PickId)
         except TypeError:
             return
+        if Data['linescan']:
+            Page.xlim1 = Plot1.get_xlim()
         new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
         if G2frame.cid is not None:         # if there is a drag connection, delete it
@@ -6302 +6306 @@
         np.seterr(invalid=olderr['invalid'])
         Plot1.plot(xy[0],xy[1])
-        Plot1.set_xlim(Data['IOtth'])
-        Plot1.set_xscale("linear")                                                  
     if newImage:
         G2frame.MaskKey = '' # subtitle will be removed, so turn off mode
@@ -6413 +6415 @@
                 ind = np.searchsorted(Azm,cake)
                 Plot.plot([arcxI[ind],arcxO[ind]],[arcyI[ind],arcyO[ind]],color='k',dashes=(5,5))
-        if 'linescan' in Data and Data['linescan'][0]:
+        if 'linescan' in Data and Data['linescan'][0] and G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Image Controls',]:
             azm = Data['linescan'][1]-Data['azmthOff']
             IOtth = [0.1,60.]
@@ -6519 +6521 @@
         Plot.set_xlim(xlim)
         Plot.set_ylim(ylim)
+        if Data.get('linescan',[False,0.])[0]:
+            Plot1.set_xlim(Data['IOtth'])
         if Data['invert_x']:
             Plot.invert_xaxis()
@@ -6527 +6531 @@
             Plot.set_xlim(xylim[0])
             Plot.set_ylim(xylim[1])
+            if Data['linescan']:
+                try:
+                    Plot1.set_xlim(Page.xlim1)
+                except:
+                    pass
             xylim = []
             Page.toolbar.push_current()