pye57 0.4.15__cp312-cp312-win_amd64.whl → 0.4.17__cp312-cp312-win_amd64.whl

pye57/__version__.py

@@ -1 +1 @@
-__version__ = "0.4.15"
+__version__ = "0.4.17"

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.dist-info → pye57-0.4.17.dist-info}/METADATA

@@ -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.17.dist-info/RECORD

@@ -0,0 +1,13 @@
+pye57/__init__.py,sha256=keWVF2W7Jau5voY0aufr6bayvjfDJSWf_bmawIvvj88,95
+pye57/__version__.py,sha256=4aW0U0UNijNF-wcZduMEIIsv1YFF2CLlpOHjUj01UNk,24
+pye57/e57.py,sha256=FQp3eCa0-4mARIbVebhssW6bNW5VYl7F_IzxEM_yc6Q,20112
+pye57/exception.py,sha256=9Qgriir0IsSpHhStN5uvI5mlbKrc_P5ZURsi_PIW_q8,50
+pye57/libe57.cp312-win_amd64.pyd,sha256=wlLDuYDshgAfhe5WQOOjdjclI9gykAmkoVGR-pgyu1E,813568
+pye57/scan_header.py,sha256=eCPId1MGxTJmKaqPwHjMJV6bFRvhorcxVmumZOrbLow,6301
+pye57/utils.py,sha256=4jZrQ0sbrsaaFjVkgm_Tf8cLU9fBFb8hvYUDGD2ZJic,4297
+pye57/xerces-c_3_2.dll,sha256=Zwv4i2eMSJq50uWuT_b4HnGSIy9mwm7Lnh1UeorvFI4,2787328
+pye57-0.4.17.dist-info/licenses/LICENSE,sha256=Q0K1iCfVm6UmnR4AAyqME5q7flnU6aGh5OarEIa2K6Y,1056
+pye57-0.4.17.dist-info/METADATA,sha256=otiAqPlP3GKPZHEIgnDxZMeC5HQHSlgroD65r9BKWQY,4947
+pye57-0.4.17.dist-info/WHEEL,sha256=UPBFOm4-IJguDqBVRoKS6hxTeqWyP0GpijaCQTBHWKA,101
+pye57-0.4.17.dist-info/top_level.txt,sha256=xD9HDzQ3BfGMuz1kI2uNKUR0KXcR-RtNEKigrkh48Nk,6
+pye57-0.4.17.dist-info/RECORD,,

{pye57-0.4.15.dist-info → pye57-0.4.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (80.3.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win_amd64
 

pye57-0.4.15.dist-info/RECORD

@@ -1,13 +0,0 @@
-pye57/__init__.py,sha256=keWVF2W7Jau5voY0aufr6bayvjfDJSWf_bmawIvvj88,95
-pye57/__version__.py,sha256=GeEGiiyvw88sVxIJqg7n5M1eCS6IY2LfKAvd2Gy-VLc,24
-pye57/e57.py,sha256=ec9_zxTvZ9TlnIVPMrzzB2wRHQg428F6EtWCCeg05K0,18950
-pye57/exception.py,sha256=9Qgriir0IsSpHhStN5uvI5mlbKrc_P5ZURsi_PIW_q8,50
-pye57/libe57.cp312-win_amd64.pyd,sha256=27HD37mYRRnJDS_3riv1H8emwPbUd82uTvLcBwR-xLo,771072
-pye57/scan_header.py,sha256=eCPId1MGxTJmKaqPwHjMJV6bFRvhorcxVmumZOrbLow,6301
-pye57/utils.py,sha256=4jZrQ0sbrsaaFjVkgm_Tf8cLU9fBFb8hvYUDGD2ZJic,4297
-pye57/xerces-c_3_2.dll,sha256=1RCaxUfD0ljxUb_K0Ls5ddCsBHAo0KEqoO9iUwbis7Q,2787328
-pye57-0.4.15.dist-info/LICENSE,sha256=Q0K1iCfVm6UmnR4AAyqME5q7flnU6aGh5OarEIa2K6Y,1056
-pye57-0.4.15.dist-info/METADATA,sha256=gyvQh475wEkfT-9NjCpk46WlTud61os_7YTkaBfQQ7s,4659
-pye57-0.4.15.dist-info/WHEEL,sha256=3vidnDuZ-QSnHIxLhNbI1gIM-KgyEcMHuZuv1mWPd_Q,101
-pye57-0.4.15.dist-info/top_level.txt,sha256=xD9HDzQ3BfGMuz1kI2uNKUR0KXcR-RtNEKigrkh48Nk,6
-pye57-0.4.15.dist-info/RECORD,,