PyOPIA 2.4.4__tar.gz → 2.4.6__tar.gz

{pyopia-2.4.4 → pyopia-2.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyOPIA
-Version: 2.4.4
+Version: 2.4.6
 Summary: A Python Ocean Particle Image Analysis toolbox.
 Home-page: https://github.com/sintef/pyopia
 Keywords: Ocean,Particles,Imaging,Measurement,Size distribution
@@ -91,6 +91,10 @@ We welcome additions and improvements to the code! We request that you follow a
 4. All pull requests must be reviewed by a person. The benefits from code review are plenty, but we like to emphasise that code reviews help spreading the awarenes of code changes. Please note that code reviews should be a pleasant experience, so be plesant, polite and remember that there is a human being with good intentions on the other side of the screen.
 5. All contributions are linted with flake8. We recommend that you run flake8 on your code while developing to fix any issues as you go. We recommend using autopep8 to autoformat your Python code (but please check the code behaviour is not affected by autoformatting before pushing). This makes flake8 happy, and makes it easier for us all to maintain a consistent and readable code base.
 
+## Docstrings
+
+Use the NumPy style in docstrings. See style guide [here](https://numpydoc.readthedocs.io/en/latest/format.html#documenting-classes)
+
 # Installing
 
 ## For users

{pyopia-2.4.4 → pyopia-2.4.6}/README.md

@@ -41,6 +41,10 @@ We welcome additions and improvements to the code! We request that you follow a
 4. All pull requests must be reviewed by a person. The benefits from code review are plenty, but we like to emphasise that code reviews help spreading the awarenes of code changes. Please note that code reviews should be a pleasant experience, so be plesant, polite and remember that there is a human being with good intentions on the other side of the screen.
 5. All contributions are linted with flake8. We recommend that you run flake8 on your code while developing to fix any issues as you go. We recommend using autopep8 to autoformat your Python code (but please check the code behaviour is not affected by autoformatting before pushing). This makes flake8 happy, and makes it easier for us all to maintain a consistent and readable code base.
 
+## Docstrings
+
+Use the NumPy style in docstrings. See style guide [here](https://numpydoc.readthedocs.io/en/latest/format.html#documenting-classes)
+
 # Installing
 
 ## For users

pyopia-2.4.6/pyopia/__init__.py

@@ -0,0 +1 @@
+__version__ = '2.4.6'

{pyopia-2.4.4 → pyopia-2.4.6}/pyopia/instrument/silcam.py

@@ -6,6 +6,7 @@ import os
 import numpy as np
 import pandas as pd
 from skimage.exposure import rescale_intensity
+import skimage.io
 
 
 def timestamp_from_filename(filename):
@@ -25,8 +26,35 @@ def timestamp_from_filename(filename):
     return timestamp
 
 
-def load_image(filename):
-    '''load a .silc file from disc
+def load_mono8(filename):
+    '''load a mono8 .msilc file from disc
+
+    Assumes 8-bit mono image in range 0-255
+
+    Parameters
+    ----------
+    filename : string
+        filename to load
+
+    Returns
+    -------
+    array
+        raw image float between 0-1
+    '''
+    im_mono = np.load(filename, allow_pickle=False).astype(np.float64) / 255
+    image_shape = np.shape(im_mono)
+    if len(image_shape) > 2:
+        if image_shape[2] == 1:
+            img = im_mono[:, :, 0]
+        else:
+            raise RuntimeError('Invalid image dimension')
+    return img
+
+
+def load_rgb8(filename):
+    '''load an RGB .silc file from disc
+
+    Assumes 8-bit RGB image in range 0-255
 
     Parameters
     ----------
@@ -42,15 +70,47 @@ def load_image(filename):
     return img
 
 
+def load_image(filename):
+    '''.. deprecated:: 2.4.6
+        :func:`pyopia.instrument.silcam.load_image` will be removed in version 3.0.0, it is replaced by
+        :func:`pyopia.instrument.silcam.load_rgb8` because this is more explicit to that image type.
+
+    Load an RGB .silc file from disc
+
+    Parameters
+    ----------
+    filename : string
+        filename to load
+
+    Returns
+    -------
+    array
+        raw image float between 0-1
+    '''
+
+    return load_rgb8(filename)
+
+
 class SilCamLoad():
     '''PyOpia pipline-compatible class for loading a single silcam image
-    using :func:`pyopia.instrument.silcam.load_image`
     and extracting the timestamp using
     :func:`pyopia.instrument.silcam.timestamp_from_filename`
 
     Required keys in :class:`pyopia.pipeline.Data`:
         - :attr:`pyopia.pipeline.Data.filename`
 
+    Parameters
+    ----------
+    image_format : str, optional
+        Image file format. Can be either 'infer', 'rgb8' or 'mono8', by default 'infer'.
+
+    Note
+    ----
+        'infer' uses the file extension to determine the image format using the following convention:
+         - '.silc' for RGB8
+         - '.msilc' for MONO8
+         - '.bmp' for using skimage.io.imread
+
     Returns
     -------
     data : :class:`pyopia.pipeline.Data`
@@ -61,16 +121,28 @@ class SilCamLoad():
         :attr:`pyopia.pipeline.Data.img`
     '''
 
-    def __init__(self):
-        pass
+    def __init__(self, image_format='infer'):
+        self.image_format = image_format
+        self.extension_load = {'.silc': load_rgb8,
+                               '.msilc': load_mono8,
+                               '.bmp': skimage.io.imread}
+        self.format_load = {'RGB8': load_rgb8,
+                            'MONO8': load_mono8}
 
     def __call__(self, data):
-        timestamp = timestamp_from_filename(data['filename'])
-        img = load_image(data['filename'])
-        data['timestamp'] = timestamp
-        data['imraw'] = img
+        data['timestamp'] = timestamp_from_filename(data['filename'])
+        data['imraw'] = self.load_image(data['filename'])
         return data
 
+    def load_image(self, filename):
+        if self.image_format == 'infer':
+            file_extension = os.path.splitext(os.path.basename(filename))[-1]
+            load_function = self.extension_load[file_extension]
+        else:
+            load_function = self.format_load[self.image_format]
+        img = load_function(filename)
+        return img
+
 
 class ImagePrep():
     '''PyOpia pipline-compatible class for preparing silcam images for further analysis

{pyopia-2.4.4 → pyopia-2.4.6}/pyopia/io.py

@@ -184,7 +184,7 @@ def combine_stats_netcdf_files(path_to_data, prefix='*'):
 
     sorted_filelist = sorted(glob(os.path.join(path_to_data, prefix + 'Image-D*-STATS.nc')))
     with xarray.open_mfdataset(sorted_filelist, combine='nested', concat_dim='index',
-                               decode_cf=False, parallel=False,
+                               decode_cf=True, parallel=False,
                                coords='minimal', compat='override') as ds:
         xstats = ds.load()
 

pyopia-2.4.4/pyopia/__init__.py

@@ -1 +0,0 @@
-__version__ = '2.4.4'