pye57 0.4.15__tar.gz → 0.4.17__tar.gz

{pye57-0.4.15/src/pye57.egg-info → pye57-0.4.17}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pye57
-Version: 0.4.15
+Version: 0.4.17
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
@@ -11,20 +11,33 @@ License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 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
@@ -68,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.15 → pye57-0.4.17}/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.15 → pye57-0.4.17}/setup.py

@@ -90,12 +90,14 @@ class BuildExt(build_ext):
             opts.append("-DCRCPP_USE_CPP11")
             opts.append("-DCRCPP_BRANCHLESS")
             opts.append("-Wno-unused-variable")
+            opts.append("-DE57_ENABLE_DIAGNOSTIC_OUTPUT")
         elif ct == "msvc":
             opts.append(f'/DVERSION_INFO="{version}"')
             opts.append(rf'/DREVISION_ID="\"{revision_id}\""')
             opts.append("/DCRCPP_USE_CPP11")
             opts.append("/DCRCPP_BRANCHLESS")
             opts.append("/DWINDOWS")
+            opts.append("/DE57_ENABLE_DIAGNOSTIC_OUTPUT")
         for ext in self.extensions:
             ext.extra_compile_args = opts
 
@@ -132,7 +134,6 @@ setup(
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
@@ -142,5 +143,5 @@ setup(
     ],
     cmdclass={"build_ext": BuildExt},
     zip_safe=False,
-    python_requires=">=3.8",
+    python_requires=">=3.9",
 )

pye57-0.4.17/src/pye57/__version__.py

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

{pye57-0.4.15 → pye57-0.4.17}/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)
@@ -376,9 +392,9 @@ class E57:
             max_row = np.max(data["rowIndex"])
             min_col = np.min(data["columnIndex"])
             max_col = np.max(data["columnIndex"])
-            points_prototype.set("rowIndex", libe57.IntegerNode(self.image_file, 0, min_row, max_row))
+            points_prototype.set("rowIndex", libe57.IntegerNode(self.image_file, min_row, min_row, max_row))
             field_names.append("rowIndex")
-            points_prototype.set("columnIndex", libe57.IntegerNode(self.image_file, 0, min_col, max_col))
+            points_prototype.set("columnIndex", libe57.IntegerNode(self.image_file, min_col, min_col, max_col))
             field_names.append("columnIndex")
 
         if "cartesianInvalidState" in data:

{pye57-0.4.15 → pye57-0.4.17}/src/pye57/libe57_wrapper.cpp

@@ -7,6 +7,8 @@
 #include <E57Format.h>
 #include <E57Version.h>
 #include <ASTMVersion.h>
+#include <sstream>
+#include <string.h>
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -40,11 +42,14 @@ PYBIND11_MODULE(libe57, m) {
 
     static py::exception<E57Exception> exc(m, "E57Exception");
     py::register_exception_translator([](std::exception_ptr p) {
-    try {
-        if (p) std::rethrow_exception(p);
-    } catch (const E57Exception &e) {
-        exc(Utilities::errorCodeToString(e.errorCode()).c_str());
-    }
+        try {
+            if (p) std::rethrow_exception(p);
+        } catch (const E57Exception &e) {
+            std::stringstream ss;
+            e.report(__FILE__, __LINE__, __FUNCTION__, ss);
+            std::string output = e.errorStr() + std::string("\n\n") + ss.str();
+            exc(output.c_str());
+        }
     });
 
     m.attr("E57_FORMAT_MAJOR") = E57_FORMAT_MAJOR;

{pye57-0.4.15 → pye57-0.4.17/src/pye57.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pye57
-Version: 0.4.15
+Version: 0.4.17
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
@@ -11,20 +11,33 @@ License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 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
@@ -68,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.15 → pye57-0.4.17}/tests/test_main.py

@@ -49,6 +49,10 @@ 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 temp_e57_write(request):
@@ -160,6 +164,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
@@ -419,3 +430,24 @@ def test_clone_e57(e57_with_data_and_images_path, temp_e57_write):
 
     in_image.close()
     out_image.close()
+
+
+def test_write_e57_with_rowindex_and_columnindex_omiting_low_values(temp_e57_write):
+
+    with pye57.E57(temp_e57_write, mode='w') as e57:
+        # set some test points with missing row and column 0 (so np.min of it in write_scan_raw is larger than 0)
+        data_raw = {}
+        data_raw["cartesianX"] = np.array([0, 1, 2, 3]).astype(float)
+        data_raw["cartesianY"] = np.array([0, 1, 2, 3]).astype(float)
+        data_raw["cartesianZ"] = np.array([0, 1, 2, 3]).astype(float)
+        data_raw["rowIndex"] = np.array([1, 1, 2, 3])
+        data_raw["columnIndex"] = np.array([1, 1, 2, 3])
+
+        try:
+            # the next line will throw without the suggested fix
+            e57.write_scan_raw(data_raw, name='test_output_with_row_and_column')
+        except pye57.libe57.E57Exception as ex:
+            print(ex)
+            assert False
+    
+    assert os.path.isfile(temp_e57_write)

pye57-0.4.15/src/pye57/__version__.py

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