remove depricated scipy.misc

Author: briantoby

GSASII/exports/G2export_image.py

@@ -3,7 +3,10 @@
 '''
 from __future__ import division, print_function
 import os.path
-import scipy.misc
+try:
+    import matplotlib.pyplot as plt
+except ImportError:
+    plt = None
 from .. import GSASIIfiles as G2fil
 
 class ExportImagePNG(G2fil.ExportBaseclass):
@@ -18,7 +21,10 @@ def __init__(self,G2frame):
             extension='.png',
             longFormatName = 'Export image in PNG format'
             )
-        self.exporttype = ['image']
+        if plt is None:
+            self.exporttype = []
+        else:
+            self.exporttype = ['image']
         #self.multiple = True
     def Exporter(self,event=None):
         '''Export an image
@@ -29,13 +35,12 @@ def Exporter(self,event=None):
         self.loadTree()
         if self.ExportSelect(): return # select one image; ask for a file name
         # process the selected image(s) (at present only one image)
-        for i in sorted(self.histnam): 
+        for i in sorted(self.histnam):
             filename = os.path.join(
                 self.dirname,
                 os.path.splitext(self.filename)[0] + self.extension
                 )
             imgFile = self.Histograms[i].get('Data',(None,None))
             Image = G2fil.GetImageData(self.G2frame,imgFile,imageOnly=True)
-            scipy.misc.imsave(filename,Image)
+            plt.imsave(filename,Image)
             print('Image '+imgFile+' written to file '+filename)
-            

GSASII/imports/G2img_CheMin.py

@@ -4,28 +4,37 @@
 
 from __future__ import division, print_function
 from .. import GSASIIobj as G2obj
+try:
+    import imageio
+except ImportError:
+    imageio = None
 class png_ReaderClass(G2obj.ImportImage):
     '''Reads standard PNG images; parameters are set to those of the
     Mars Rover (CheMin) diffractometer.
     '''
     def __init__(self):
+        if imageio is None:
+            self.UseReader = False
+            msg = 'CheMin Reader skipped because imageio library is not installed'
+            if GSASIIpath.condaTest():
+                msg += ' To fix this use command:\n\tconda install imageio'
+            G2fil.ImportErrorMsg(msg,{'CheMin image importer':['imageio']})
         super(self.__class__,self).__init__( # fancy way to self-reference
             extensionlist=('.png',),
             strictExtension=True,
-            formatName = 'PNG image',
+            formatName = 'CheMin PNG image',
             longFormatName = 'PNG image from CheMin'
             )
 
     def ContentsValidator(self, filename):
         '''no test at this time
         '''
         return True
-        
+
     def Reader(self,filename, ParentFrame=None, **unused):
         '''Reads using standard scipy PNG reader
         '''
-        import scipy.misc
-        self.Image = scipy.misc.imread(filename,flatten=True)
+        self.Image = imageio.imread(filename,flatten=True)
         self.Npix = self.Image.size
         if self.Npix == 0:
             return False

GSASII/imports/G2img_pixirad_1ID_16bit.py

@@ -48,9 +48,7 @@ def ContentsValidator(self, filename):
         return True
 
     def Reader(self,filename, ParentFrame=None, **unused):
-        '''Read the TIF file using :func:`GetTifData`. If that fails,
-        use :func:`scipy.misc.imread` and give the user a chance to
-        edit the likely wrong default image parameters. 
+        '''Read the TIF file using :func:`GetTifData`.
         '''
         self.Comments,self.Data,self.Npix,self.Image = GetTifData(filename)
         if self.Npix == 0: