From b30f190492d344d0ef757ef91ab2ed6a8ba85873 Mon Sep 17 00:00:00 2001
From: Victor Poughon <victor.poughon@cnes.fr>
Date: Wed, 24 Oct 2018 15:11:00 +0200
Subject: [PATCH] BUG: fix monteverdi band numbering
---
.../MonteverdiCore/src/mvdAbstractImageModel.cxx | 2 +-
.../MonteverdiGui/src/mvdColorSetupWidget.cxx | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/Modules/Visualization/MonteverdiCore/src/mvdAbstractImageModel.cxx b/Modules/Visualization/MonteverdiCore/src/mvdAbstractImageModel.cxx
index e1516508bb..141c8f4111 100644
--- a/Modules/Visualization/MonteverdiCore/src/mvdAbstractImageModel.cxx
+++ b/Modules/Visualization/MonteverdiCore/src/mvdAbstractImageModel.cxx
@@ -171,7 +171,7 @@ AbstractImageModel
count++)
{
std::ostringstream oss;
- oss <<ToStdString( tr("BAND ") )<< count;
+ oss <<ToStdString( tr("BAND ") )<< count + 1;
outputBandNames.push_back(oss.str());
}
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdColorSetupWidget.cxx b/Modules/Visualization/MonteverdiGui/src/mvdColorSetupWidget.cxx
index f269274797..020d5ad0de 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdColorSetupWidget.cxx
+++ b/Modules/Visualization/MonteverdiGui/src/mvdColorSetupWidget.cxx
@@ -109,21 +109,6 @@ ColorSetupWidget
QStringList itemTexts( components );
- // TODO: Move to mvd::core::AbstractImageModel (see ENHANCED_BAND_NAMES[]).
- for( int i=0;
- i<itemTexts.size();
- ++ i )
- {
- if( itemTexts[ i ].isEmpty() )
- {
- itemTexts[ i ] = tr( "BAND %1" ).arg( i+1 );
- }
- else
- {
- itemTexts[ i ].prepend( QString( "%1: " ).arg( i+1 ) );
- }
- }
-
m_UI->rComboBox->addItems( itemTexts );
m_UI->gComboBox->addItems( itemTexts );
m_UI->bComboBox->addItems( itemTexts );
--
GitLab