Merge branch 'main' of https://github.com/dancergraham/e57-python into fix-intensity-values

Author: dancergraham

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Graham Knapp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/lib.rs

@@ -52,6 +52,8 @@ unsafe fn read_points(py: Python<'_>, filepath: &str) -> PyResult<E57> {
     let mut color_vec = Vec::with_capacity(pc.records as usize * 3);
     let mut intensity_vec = Vec::with_capacity(pc.records as usize);
     let mut nrows = 0;
+    let intensity_min = pc.intensity_limits.map(|limits| limits.min).unwrap_or(0.0);
+    let intensity_max = pc.intensity_limits.map(|limits| limits.max).unwrap_or(1.0);
     for pointcloud in file.pointclouds() {
         let mut iter = file
             .pointcloud_simple(&pointcloud)
@@ -72,7 +74,8 @@ unsafe fn read_points(py: Python<'_>, filepath: &str) -> PyResult<E57> {
                 color_vec.extend([color.red, color.green, color.blue])
             }
             if let Some(intensity) = p.intensity {
-                intensity_vec.push(intensity)
+                let rescaled_intensity = (intensity * (intensity_max - intensity_min)) + intensity_min;
+                intensity_vec.push(rescaled_intensity)
             }
         }
     }