pye57 0.4.16__tar.gz → 0.4.18__tar.gz

{pye57-0.4.16/src/pye57.egg-info → pye57-0.4.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pye57
-Version: 0.4.16
+Version: 0.4.18
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
@@ -24,6 +24,20 @@ Requires-Dist: numpy
 Requires-Dist: pyquaternion
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # pye57
@@ -67,10 +81,10 @@ assert isinstance(data["columnIndex"], np.ndarray)
 data_raw = e57.read_scan_raw(0)
 
 # writing is also possible, but only using raw data for now
-e57_write = pye57.E57("e57_file_write.e57", mode='w')
-e57_write.write_scan_raw(data_raw)
-# you can specify a header to copy information from
-e57_write.write_scan_raw(data_raw, scan_header=e57.get_header(0))
+with pye57.E57("e57_file_write.e57", mode='w') as e57_write:
+    e57_write.write_scan_raw(data_raw)
+    # you can specify a header to copy information from
+    e57_write.write_scan_raw(data_raw, scan_header=e57.get_header(0))
 
 # the ScanHeader object wraps most of the scan information:
 header = e57.get_header(0)

{pye57-0.4.16 → pye57-0.4.18}/README.md

@@ -39,10 +39,10 @@ assert isinstance(data["columnIndex"], np.ndarray)
 data_raw = e57.read_scan_raw(0)
 
 # writing is also possible, but only using raw data for now
-e57_write = pye57.E57("e57_file_write.e57", mode='w')
-e57_write.write_scan_raw(data_raw)
-# you can specify a header to copy information from
-e57_write.write_scan_raw(data_raw, scan_header=e57.get_header(0))
+with pye57.E57("e57_file_write.e57", mode='w') as e57_write:
+    e57_write.write_scan_raw(data_raw)
+    # you can specify a header to copy information from
+    e57_write.write_scan_raw(data_raw, scan_header=e57.get_header(0))
 
 # the ScanHeader object wraps most of the scan information:
 header = e57.get_header(0)

pye57-0.4.18/src/pye57/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.4.18"

{pye57-0.4.16 → pye57-0.4.18}/src/pye57/e57.py

@@ -110,6 +110,11 @@ class E57:
         self.root.set("images2D", libe57.VectorNode(imf, True))
 
     def make_buffer(self, field_name, capacity, do_conversion=True, do_scaling=True):
+        # now this exception should never get hit through read_scan or read_scan_raw
+        # for read_scan, the headers are constructed, so they should all be supported
+        # for read_scan_raw, it now filters out the unsupported headers
+        # however, if make_buffer or make_buffers gets called, an unsupported field name could be passed in directly
+        # if we don't want users calling them, maybe we could make them private, and this would be an assertion
         if field_name not in SUPPORTED_POINT_FIELDS:
             raise ValueError("Unsupported point field: %s" % field_name)
 
@@ -131,11 +136,22 @@ class E57:
             buffers.append(b)
         return data, buffers
 
-    def read_scan_raw(self, index) -> Dict:
+    def read_scan_raw(self, index, ignore_unsupported_fields=False) -> Dict:
         header = self.get_header(index)
+        supported_point_fields = []
+        unsupported_point_fields = []
+        for field in header.point_fields:
+            if field in SUPPORTED_POINT_FIELDS:
+                supported_point_fields.append(field)
+            else:
+                unsupported_point_fields.append(field)
+        if unsupported_point_fields != [] and not ignore_unsupported_fields:
+            raise ValueError("Unsupported point fields: %s.\n"
+                            "Consider using 'ignore_unsupported_fields' to skip them." % unsupported_point_fields)
+        # could it call make_buffers instead, it looks like the code's identical
         data = {}
         buffers = libe57.VectorSourceDestBuffer()
-        for field in header.point_fields:
+        for field in supported_point_fields:
             np_array, buffer = self.make_buffer(field, header.point_count)
             data[field] = np_array
             buffers.append(buffer)

{pye57-0.4.16 → pye57-0.4.18}/src/pye57/scan_header.py

@@ -28,7 +28,11 @@ class ScanHeader:
 
     @property
     def rotation_matrix(self) -> np.array:
-        q = Quaternion([e.value() for e in self.node["pose"]["rotation"]])
+        try:
+            rotation = self.node["pose"]["rotation"]
+            q = Quaternion([e.value() for e in rotation])
+        except libe57.E57Exception:
+            q = Quaternion()
         return q.rotation_matrix
 
     @property
@@ -36,13 +40,17 @@ class ScanHeader:
         try:
             rotation = self.node["pose"]["rotation"]
             q = Quaternion([e.value() for e in rotation])
-        except KeyError:
+        except libe57.E57Exception:
             q = Quaternion()
         return q.elements
 
     @property
     def translation(self):
-        return np.array([e.value() for e in self.node["pose"]["translation"]])
+        try:
+            translation_values = [e.value() for e in self.node["pose"]["translation"]]
+        except libe57.E57Exception:
+            translation_values = [0] * 3
+        return np.array(translation_values)
 
     def pretty_print(self, node=None, indent=""):
         if node is None:

{pye57-0.4.16 → pye57-0.4.18/src/pye57.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pye57
-Version: 0.4.16
+Version: 0.4.18
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
@@ -24,6 +24,20 @@ Requires-Dist: numpy
 Requires-Dist: pyquaternion
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # pye57
@@ -67,10 +81,10 @@ assert isinstance(data["columnIndex"], np.ndarray)
 data_raw = e57.read_scan_raw(0)
 
 # writing is also possible, but only using raw data for now
-e57_write = pye57.E57("e57_file_write.e57", mode='w')
-e57_write.write_scan_raw(data_raw)
-# you can specify a header to copy information from
-e57_write.write_scan_raw(data_raw, scan_header=e57.get_header(0))
+with pye57.E57("e57_file_write.e57", mode='w') as e57_write:
+    e57_write.write_scan_raw(data_raw)
+    # you can specify a header to copy information from
+    e57_write.write_scan_raw(data_raw, scan_header=e57.get_header(0))
 
 # the ScanHeader object wraps most of the scan information:
 header = e57.get_header(0)

{pye57-0.4.16 → pye57-0.4.18}/tests/test_main.py

@@ -49,6 +49,16 @@ def e57_with_data_and_images_path():
     # From http://www.libe57.org/data.html
     return sample_data("pumpAVisualReferenceImage.e57")
 
+@pytest.fixture
+def e57_with_normals_path():
+    # created using Python's open3d and CloudCompare
+    return sample_data("testWithNormals.e57")
+
+@pytest.fixture
+def e57_translation_without_rotation_path():
+    # this e57 was generated using write_scan_raw
+    # however, the line to set the rotation was temporarily commented out
+    return sample_data("translationWithoutRotation.e57")
 
 @pytest.fixture
 def temp_e57_write(request):
@@ -160,6 +170,13 @@ def test_unsupported_point_field(temp_e57_write):
             f.write_scan_raw(data)
 
 
+def test_ignore_unsupported_fields(e57_with_normals_path):
+    e57 = pye57.E57(e57_with_normals_path)
+    with pytest.raises(ValueError):
+        e57.read_scan_raw(0)
+    e57.read_scan_raw(0, ignore_unsupported_fields=True)
+
+
 def test_source_dest_buffers_raises(e57_path):
     f = libe57.ImageFile(e57_path, "r")
     capacity = 1000
@@ -312,6 +329,20 @@ def test_scan_position(e57_path):
     e57 = pye57.E57(e57_path)
     assert np.allclose(e57.scan_position(3), np.array([[3.01323456e+05, 5.04260184e+06, 1.56040279e+01]]))
 
+def test_translation_without_rotation(e57_translation_without_rotation_path):
+    import numpy as np
+    e57 = pye57.E57(e57_translation_without_rotation_path)
+    header = e57.get_header(0)
+    # translation is defined but not rotation:
+    assert header["pose"].isDefined("translation")
+    assert not header["pose"].isDefined("rotation")
+    # an arbitrary translation was defined in the e57:
+    assert np.array_equal(header.translation, np.array([4,5,6]))
+    # when rotation is not defined, the identity is used:
+    assert np.array_equal(header.rotation, np.array([1,0,0,0]))
+    assert np.array_equal(header.rotation_matrix, np.eye(3))
+    # the scan can be read when translation is defined but not rotation:
+    e57.read_scan(0, ignore_missing_fields=True)
 
 BUFFER_TYPES = {
     libe57.FloatNode: 'd',

pye57-0.4.16/src/pye57/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.4.16"