Upgrade survey injection for new format

Author: Fabien Servant

src/aliceVision/sfmData/SurveyPoint.hpp

@@ -18,17 +18,19 @@ struct SurveyPoint
 {
     SurveyPoint() = default;
 
-    SurveyPoint(const Vec3 & paramPoint3d, const Vec2 & paramSurvey)
+    SurveyPoint(const Vec3 & paramPoint3d, const Vec2 & paramSurvey, const Vec2 & paramResidual)
       : point3d(paramPoint3d), 
-        survey(paramSurvey)
+        survey(paramSurvey),
+        residual(paramResidual)
     {}
 
     Vec3 point3d;
     Vec2 survey;
+    Vec2 residual;
 
     bool operator==(const SurveyPoint& other) const
     {
-        return (point3d == other.point3d) && (survey == other.survey);
+        return (point3d == other.point3d) && (survey == other.survey) && (residual == other.residual);
     }
 
     inline bool operator!=(const SurveyPoint& other) const { return !(*this == other); }

src/aliceVision/sfmDataIO/AlembicExporter.cpp

@@ -676,6 +676,8 @@ void AlembicExporter::addSurveys(const sfmData::SurveyPoints & points)
             data.push_back(sp.point3d.z());
             data.push_back(sp.survey.x());
             data.push_back(sp.survey.y());
+            data.push_back(sp.residual.x());
+            data.push_back(sp.residual.y());
         }
     }
 

src/aliceVision/sfmDataIO/AlembicImporter.cpp

@@ -468,7 +468,7 @@ bool readSurveys(IObject iObj, sfmData::SfMData& sfmdata)
     IDoubleArrayProperty propData(userProps, "mvg_surveyData");
     propData.get(sampleData);
 
-    const int sampleDataSize = 5;
+    const int sampleDataSize = 7;
 
     if (sampleId.size() * sampleDataSize != sampleData->size())
     {
@@ -486,6 +486,8 @@ bool readSurveys(IObject iObj, sfmData::SfMData& sfmdata)
         pt.point3d.z() = (*sampleData)[pos * sampleDataSize + 2];
         pt.survey.x() = (*sampleData)[pos * sampleDataSize + 3];
         pt.survey.y() = (*sampleData)[pos * sampleDataSize + 4];
+        pt.residual.x() = (*sampleData)[pos * sampleDataSize + 5];
+        pt.residual.y() = (*sampleData)[pos * sampleDataSize + 6];
 
         output[viewId].push_back(pt);
     }

src/aliceVision/sfmDataIO/jsonIO.cpp

@@ -598,6 +598,8 @@ void saveSurveyPoints(const sfmData::SurveyPoints& spoints, bpt::ptree& parentTr
             pointTree.put("Z", point.point3d.z());
             pointTree.put("u", point.survey.x());
             pointTree.put("v", point.survey.y());
+            pointTree.put("ru", point.residual.x());
+            pointTree.put("rv", point.residual.y());
 
             pointsTree.push_back(std::make_pair("", pointTree));
         }
@@ -623,6 +625,8 @@ void loadSurveyPoints(sfmData::SurveyPoints& spoints, bpt::ptree& parentTree)
             p.point3d.z() = pointTree.second.get<double>("Z");
             p.survey.x() = pointTree.second.get<double>("u");
             p.survey.y() = pointTree.second.get<double>("v");
+            p.residual.x() = pointTree.second.get<double>("ru");
+            p.residual.y() = pointTree.second.get<double>("rv");
 
             spoints[viewId].push_back(p);
         }