Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

otb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

39ccb498

Commit 39ccb498 authored 7 years ago by Marina Bertolino

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release-6.2' into release-6.2

parents 5b089793 9eb21ec8

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Modules/Visualization/MonteverdiGui/include/mvdQtWidgetParameterInitializers.h 115 additions, 7 deletions

.../MonteverdiGui/include/mvdQtWidgetParameterInitializers.h
Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx 5 additions, 0 deletions

Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h 1 addition, 0 deletions

Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h 18 additions, 0 deletions

...et/include/otbWrapperQtWidgetComplexInputImageParameter.h
Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h 21 additions, 1 deletion

...t/include/otbWrapperQtWidgetComplexOutputImageParameter.h
Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h 4 additions, 1 deletion

.../QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
Modules/Wrappers/QtWidget/src/otbQtFileSelectionWidget.cxx 9 additions, 2 deletions

Modules/Wrappers/QtWidget/src/otbQtFileSelectionWidget.cxx
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageParameter.cxx 10 additions, 6 deletions

...rs/QtWidget/src/otbWrapperQtWidgetInputImageParameter.cxx

with 183 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment