From a716471131c0a8a3435f06ec201cdea526ba02ed Mon Sep 17 00:00:00 2001
From: Ruben Verweij <verweij@physics.leidenuniv.nl>
Date: Fri, 17 Feb 2017 15:20:09 +0100
Subject: [PATCH] Small fixes

---
 nd2reader/parser.py | 13 ++++++-------
 nd2reader/reader.py | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/nd2reader/parser.py b/nd2reader/parser.py
index 6d9459b..71f3367 100644
--- a/nd2reader/parser.py
+++ b/nd2reader/parser.py
@@ -67,10 +67,9 @@ class Parser(object):
         try:
             timestamp, image = self._get_raw_image_data(image_group_number, channel_offset, self.metadata["height"],
                                                         self.metadata["width"])
-        except NoImageError:
-            return None
+        except (TypeError, NoImageError):
+            return Frame([], frame_no=frame_number, metadata=self._get_frame_metadata())
         else:
-            image.add_params(index, timestamp, frame_number, field_of_view, channel, z_level)
             return image
 
     def get_image_by_attributes(self, frame_number, field_of_view, channel_name, z_level, height, width):
@@ -90,11 +89,10 @@ class Parser(object):
         try:
             timestamp, raw_image_data = self._get_raw_image_data(image_group_number, self._channel_offset[channel_name],
                                                                  height, width)
-            image = Frame(raw_image_data, frame_no=frame_number, metadata=self._get_frame_metadata())
         except (TypeError, NoImageError):
-            return None
+            return Frame([], frame_no=frame_number, metadata=self._get_frame_metadata())
         else:
-            return image
+            return raw_image_data
 
     def get_dtype_from_metadata(self):
         """
@@ -255,7 +253,8 @@ class Parser(object):
         # other cycle to reduce phototoxicity, but NIS Elements still allocated memory as if we were going to take
         # them every cycle.
         if np.any(image_data):
-            return timestamp, Frame(image_data)
+            return timestamp, Frame(image_data, metadata=self._get_frame_metadata())
+
         raise NoImageError
 
     def _get_frame_metadata(self):
diff --git a/nd2reader/reader.py b/nd2reader/reader.py
index 0da55c2..ba65de4 100644
--- a/nd2reader/reader.py
+++ b/nd2reader/reader.py
@@ -1,5 +1,4 @@
-from pims import FramesSequenceND, Frame
-from nd2reader.exceptions import NoImageError
+from pims import FramesSequenceND
 from nd2reader.parser import Parser
 
 
@@ -40,6 +39,14 @@ class ND2Reader(FramesSequenceND):
         if self._fh is not None:
             self._fh.close()
 
+    def get_frame(self, i):
+        """
+        Return one frame
+        :param i:
+        :return:
+        """
+        return self._parser.get_image(i)
+
     def get_frame_2D(self, c, t, z):
         """
         Gets a given frame using the parser
@@ -49,13 +56,8 @@ class ND2Reader(FramesSequenceND):
         :return:
         """
         c_name = self.metadata["channels"][c]
-        try:
-            image = self._parser.get_image_by_attributes(t, 0, c_name, z, self.metadata["width"],
-                                                         self.metadata["height"])
-        except (TypeError, NoImageError):
-            return Frame([])
-        else:
-            return image
+
+        return self._parser.get_image_by_attributes(t, 0, c_name, z, self.metadata["width"], self.metadata["height"])
 
     @property
     def pixel_type(self):