Skip to content
Snippets Groups Projects
Commit 47b826fc authored by Julien Michel's avatar Julien Michel
Browse files

ENH: Adding new color-mapping shader modes to Monteverdi

parent 17bcb6b8
No related branches found
No related tags found
No related merge requests found
......@@ -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
};
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment