Changeset 3323

Timestamp:

Mar 28, 2018 6:22:44 PM (6 years ago)

Author:

toby

Message:

fix image plotting at expense of 'w' plots; note code to be obsoleted

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -429 +429 @@
                 Plot = Page.figure.gca()          #get previous plot
                 limits = [Plot.get_xlim(),Plot.get_ylim()] # save previous limits
-                if len(Axes)>1:
-                    limits[1] = Axes[1].get_ylim()
+                #======================================================================
+                # this is needed for PWDR (etc) "w" plots, but breaks image plotting
+                # removed for now (BHT)
+                #if len(Axes)>1:
+                #    limits[1] = Axes[1].get_ylim()
+                #======================================================================
 #                    print('Axes[1]',Axes[1].get_ylim())
 #                print ('Plot limits:',limits,Axes)

trunk/imports/G2img_1TIF.py

@@ -70 +70 @@
             import scipy.misc
             self.Image = scipy.misc.imread(filename,flatten=True)
+            # for scipy 1.2 & later  scipy.misc.imread will be removed
+            # with note to use imageio.imread instead 
+            # (N.B. scipy.misc.imread uses PIL/pillow perhaps better to just use pillow)
             self.Npix = self.Image.size
             if ParentFrame: