Merge branch '227-typo-in-extrisic_optic_to_user-attribute-for-classe…

…s-rgbinfov1-tofinfov4-tofinfov3' into 'main' Fixed typo in RGBInfoV1, TOFInfoV4 and TOFInfoV3: extrisic_optic_to_user -> extrinsic_optic_to_user Closes #227 See merge request syntron/support/csr/ifm3d/ifm3d!274
ifm · Mar 27, 2023 · bc543b0 · bc543b0
2 parents 76a0f4c + a40a98c
commit bc543b0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixes 
+- Fixed typo in RGBInfoV1, TOFInfoV4 and TOFInfoV3: extrisic_optic_to_user -> extrinsic_optic_to_user
 
 ## 1.2.3 - 2023-03-17
 ### Fixes 

diff --git a/modules/deserialize/include/ifm3d/deserialize/struct_rgb_info_v1.hpp b/modules/deserialize/include/ifm3d/deserialize/struct_rgb_info_v1.hpp
@@ -49,8 +49,8 @@ namespace ifm3d
       timestamp_ns =
         mkval<std::uint64_t>(start_ptr + RGB_INFO_TIMESTAMPS_INDEX);
       exposure_time = mkval<float>(start_ptr + RGB_INFO_EXPOSURE_TIMES_INDEX);
-      extrisic_optic_to_user.Read(start_ptr +
-                                  RGB_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX);
+      extrinsic_optic_to_user.Read(start_ptr +
+                                   RGB_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX);
       intrinsic_calibration.Read(start_ptr +
                                  RGB_INFO_INTRINSIC_CALIBRATION_INDEX);
       inverse_intrinsic_calibration.Read(
@@ -66,7 +66,7 @@ namespace ifm3d
     /*@brief Actual exposure time of the 2D image*/
     float exposure_time;
     /*@brief Extrinsic optic paramter of the 2D head*/
-    calibration::ExtrinsicOpticToUser extrisic_optic_to_user;
+    calibration::ExtrinsicOpticToUser extrinsic_optic_to_user;
     /*@brief Intrinsic Calibration parameters*/
     calibration::IntrinsicCalibration intrinsic_calibration;
     /*@brief Inverse intrinsic Calibration parameters*/

diff --git a/modules/deserialize/include/ifm3d/deserialize/struct_tof_info_v3.hpp b/modules/deserialize/include/ifm3d/deserialize/struct_tof_info_v3.hpp
@@ -55,8 +55,8 @@ namespace ifm3d
         mkval<float>(start_ptr + TOF_INFO_AMPLITUDE_RESOLUTION_INDEX);
       mkarray<float, 3>(start_ptr + TOF_INFO_AMPLITUDE_NORM_FACTOR_INDEX,
                         amp_normalization_factors);
-      extrisic_optic_to_user.Read(start_ptr +
-                                  TOF_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX);
+      extrinsic_optic_to_user.Read(start_ptr +
+                                   TOF_INFO_EXTRINSIC_OPTICAL_TO_USER_INDEX);
       intrinsic_calibration.Read(start_ptr +
                                  TOF_INFO_INTRINSIC_CALIBRATION_INDEX);
       inverse_intrinsic_calibration.Read(
@@ -80,7 +80,7 @@ namespace ifm3d
      * times*/
     std::array<float, 3> amp_normalization_factors;
     /*@brief Extrinsic optic parameter to user*/
-    calibration::ExtrinsicOpticToUser extrisic_optic_to_user;
+    calibration::ExtrinsicOpticToUser extrinsic_optic_to_user;
     /*@brief Intrinsic calibration parameters*/
     calibration::IntrinsicCalibration intrinsic_calibration;
     /*@brief Inverse intrinsic calibration parameters*/

diff --git a/modules/deserialize/test/ifm3d-deserialize-tests.cpp b/modules/deserialize/test/ifm3d-deserialize-tests.cpp
@@ -45,12 +45,12 @@ TEST(DeserializeTestWithFile, struct_tof_info_v3)
                          ifm3d::tof_info::amp_normalization_factors));
 
   std::array<float, 6> extrinc_opt_to_user = {
-    tof_info_v3.extrisic_optic_to_user.trans_x,
-    tof_info_v3.extrisic_optic_to_user.trans_y,
-    tof_info_v3.extrisic_optic_to_user.trans_z,
-    tof_info_v3.extrisic_optic_to_user.rot_x,
-    tof_info_v3.extrisic_optic_to_user.rot_y,
-    tof_info_v3.extrisic_optic_to_user.rot_z};
+    tof_info_v3.extrinsic_optic_to_user.trans_x,
+    tof_info_v3.extrinsic_optic_to_user.trans_y,
+    tof_info_v3.extrinsic_optic_to_user.trans_z,
+    tof_info_v3.extrinsic_optic_to_user.rot_x,
+    tof_info_v3.extrinsic_optic_to_user.rot_y,
+    tof_info_v3.extrinsic_optic_to_user.rot_z};
 
   EXPECT_TRUE(ifm3d::compare_array(extrinc_opt_to_user,
                                    ifm3d::tof_info::extrincsic_optic_to_user));
@@ -110,12 +110,12 @@ TEST(DeserializeTestWithFile, struct_tof_info_v4)
                          ifm3d::tof_info::amp_normalization_factors));
 
   std::array<float, 6> extrinc_opt_to_user = {
-    tof_info_v4.extrisic_optic_to_user.trans_x,
-    tof_info_v4.extrisic_optic_to_user.trans_y,
-    tof_info_v4.extrisic_optic_to_user.trans_z,
-    tof_info_v4.extrisic_optic_to_user.rot_x,
-    tof_info_v4.extrisic_optic_to_user.rot_y,
-    tof_info_v4.extrisic_optic_to_user.rot_z};
+    tof_info_v4.extrinsic_optic_to_user.trans_x,
+    tof_info_v4.extrinsic_optic_to_user.trans_y,
+    tof_info_v4.extrinsic_optic_to_user.trans_z,
+    tof_info_v4.extrinsic_optic_to_user.rot_x,
+    tof_info_v4.extrinsic_optic_to_user.rot_y,
+    tof_info_v4.extrinsic_optic_to_user.rot_z};
 
   EXPECT_TRUE(ifm3d::compare_array(extrinc_opt_to_user,
                                    ifm3d::tof_info::extrincsic_optic_to_user));
@@ -179,12 +179,12 @@ TEST(DeserializeTestWithFile, struct_rgb_info_v1)
               ifm3d::epsilon);
 
   std::array<float, 6> extrinc_opt_to_user = {
-    rgb_info_v1.extrisic_optic_to_user.trans_x,
-    rgb_info_v1.extrisic_optic_to_user.trans_y,
-    rgb_info_v1.extrisic_optic_to_user.trans_z,
-    rgb_info_v1.extrisic_optic_to_user.rot_x,
-    rgb_info_v1.extrisic_optic_to_user.rot_y,
-    rgb_info_v1.extrisic_optic_to_user.rot_z};
+    rgb_info_v1.extrinsic_optic_to_user.trans_x,
+    rgb_info_v1.extrinsic_optic_to_user.trans_y,
+    rgb_info_v1.extrinsic_optic_to_user.trans_z,
+    rgb_info_v1.extrinsic_optic_to_user.rot_x,
+    rgb_info_v1.extrinsic_optic_to_user.rot_y,
+    rgb_info_v1.extrinsic_optic_to_user.rot_z};
 
   EXPECT_TRUE(ifm3d::compare_array(extrinc_opt_to_user,
                                    ifm3d::rgb_info::extrincsic_optic_to_user));

diff --git a/modules/pybind11/src/bindings/deserialize/rgb_info_v1.h b/modules/pybind11/src/bindings/deserialize/rgb_info_v1.h
@@ -55,8 +55,8 @@ bind_struct_rgbinfov1(pybind11::module_& m)
         Actual exposure time of the 2D image
       )");
   rgb_info_v1.def_readonly(
-    "extrisic_optic_to_user",
-    &ifm3d::RGBInfoV1::extrisic_optic_to_user,
+    "extrinsic_optic_to_user",
+    &ifm3d::RGBInfoV1::extrinsic_optic_to_user,
     R"(
         Extrinsic optic paramter of the 2D head
       )");

diff --git a/modules/pybind11/src/bindings/deserialize/tof_info_v3.h b/modules/pybind11/src/bindings/deserialize/tof_info_v3.h
@@ -128,8 +128,8 @@ bind_struct_tofinfov3(pybind11::module_& m)
           Amplitude normalization factors for the individual exposure times
       )");
   tof_info_v3.def_readonly(
-    "extrisic_optic_to_user",
-    &ifm3d::TOFInfoV3::extrisic_optic_to_user,
+    "extrinsic_optic_to_user",
+    &ifm3d::TOFInfoV3::extrinsic_optic_to_user,
     R"(
         Extrinsic optic parameter to user
       )");