From c6fc12b726b757d0b20a5f5e487399f392c97169 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 24 Jan 2013 17:12:50 +0100
Subject: [PATCH] ENH: simplify input of Pansharpening appli with Bayesian
method
---
Applications/Fusion/otbPansharpening.cxx | 7 +------
Testing/Applications/Fusion/CMakeLists.txt | 5 ++---
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Applications/Fusion/otbPansharpening.cxx b/Applications/Fusion/otbPansharpening.cxx
index ff2228bada..e78a17f3f2 100644
--- a/Applications/Fusion/otbPansharpening.cxx
+++ b/Applications/Fusion/otbPansharpening.cxx
@@ -116,9 +116,6 @@ private:
AddChoice("method.bayes", "Bayesian");
SetParameterDescription("method.bayes", "Bayesian fusion.");
- AddParameter(ParameterType_InputImage, "method.bayes.interpxs", "Input interpolated XS Image");
- SetParameterDescription("method.bayes.interpxs"," Input interpolated XS image.");
-
AddParameter(ParameterType_Float, "method.bayes.lambda", "Weight");
SetParameterDescription("method.bayes.lambda", "Set the weighting value.");
SetMinimumParameterFloatValue("method.bayes.lambda", 0);
@@ -219,9 +216,7 @@ private:
filter->SetMultiSpect(xs);
- FloatVectorImageType* interpXS = GetParameterImage("method.bayes.interpxs");
-
- filter->SetMultiSpectInterp(interpXS);
+ filter->SetMultiSpectInterp(xs);
filter->SetPanchro(panchro);
filter->UpdateOutputInformation();
diff --git a/Testing/Applications/Fusion/CMakeLists.txt b/Testing/Applications/Fusion/CMakeLists.txt
index 1e4b10f463..9ace66b9b7 100644
--- a/Testing/Applications/Fusion/CMakeLists.txt
+++ b/Testing/Applications/Fusion/CMakeLists.txt
@@ -27,11 +27,10 @@ OTB_TEST_APPLICATION(NAME apTvFuPansharpening_LMVM
OTB_TEST_APPLICATION(NAME apTvFuPansharpening_Bayes
APP Pansharpening
OPTIONS -inp ${INPUTDATA}/panchro.tif
- -inxs ${INPUTDATA}/multiSpect.tif
+ -inxs ${INPUTDATA}/multiSpectInterp.tif
-out ${TEMP}/apTvFuPanSharpeningBayes.tif double
-method bayes
- -method.bayes.interpxs ${INPUTDATA}/multiSpectInterp.tif
VALID --compare-image ${EPSILON_6}
- ${BASELINE}/fuTvBayesianFusion.tif
+ ${BASELINE}/apTvFuPanSharpeningBayes.tif
${TEMP}/apTvFuPanSharpeningBayes.tif
)
--
GitLab