From 90971daa24bf9b5223eb6d82fcaa2948cdc2c4e9 Mon Sep 17 00:00:00 2001 From: jmmuller Date: Fri, 3 May 2024 17:00:52 +0200 Subject: [PATCH] Appli topoadj works except for MMVII_ASSERT_INVERTIBLE_VALUE... --- MMVII/src/BundleAdjustment/cAppliTopoAdj.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/MMVII/src/BundleAdjustment/cAppliTopoAdj.cpp b/MMVII/src/BundleAdjustment/cAppliTopoAdj.cpp index a00bb9f20..b357face2 100644 --- a/MMVII/src/BundleAdjustment/cAppliTopoAdj.cpp +++ b/MMVII/src/BundleAdjustment/cAppliTopoAdj.cpp @@ -124,11 +124,9 @@ void cAppliTopoAdj::AddOneSetGCP(const std::vector & aVParStd) cSetMesImGCP aFullMesGCP; mPhProj.LoadGCPFromFolder(aFolder,aFullMesGCP,"",mGCPFilter,mGCPFilterAdd); - for (const auto & aSens : mBA.VSIm()) - { - // Load the images measure + init sens - mPhProj.LoadImFromFolder(aFolder,aFullMesGCP,aSens->NameImage(),aSens,SVP::Yes); - } + //here no 2d mes, fake it + cSetMesPtOf1Im aSetMesIm; + aFullMesGCP.AddMes2D(aSetMesIm); cSetMesImGCP * aMesGCP = aFullMesGCP.FilterNonEmptyMeasure(0); cStdWeighterResidual aWeighter(aGCPW,1); @@ -184,8 +182,6 @@ int cAppliTopoAdj::Exe() mPhProj.SaveCamPC(*aCamPC); */ - mPhProj.CpSysIn2Out(true,true); - mBA.Save_newGCP(); mBA.SaveTopo(); // just for debug for now