fctpd 0.2.2__tar.gz → 0.2.3__tar.gz

{fctpd-0.2.2/src/fctpd.egg-info → fctpd-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fctpd
-Version: 0.2.2
+Version: 0.2.3
 Summary: Tools for FPH/FPB, CT projection data formats for the modern compute environment.
 Author-email: "J. Genender, J. Hoffman" <johnmarianhoffman@gmail.com>
 Project-URL: Homepage, https://gitlab.com/hoffman-lab/fct/fpb-py

{fctpd-0.2.2 → fctpd-0.2.3}/pyproject.toml

@@ -8,7 +8,7 @@ description = "Tools for FPH/FPB, CT projection data formats for the modern comp
 authors = [
     { name = "J. Genender, J. Hoffman", email = "johnmarianhoffman@gmail.com" }
 ]
-version = "0.2.2"
+version = "0.2.3"
 requires-python = ">= 3.9"
 readme = "README.md"
 classifiers = [

{fctpd-0.2.2 → fctpd-0.2.3}/src/fctpd/fpb_writer.py

@@ -1,7 +1,7 @@
 from . import fields
 from .field_map import FieldMap
 from .header import Header
-from .marshaler import ProjectionMarshaler
+from .marshaler import ProjectionMarshaler, _ProjectionEncoder
 from .projection import Projection
 from .timing import nanosecond
 from .writer import WriteOptions, Writer
@@ -140,7 +140,7 @@ class FPBWriter(Writer):
         self._filePtr.seek(self._footerOffset, os.SEEK_SET)
 
         # Write the header
-        hdr_json: str = dumps(self._header.__dict__)
+        hdr_json: str = dumps(self._header.__dict__, cls=_ProjectionEncoder)
         self._filePtr.write(hdr_json.encode())
 
         # Write the pixel/count data offset

{fctpd-0.2.2 → fctpd-0.2.3}/src/fctpd/fph_writer.py

@@ -2,7 +2,7 @@ from . import fields
 from .enums import WriteMode
 from .field_map import FieldMap
 from .header import Header
-from .marshaler import ProjectionMarshaler
+from .marshaler import ProjectionMarshaler, _ProjectionEncoder
 from .projection import Projection
 from .timing import nanosecond
 from .writer import WriteOptions, Writer
@@ -165,7 +165,7 @@ class FPHWriter(Writer):
         """
         Flushes the Header to disk and ends the write instance.
         """
-        hdr_json: str = dumps(self._header.__dict__, indent=4)
+        hdr_json: str = dumps(self._header.__dict__, indent=4, cls=_ProjectionEncoder)
         self._filePtr.write(hdr_json.encode())
 
         if self.options.writeMode == WriteMode.Single:

{fctpd-0.2.2 → fctpd-0.2.3}/src/fctpd/marshaler.py

@@ -2,11 +2,31 @@ from . import fields
 from .enums import PixelEncoding
 from .field_map import FieldMap
 from .projection import Projection, _MAX_UINT16
+from json import JSONEncoder
 from numpy import number
 from numpy.typing import NDArray
 from sys import byteorder
 import numpy as np
 
+class _ProjectionEncoder(JSONEncoder):
+    """
+    _ProjectionEncoder is an internal class that extends
+    JSONEncoder to numpy type support.
+    """
+    def default(self, o):
+        """
+        Returns a JSON-serializable object for ``o``, or calls 
+        the base implementation (to raise a ``TypeError``).
+        """
+        if isinstance(o, np.floating):
+            return float(o)
+        elif isinstance(o, np.integer):
+            return int(o)
+        elif isinstance(o, np.ndarray):
+            return o.tolist()
+        else:
+            return super().default(o)
+
 
 class ProjectionMarshaler:
     """
@@ -84,6 +104,7 @@ class ProjectionMarshaler:
             fmap[k] = v
 
         # Encode the view. Views must be non-empty.
+        print(fmap)
         fmap[fields.View] = {
             fields.TubeAngle: fmap.pop(fields.TubeAngle),
         }

{fctpd-0.2.2 → fctpd-0.2.3}/src/fctpd/projection.py

@@ -205,10 +205,8 @@ def projections_from_array(
                         fields.MinimumPixelValue: min_px,
                         fields.RescaleSlope: rescale_slope,
                         fields.RescaleIntercept: rescale_intercept,
-                        fields.View: {
-                            fields.TablePosition: zs[proj_idx],
-                            fields.TubeAngle: tube_angles[proj_idx],
-                        },
+                        fields.TablePosition: zs[proj_idx],
+                        fields.TubeAngle: tube_angles[proj_idx],
                     }
                 )
 

{fctpd-0.2.2 → fctpd-0.2.3/src/fctpd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fctpd
-Version: 0.2.2
+Version: 0.2.3
 Summary: Tools for FPH/FPB, CT projection data formats for the modern compute environment.
 Author-email: "J. Genender, J. Hoffman" <johnmarianhoffman@gmail.com>
 Project-URL: Homepage, https://gitlab.com/hoffman-lab/fct/fpb-py