Handle bad band list (bbl) in headers and do not display bbl values in spectral plots.

Author: tboggs

spectral/graphics/spypylab.py

@@ -1280,24 +1280,22 @@ def plot(data, source=None):
 
     set_mpl_interactive()
 
-    s = np.shape(data)
-
     if source is not None and hasattr(source, 'bands'):
         xvals = source.bands.centers
     else:
-        xvals = None
-
-    if len(s) == 1:
-        if not xvals:
-            xvals = list(range(len(data)))
-        p = plt.plot(xvals, data)
-    elif len(s) == 2:
-        if not xvals:
-            xvals = list(range(s[1]))
-        p = plt.plot(xvals, data[0, :])
+        xvals = list(range(data.shape[-1]))
+
+    if data.ndim == 1:
+        data = data[np.newaxis, :]
+    data = data.reshape(-1, data.shape[-1])
+    if source is not None and hasattr(source, 'metadata') and \
+       'bbl' in source.metadata:
+        # Do not plot bad bands
+        data = np.array(data)
+        data[:, np.array(source.metadata['bbl']) == 0] = None
+    for x in data:
+        p = plt.plot(xvals, x)
         plt.hold(1)
-        for i in range(1, s[0]):
-            p = plt.plot(xvals, data[i, :])
     spectral._xyplot = p
     plt.grid(1)
     if source is not None and hasattr(source, 'bands'):

spectral/io/envi.py

@@ -366,6 +366,11 @@ def open(file, image=None):
             pass
     img.bands.band_unit = h.get('wavelength units', None)
 
+    if 'bbl' in h:
+        try:
+            h['bbl'] = [int(b) for b in h['bbl']]
+        except:
+            print('Unable to parse bad band list (bbl) in header as integers.')
     return img
 
 
@@ -599,6 +604,7 @@ def _prepared_data_and_metadata(hdr_file, image, **kwargs):
         if len(data.shape) == 2:
             data = data[:, :, np.newaxis]
         swap = False
+        metadata = {}    
     elif isinstance(image, SpyFile):
         if image.using_memmap is True:
             data = image._memmap
@@ -609,12 +615,17 @@ def _prepared_data_and_metadata(hdr_file, image, **kwargs):
             data = image.load(dtype=image.dtype, scale=False)
             src_interleave = 'bip'
             swap = False
+        metadata = image.metadata.copy()
     else:
-        data = image.load()
+        data = image.load(scale=False)
         src_interleave = 'bip'
         swap = False
+        if hasattr(image, 'metadata'):
+            metadata = image.metadata.copy()
+        else:
+            metadata = {}
 
-    metadata = kwargs.get('metadata', {}).copy()
+    metadata.update(kwargs.get('metadata', {}))
     add_image_info_to_metadata(image, metadata)
     if hasattr(image, 'bands'):
         add_band_info_to_metadata(image.bands, metadata)