diff --git a/Modules/Visualization/MonteverdiCore/include/mvdCore.h b/Modules/Visualization/MonteverdiCore/include/mvdCore.h index d0e2582253a3d5d754d5d6feb6c456b716043e10..e3c6c6c80d1cd01faa8ba0ce4bb1724d8b7fea8b 100644 --- a/Modules/Visualization/MonteverdiCore/include/mvdCore.h +++ b/Modules/Visualization/MonteverdiCore/include/mvdCore.h @@ -133,6 +133,16 @@ enum Effect EFFECT_SPECTRAL_ANGLE, EFFECT_SWIPE_H, EFFECT_SWIPE_V, + EFFECT_LUT_JET, + EFFECT_LUT_LOCAL_JET, + EFFECT_LUT_HOT, + EFFECT_LUT_LOCAL_HOT, + EFFECT_LUT_WINTER, + EFFECT_LUT_LOCAL_WINTER, + EFFECT_LUT_SUMMER, + EFFECT_LUT_LOCAL_SUMMER, + EFFECT_LUT_COOL, + EFFECT_LUT_LOCAL_COOL, // EFFECT_COUNT }; diff --git a/Modules/Visualization/MonteverdiCore/src/mvdCore.cxx b/Modules/Visualization/MonteverdiCore/src/mvdCore.cxx index 041429170c1297f0019b4f6b9ac7053ef5239143..76285c17020533a72b059658ecb1a75c95dc54a8 100644 --- a/Modules/Visualization/MonteverdiCore/src/mvdCore.cxx +++ b/Modules/Visualization/MonteverdiCore/src/mvdCore.cxx @@ -90,6 +90,16 @@ EFFECT_NAMES[ EFFECT_COUNT ] = QT_TRANSLATE_NOOP( "mvd", "Spectral angle" ), QT_TRANSLATE_NOOP( "mvd", "Swipe (horizontal)" ), QT_TRANSLATE_NOOP( "mvd", "Swipe (vertical)" ), + QT_TRANSLATE_NOOP( "mvd", "Lookup table (jet)" ), + QT_TRANSLATE_NOOP( "mvd", "Local lookup table (jet)" ), + QT_TRANSLATE_NOOP( "mvd", "Lookup table (hot)" ), + QT_TRANSLATE_NOOP( "mvd", "Local lookup table (hot)" ), + QT_TRANSLATE_NOOP( "mvd", "Lookup table (winter)" ), + QT_TRANSLATE_NOOP( "mvd", "Local lookup table (winter)" ), + QT_TRANSLATE_NOOP( "mvd", "Lookup table (summer)" ), + QT_TRANSLATE_NOOP( "mvd", "Local lookup table (summer)" ), + QT_TRANSLATE_NOOP( "mvd", "Lookup table (cool)" ), + QT_TRANSLATE_NOOP( "mvd", "Local lookup table (cool)" ) }; bool diff --git a/Modules/Visualization/MonteverdiCore/src/mvdImageSettings.cxx b/Modules/Visualization/MonteverdiCore/src/mvdImageSettings.cxx index cc8253438f1a636842be6161357a886d1c5bcc94..3fef0af1eb9bf3bf903f9492b722483132e799c4 100644 --- a/Modules/Visualization/MonteverdiCore/src/mvdImageSettings.cxx +++ b/Modules/Visualization/MonteverdiCore/src/mvdImageSettings.cxx @@ -130,6 +130,31 @@ ImageSettings return m_Angle; break; + case EFFECT_LUT_LOCAL_JET: + // qDebug() << "Range:" << m_Range; + return m_Range; + break; + + case EFFECT_LUT_LOCAL_HOT: + // qDebug() << "Range:" << m_Range; + return m_Range; + break; + + case EFFECT_LUT_LOCAL_WINTER: + // qDebug() << "Range:" << m_Range; + return m_Range; + break; + + case EFFECT_LUT_LOCAL_SUMMER: + // qDebug() << "Range:" << m_Range; + return m_Range; + break; + + case EFFECT_LUT_LOCAL_COOL: + // qDebug() << "Range:" << m_Range; + return m_Range; + break; + default: break; } @@ -154,6 +179,31 @@ ImageSettings m_Angle = value; break; + case EFFECT_LUT_LOCAL_JET: + // qDebug() << "Range = " << value; + m_Range = value; + break; + + case EFFECT_LUT_LOCAL_HOT: + // qDebug() << "Range = " << value; + m_Range = value; + break; + + case EFFECT_LUT_LOCAL_WINTER: + // qDebug() << "Range = " << value; + m_Range = value; + break; + + case EFFECT_LUT_LOCAL_SUMMER: + // qDebug() << "Range = " << value; + m_Range = value; + break; + + case EFFECT_LUT_LOCAL_COOL: + // qDebug() << "Range = " << value; + m_Range = value; + break; + default: break; } diff --git a/Modules/Visualization/MonteverdiGui/src/mvdImageViewRenderer.cxx b/Modules/Visualization/MonteverdiGui/src/mvdImageViewRenderer.cxx index 76108244fcb01e4a4fac84d9c3f42f81d66623df..cc3cbf7af7187ce80886234eefd7cd4b21b5539d 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdImageViewRenderer.cxx +++ b/Modules/Visualization/MonteverdiGui/src/mvdImageViewRenderer.cxx @@ -789,6 +789,65 @@ ImageViewRenderer shader->SetVerticalSlider( true ); break; + case EFFECT_LUT_JET: + shader->SetShaderType(otb::SHADER_LUT_JET); + break; + + case EFFECT_LUT_LOCAL_JET: + shader->SetShaderType(otb::SHADER_LUT_LOCAL_JET); + shader->SetRadius( settings.GetSize() ); + shader->SetLocalContrastRange(settings.GetValue()); + + break; + + case EFFECT_LUT_HOT: + shader->SetShaderType(otb::SHADER_LUT_HOT); + break; + + case EFFECT_LUT_LOCAL_HOT: + shader->SetShaderType(otb::SHADER_LUT_LOCAL_HOT); + shader->SetRadius( settings.GetSize() ); + shader->SetLocalContrastRange(settings.GetValue()); + + break; + + case EFFECT_LUT_SUMMER: + shader->SetShaderType(otb::SHADER_LUT_SUMMER); + break; + + case EFFECT_LUT_LOCAL_SUMMER: + shader->SetShaderType(otb::SHADER_LUT_LOCAL_SUMMER); + shader->SetRadius( settings.GetSize() ); + shader->SetLocalContrastRange(settings.GetValue()); + + break; + + case EFFECT_LUT_WINTER: + shader->SetShaderType(otb::SHADER_LUT_WINTER); + break; + + case EFFECT_LUT_LOCAL_WINTER: + shader->SetShaderType(otb::SHADER_LUT_LOCAL_WINTER); + shader->SetRadius( settings.GetSize() ); + shader->SetLocalContrastRange(settings.GetValue()); + + break; + + case EFFECT_LUT_COOL: + shader->SetShaderType(otb::SHADER_LUT_COOL); + break; + + case EFFECT_LUT_LOCAL_COOL: + shader->SetShaderType(otb::SHADER_LUT_LOCAL_COOL); + shader->SetRadius( settings.GetSize() ); + shader->SetLocalContrastRange(settings.GetValue()); + + break; + + + + + default: assert( false && "Unhandled mvd::Effect value!" ); break;