Merge pull request #1648 from alicevision/dev/sfmDataRenaming

[sfmData] Rename functions and files to respect case rules

src/aliceVision/matchingImageCollection/GeometricFilterMatrix_E_AC.hpp

@@ -63,8 +63,8 @@ struct GeometricFilterMatrix_E_AC : public GeometricFilterMatrix
         const sfmData::View& viewJ = sfmData->getView(J);
 
         // Check that valid cameras can be retrieved for the pair of views
-        std::shared_ptr<camera::IntrinsicBase> cam_I = sfmData->getIntrinsicsharedPtr(viewI.getIntrinsicId());
-        std::shared_ptr<camera::IntrinsicBase> cam_J = sfmData->getIntrinsicsharedPtr(viewJ.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> cam_I = sfmData->getIntrinsicSharedPtr(viewI.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> cam_J = sfmData->getIntrinsicSharedPtr(viewJ.getIntrinsicId());
 
         if (!cam_I || !cam_J)
             return EstimationStatus(false, false);

src/aliceVision/sfm/bundle/BundleAdjustmentCeres.cpp

@@ -814,7 +814,7 @@ void BundleAdjustmentCeres::addLandmarksToProblem(const sfmData::SfMData& sfmDat
             // dimensional residual. Internally, the cost function stores the observed
             // image location and compares the reprojection against the observation.
             const auto& pose = sfmData.getPose(view);
-            const auto& intrinsic = sfmData.getIntrinsicsharedPtr(view);
+            const auto& intrinsic = sfmData.getIntrinsicSharedPtr(view);
 
             assert(pose.getState() != EEstimatorParameterState::IGNORED);
             assert(intrinsic->getState() != EEstimatorParameterState::IGNORED);
@@ -883,8 +883,8 @@ void BundleAdjustmentCeres::addConstraints2DToProblem(const sfmData::SfMData& sf
 
         const auto& pose_1 = sfmData.getPose(view_1);
         const auto& pose_2 = sfmData.getPose(view_2);
-        const auto& intrinsic_1 = sfmData.getIntrinsicsharedPtr(view_1);
-        const auto& intrinsic_2 = sfmData.getIntrinsicsharedPtr(view_2);
+        const auto& intrinsic_1 = sfmData.getIntrinsicSharedPtr(view_1);
+        const auto& intrinsic_2 = sfmData.getIntrinsicSharedPtr(view_2);
 
         assert(pose_1.getState() != EEstimatorParameterState::IGNORED);
         assert(intrinsic_1->getState() != EEstimatorParameterState::IGNORED);
@@ -1029,7 +1029,7 @@ void BundleAdjustmentCeres::updateFromSolution(sfmData::SfMData& sfmData, ERefin
         {
             const IndexT intrinsicId = intrinsicBlockPair.first;
 
-            const auto& intrinsic = sfmData.getIntrinsicsharedPtr(intrinsicId);
+            const auto& intrinsic = sfmData.getIntrinsicSharedPtr(intrinsicId);
 
             // do not update a camera pose set as Ignored or Constant in the Local strategy
             if (intrinsic->getState() != EEstimatorParameterState::REFINED)

src/aliceVision/sfm/bundle/BundleAdjustmentSymbolicCeres.cpp

@@ -568,8 +568,8 @@ void BundleAdjustmentSymbolicCeres::addConstraints2DToProblem(const sfmData::SfM
 
         const auto& pose_1 = sfmData.getPose(view_1);
         const auto& pose_2 = sfmData.getPose(view_2);
-        const auto& intrinsic_1 = sfmData.getIntrinsicsharedPtr(view_1);
-        const auto& intrinsic_2 = sfmData.getIntrinsicsharedPtr(view_2);
+        const auto& intrinsic_1 = sfmData.getIntrinsicSharedPtr(view_1);
+        const auto& intrinsic_2 = sfmData.getIntrinsicSharedPtr(view_2);
 
         assert(pose_1.getState() != EEstimatorParameterState::IGNORED);
         assert(intrinsic_1->getState() != EEstimatorParameterState::IGNORED);
@@ -587,7 +587,7 @@ void BundleAdjustmentSymbolicCeres::addConstraints2DToProblem(const sfmData::SfM
         /* For the moment assume a unique camera */
         assert(intrinsicBlockPtr_1 == intrinsicBlockPtr_2);
 
-        std::shared_ptr<IntrinsicBase> intrinsic = sfmData.getIntrinsicsharedPtr(view_1.getIntrinsicId());
+        std::shared_ptr<IntrinsicBase> intrinsic = sfmData.getIntrinsicSharedPtr(view_1.getIntrinsicId());
         std::shared_ptr<camera::Equidistant> equidistant = std::dynamic_pointer_cast<camera::Equidistant>(intrinsic);
         std::shared_ptr<camera::Pinhole> pinhole = std::dynamic_pointer_cast<camera::Pinhole>(intrinsic);
 
@@ -722,7 +722,7 @@ void BundleAdjustmentSymbolicCeres::updateFromSolution(sfmData::SfMData& sfmData
         {
             const IndexT intrinsicId = intrinsicBlockPair.first;
 
-            const auto& intrinsic = sfmData.getIntrinsicsharedPtr(intrinsicId);
+            const auto& intrinsic = sfmData.getIntrinsicSharedPtr(intrinsicId);
 
             // do not update a camera pose set as Ignored or Constant in the Local strategy
             if (intrinsic->getState() != EEstimatorParameterState::REFINED)

src/aliceVision/sfm/pipeline/panorama/ReconstructionEngine_panorama.cpp

@@ -502,8 +502,8 @@ bool ReconstructionEngine_panorama::addConstraints2DWithKnownRotation()
         sfmData::CameraPose iTo = _sfmData.getAbsolutePose(vI.getPoseId());
         sfmData::CameraPose jTo = _sfmData.getAbsolutePose(vJ.getPoseId());
 
-        std::shared_ptr<camera::IntrinsicBase> intrinsicI = _sfmData.getIntrinsicsharedPtr(vI.getIntrinsicId());
-        std::shared_ptr<camera::IntrinsicBase> intrinsicJ = _sfmData.getIntrinsicsharedPtr(vJ.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> intrinsicI = _sfmData.getIntrinsicSharedPtr(vI.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> intrinsicJ = _sfmData.getIntrinsicSharedPtr(vJ.getIntrinsicId());
 
         Mat3 iRo = iTo.getTransform().rotation();
         Mat3 jRo = jTo.getTransform().rotation();
@@ -915,12 +915,12 @@ bool ReconstructionEngine_panorama::buildLandmarks()
     {
         // Retrieve camera parameters
         const sfmData::View& v1 = _sfmData.getView(c.ViewFirst);
-        const std::shared_ptr<camera::IntrinsicBase> cam1 = _sfmData.getIntrinsicsharedPtr(v1.getIntrinsicId());
+        const std::shared_ptr<camera::IntrinsicBase> cam1 = _sfmData.getIntrinsicSharedPtr(v1.getIntrinsicId());
         const sfmData::CameraPose pose1 = _sfmData.getPose(v1);
         const Vec3 wpt1 = cam1->backproject(c.ObservationFirst.getCoordinates(), true, pose1.getTransform(), 1.0);
 
         const sfmData::View& v2 = _sfmData.getView(c.ViewSecond);
-        const std::shared_ptr<camera::IntrinsicBase> cam2 = _sfmData.getIntrinsicsharedPtr(v2.getIntrinsicId());
+        const std::shared_ptr<camera::IntrinsicBase> cam2 = _sfmData.getIntrinsicSharedPtr(v2.getIntrinsicId());
         const sfmData::CameraPose pose2 = _sfmData.getPose(v2);
         const Vec3 wpt2 = cam2->backproject(c.ObservationSecond.getCoordinates(), true, pose2.getTransform(), 1.0);
 

src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp

@@ -1576,7 +1576,7 @@ bool ReconstructionEngine_sequentialSfM::computeResection(const IndexT viewId, R
 
     // B. Look if intrinsic data is known or not
     std::shared_ptr<View> view_I = _sfmData.getViews().at(viewId);
-    std::shared_ptr<camera::IntrinsicBase> intrinsics = _sfmData.getIntrinsicsharedPtr(view_I->getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> intrinsics = _sfmData.getIntrinsicSharedPtr(view_I->getIntrinsicId());
     if (intrinsics == nullptr)
     {
         throw std::runtime_error("Intrinsic " + std::to_string(view_I->getIntrinsicId()) +
@@ -1655,7 +1655,7 @@ void ReconstructionEngine_sequentialSfM::updateScene(const IndexT viewIndex, con
     const View& view = *_sfmData.getViews().at(viewIndex);
     _sfmData.setPose(view, CameraPose(resectionData.pose));
 
-    std::shared_ptr<camera::IntrinsicBase> intrinsics = _sfmData.getIntrinsicsharedPtr(view.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> intrinsics = _sfmData.getIntrinsicSharedPtr(view.getIntrinsicId());
 
     // B. Update the observations into the global scene structure
     // - Add the new 2D observations to the reconstructed tracks

src/aliceVision/sfmData/CMakeLists.txt

@@ -8,8 +8,8 @@ set(sfmData_files_headers
   uid.hpp
   colorize.hpp
   exif.hpp
-  imageInfo.hpp
-  exposureSetting.hpp
+  ImageInfo.hpp
+  ExposureSetting.hpp
   Observation.hpp
 )
 
@@ -20,7 +20,7 @@ set(sfmData_files_sources
   View.cpp
   colorize.cpp
   exif.cpp
-  imageInfo.cpp
+  ImageInfo.cpp
   Observation.cpp
 )
 

src/aliceVision/sfmData/imageInfo.cpp → src/aliceVision/sfmData/ImageInfo.cpp

@@ -4,7 +4,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "imageInfo.hpp"
+#include "ImageInfo.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <aliceVision/numeric/gps.hpp>

src/aliceVision/sfmData/imageInfo.hpp → src/aliceVision/sfmData/ImageInfo.hpp

@@ -10,7 +10,7 @@
 
 #include <aliceVision/image/dcp.hpp>
 #include <aliceVision/lensCorrectionProfile/lcp.hpp>
-#include <aliceVision/sfmData/exposureSetting.hpp>
+#include <aliceVision/sfmData/ExposureSetting.hpp>
 #include <aliceVision/sfmData/exif.hpp>
 #include <aliceVision/sensorDB/Datasheet.hpp>
 #include <aliceVision/camera/IntrinsicInitMode.hpp>

src/aliceVision/sfmData/SfMData.hpp

@@ -196,7 +196,7 @@ class SfMData
      * @brief Return a shared pointer to an intrinsic if available or nullptr otherwise.
      * @param[in] intrinsicId
      */
-    std::shared_ptr<camera::IntrinsicBase> getIntrinsicsharedPtr(IndexT intrinsicId)
+    std::shared_ptr<camera::IntrinsicBase> getIntrinsicSharedPtr(IndexT intrinsicId)
     {
         if (_intrinsics.count(intrinsicId))
             return _intrinsics.at(intrinsicId);
@@ -207,7 +207,7 @@ class SfMData
      * @brief Return a shared pointer to an intrinsic if available or nullptr otherwise.
      * @param[in] v
      */
-    std::shared_ptr<camera::IntrinsicBase> getIntrinsicsharedPtr(const View& v)
+    std::shared_ptr<camera::IntrinsicBase> getIntrinsicSharedPtr(const View& v)
     {
         IndexT intrinsicId = v.getIntrinsicId();
 
@@ -220,7 +220,7 @@ class SfMData
      * @brief Return a shared pointer to an intrinsic if available or nullptr otherwise.
      * @param[in] intrinsicId
      */
-    const std::shared_ptr<camera::IntrinsicBase> getIntrinsicsharedPtr(IndexT intrinsicId) const
+    const std::shared_ptr<camera::IntrinsicBase> getIntrinsicSharedPtr(IndexT intrinsicId) const
     {
         if (_intrinsics.count(intrinsicId))
             return _intrinsics.at(intrinsicId);
@@ -231,7 +231,7 @@ class SfMData
      * @brief Return a shared pointer to an intrinsic if available or nullptr otherwise.
      * @param[in] v
      */
-    const std::shared_ptr<camera::IntrinsicBase> getIntrinsicsharedPtr(const View& v) const
+    const std::shared_ptr<camera::IntrinsicBase> getIntrinsicSharedPtr(const View& v) const
     {
         IndexT intrinsicId = v.getIntrinsicId();
 

src/aliceVision/sfmData/View.hpp

@@ -14,9 +14,9 @@
 #include <aliceVision/camera/IntrinsicInitMode.hpp>
 #include <aliceVision/lensCorrectionProfile/lcp.hpp>
 
-#include <aliceVision/sfmData/imageInfo.hpp>
+#include <aliceVision/sfmData/ImageInfo.hpp>
 #include <aliceVision/sfmData/exif.hpp>
-#include <aliceVision/sfmData/exposureSetting.hpp>
+#include <aliceVision/sfmData/ExposureSetting.hpp>
 
 #include <regex>
 #include <string>

src/aliceVision/sfmDataIO/AlembicExporter.cpp

@@ -373,7 +373,7 @@ void AlembicExporter::addSfMSingleCamera(const sfmData::SfMData& sfmData, const
     const sfmData::CameraPose* pose =
       ((flagsPart & ESfMData::EXTRINSICS) && sfmData.existsPose(view)) ? &(sfmData.getPoses().at(view.getPoseId())) : nullptr;
     const std::shared_ptr<camera::IntrinsicBase> intrinsic =
-      (flagsPart & ESfMData::INTRINSICS) ? sfmData.getIntrinsicsharedPtr(view.getIntrinsicId()) : nullptr;
+      (flagsPart & ESfMData::INTRINSICS) ? sfmData.getIntrinsicSharedPtr(view.getIntrinsicId()) : nullptr;
 
     if (sfmData.isPoseAndIntrinsicDefined(&view) && (flagsPart & ESfMData::EXTRINSICS))
         _dataImpl->addCamera(name, view, pose, intrinsic, nullptr, &_dataImpl->_mvgCameras);
@@ -434,7 +434,7 @@ void AlembicExporter::addSfMCameraRig(const sfmData::SfMData& sfmData, IndexT ri
         const bool isReconstructed = (rigSubPose.status != sfmData::ERigSubPoseStatus::UNINITIALIZED);
         const std::string name = fs::path(view.getImage().getImagePath()).stem().string();
         const std::shared_ptr<camera::IntrinsicBase> intrinsic =
-          (flagsPart & ESfMData::INTRINSICS) ? sfmData.getIntrinsicsharedPtr(view.getIntrinsicId()) : nullptr;
+          (flagsPart & ESfMData::INTRINSICS) ? sfmData.getIntrinsicSharedPtr(view.getIntrinsicId()) : nullptr;
         std::unique_ptr<sfmData::CameraPose> subPosePtr;
 
         if (isReconstructed && (flagsPart & ESfMData::EXTRINSICS))

src/software/convert/main_importKnownPoses.cpp

@@ -188,7 +188,7 @@ int aliceVision_main(int argc, char** argv)
                 sfmData::View& view = sfmData.getView(viewId);
                 sfmData::CameraPose& pose = sfmData.getPoses()[view.getPoseId()];
 
-                std::shared_ptr<camera::IntrinsicBase> intrinsicBase = sfmData.getIntrinsicsharedPtr(view.getIntrinsicId());
+                std::shared_ptr<camera::IntrinsicBase> intrinsicBase = sfmData.getIntrinsicSharedPtr(view.getIntrinsicId());
 
                 Eigen::Map<const Eigen::Matrix<double, 3, 3, Eigen::RowMajor>> rot(xmp.rotation.data());
 

src/software/export/main_exportMeshroomMaya.cpp

@@ -77,7 +77,7 @@ int aliceVision_main(int argc, char** argv)
     for (auto& viewPair : sfmData.getViews())
     {
         const sfmData::View& view = *viewPair.second;
-        const std::shared_ptr<camera::IntrinsicBase> intrinsicPtr = sfmData.getIntrinsicsharedPtr(view.getIntrinsicId());
+        const std::shared_ptr<camera::IntrinsicBase> intrinsicPtr = sfmData.getIntrinsicSharedPtr(view.getIntrinsicId());
 
         if (intrinsicPtr == nullptr)
         {

src/software/pipeline/main_nodalSfM.cpp

@@ -139,8 +139,8 @@ void buildInitialWorld(sfmData::SfMData& sfmData,
     sfmData.setPose(refView, sfmData::CameraPose());
     sfmData.setPose(nextView, sfmData::CameraPose(geometry::Pose3(pair.R, Vec3::Zero())));
 
-    std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicsharedPtr(refView.getIntrinsicId());
-    std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicsharedPtr(nextView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicSharedPtr(refView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicSharedPtr(nextView.getIntrinsicId());
 
     const feature::MapFeaturesPerDesc& refFeaturesPerDesc = featuresPerView.getFeaturesPerDesc(pair.reference);
     const feature::MapFeaturesPerDesc& nextFeaturesPerDesc = featuresPerView.getFeaturesPerDesc(pair.next);
@@ -246,7 +246,7 @@ bool localizeNext(sfmData::SfMData& sfmData,
     sfmData::Landmarks& landmarks = sfmData.getLandmarks();
 
     const sfmData::View& newView = sfmData.getView(newViewId);
-    std::shared_ptr<camera::IntrinsicBase> newViewIntrinsics = sfmData.getIntrinsicsharedPtr(newView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> newViewIntrinsics = sfmData.getIntrinsicSharedPtr(newView.getIntrinsicId());
     const feature::MapFeaturesPerDesc& newViewFeaturesPerDesc = featuresPerView.getFeaturesPerDesc(newViewId);
 
     Mat refX(3, observedTracks.size());
@@ -315,7 +315,7 @@ bool addPoints(sfmData::SfMData& sfmData,
       nextTracks.begin(), nextTracks.end(), tracksWithPoint.begin(), tracksWithPoint.end(), std::back_inserter(nextTracksNotReconstructed));
 
     const sfmData::View& newView = sfmData.getView(newViewId);
-    std::shared_ptr<camera::IntrinsicBase> newViewIntrinsics = sfmData.getIntrinsicsharedPtr(newView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> newViewIntrinsics = sfmData.getIntrinsicSharedPtr(newView.getIntrinsicId());
     const feature::MapFeaturesPerDesc& newViewFeaturesPerDesc = featuresPerView.getFeaturesPerDesc(newViewId);
     const Eigen::Matrix3d new_R_world = sfmData.getPose(newView).getTransform().rotation();
 
@@ -339,7 +339,7 @@ bool addPoints(sfmData::SfMData& sfmData,
         const sfmData::View& refView = sfmData.getView(pV.first);
 
         const Eigen::Matrix3d ref_R_world = sfmData.getPose(refView).getTransform().rotation();
-        std::shared_ptr<camera::IntrinsicBase> refViewIntrinsics = sfmData.getIntrinsicsharedPtr(refView.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> refViewIntrinsics = sfmData.getIntrinsicSharedPtr(refView.getIntrinsicId());
         const feature::MapFeaturesPerDesc& refViewFeaturesPerDesc = featuresPerView.getFeaturesPerDesc(pV.first);
 
         Eigen::Matrix3d world_R_new = new_R_world.transpose();

src/software/pipeline/main_panoramaWarping.cpp

@@ -259,7 +259,7 @@ int aliceVision_main(int argc, char** argv)
 
         // Get intrinsics and extrinsics
         geometry::Pose3 camPose = sfmData.getPose(view).getTransform();
-        std::shared_ptr<camera::IntrinsicBase> intrinsic = sfmData.getIntrinsicsharedPtr(view.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> intrinsic = sfmData.getIntrinsicSharedPtr(view.getIntrinsicId());
 
         // Compute coarse bounding box to make computations faster
         BoundingBox coarseBboxInitial;

src/software/pipeline/main_relativePoseEstimating.cpp

@@ -392,8 +392,8 @@ int aliceVision_main(int argc, char** argv)
         const sfmData::View& refView = sfmData.getView(refImage);
         const sfmData::View& nextView = sfmData.getView(nextImage);
 
-        std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicsharedPtr(refView.getIntrinsicId());
-        std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicsharedPtr(nextView.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicSharedPtr(refView.getIntrinsicId());
+        std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicSharedPtr(nextView.getIntrinsicId());
         std::shared_ptr<camera::Pinhole> refPinhole = std::dynamic_pointer_cast<camera::Pinhole>(refIntrinsics);
         std::shared_ptr<camera::Pinhole> nextPinhole = std::dynamic_pointer_cast<camera::Pinhole>(nextIntrinsics);
 

src/software/pipeline/main_sfmBootstraping.cpp

@@ -100,8 +100,8 @@ bool estimatePairAngle(const sfmData::SfMData& sfmData,
     const sfmData::View& refView = sfmData.getView(pair.reference);
     const sfmData::View& nextView = sfmData.getView(pair.next);
 
-    std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicsharedPtr(refView.getIntrinsicId());
-    std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicsharedPtr(nextView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicSharedPtr(refView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicSharedPtr(nextView.getIntrinsicId());
     std::shared_ptr<camera::Pinhole> refPinhole = std::dynamic_pointer_cast<camera::Pinhole>(refIntrinsics);
     std::shared_ptr<camera::Pinhole> nextPinhole = std::dynamic_pointer_cast<camera::Pinhole>(nextIntrinsics);
 
@@ -232,8 +232,8 @@ bool buildSfmData(sfmData::SfMData& sfmData,
     const sfmData::View& refView = sfmData.getView(pair.reference);
     const sfmData::View& nextView = sfmData.getView(pair.next);
 
-    std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicsharedPtr(refView.getIntrinsicId());
-    std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicsharedPtr(nextView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> refIntrinsics = sfmData.getIntrinsicSharedPtr(refView.getIntrinsicId());
+    std::shared_ptr<camera::IntrinsicBase> nextIntrinsics = sfmData.getIntrinsicSharedPtr(nextView.getIntrinsicId());
     std::shared_ptr<camera::Pinhole> refPinhole = std::dynamic_pointer_cast<camera::Pinhole>(refIntrinsics);
     std::shared_ptr<camera::Pinhole> nextPinhole = std::dynamic_pointer_cast<camera::Pinhole>(nextIntrinsics);