Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
6d1409a2
Commit
6d1409a2
authored
Sep 12, 2016
by
Rashad Kanavath
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into msvc_support
parents
37c122fe
b524f55c
Changes
97
Hide whitespace changes
Inline
Side-by-side
Showing
97 changed files
with
357 additions
and
329 deletions
+357
-329
CMakeLists.txt
CMakeLists.txt
+13
-0
Modules/Visualization/Ice/src/otbGlVectorActor.cxx
Modules/Visualization/Ice/src/otbGlVectorActor.cxx
+1
-1
Modules/Visualization/Mapla/include/mvdMaplaApplication.h
Modules/Visualization/Mapla/include/mvdMaplaApplication.h
+3
-3
Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h
Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h
+3
-3
Modules/Visualization/Monteverdi/include/mvdApplication.h
Modules/Visualization/Monteverdi/include/mvdApplication.h
+3
-3
Modules/Visualization/Monteverdi/include/mvdMainWindow.h
Modules/Visualization/Monteverdi/include/mvdMainWindow.h
+3
-3
Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h
...s/Visualization/Monteverdi/include/mvdPreferencesDialog.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
...ualization/MonteverdiCore/include/mvdAbstractImageModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h
...ualization/MonteverdiCore/include/mvdAbstractLayerModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h
...s/Visualization/MonteverdiCore/include/mvdAbstractModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h
.../Visualization/MonteverdiCore/include/mvdAbstractWorker.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdAlgorithm.h
Modules/Visualization/MonteverdiCore/include/mvdAlgorithm.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h
...alization/MonteverdiCore/include/mvdApplicationsBrowser.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h
.../Visualization/MonteverdiCore/include/mvdBackgroundTask.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdCore.h
Modules/Visualization/MonteverdiCore/include/mvdCore.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdDataStream.h
Modules/Visualization/MonteverdiCore/include/mvdDataStream.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdFilenameInterface.h
...sualization/MonteverdiCore/include/mvdFilenameInterface.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
.../Visualization/MonteverdiCore/include/mvdHistogramModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h
...alization/MonteverdiCore/include/mvdI18nCoreApplication.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h
...s/Visualization/MonteverdiCore/include/mvdImageImporter.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdImagePlacenameLoader.h
...lization/MonteverdiCore/include/mvdImagePlacenameLoader.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdImageProperties.h
...Visualization/MonteverdiCore/include/mvdImageProperties.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdImageSettings.h
...s/Visualization/MonteverdiCore/include/mvdImageSettings.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdImageSettingsInterface.h
...zation/MonteverdiCore/include/mvdImageSettingsInterface.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdMath.h
Modules/Visualization/MonteverdiCore/include/mvdMath.h
+4
-4
Modules/Visualization/MonteverdiCore/include/mvdModifiableInterface.h
...alization/MonteverdiCore/include/mvdModifiableInterface.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdMyClass.h
Modules/Visualization/MonteverdiCore/include/mvdMyClass.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h
...Visualization/MonteverdiCore/include/mvdOverviewBuilder.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h
...ization/MonteverdiCore/include/mvdProcessObjectObserver.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdProgressInterface.h
...sualization/MonteverdiCore/include/mvdProgressInterface.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h
.../Visualization/MonteverdiCore/include/mvdQuicklookModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdSerializableInterface.h
...ization/MonteverdiCore/include/mvdSerializableInterface.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h
...sualization/MonteverdiCore/include/mvdStackedLayerModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdSystemError.h
...les/Visualization/MonteverdiCore/include/mvdSystemError.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdTextStream.h
Modules/Visualization/MonteverdiCore/include/mvdTextStream.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdTypes.h
Modules/Visualization/MonteverdiCore/include/mvdTypes.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h
...isualization/MonteverdiCore/include/mvdVectorImageModel.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h
...alization/MonteverdiCore/include/mvdVectorImageSettings.h
+3
-3
Modules/Visualization/MonteverdiCore/include/mvdVisibleInterface.h
...isualization/MonteverdiCore/include/mvdVisibleInterface.h
+3
-3
Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in
...Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in
+3
-3
Modules/Visualization/MonteverdiCore/src/mvdAbstractImageModel.cxx
...isualization/MonteverdiCore/src/mvdAbstractImageModel.cxx
+17
-1
Modules/Visualization/MonteverdiCore/src/mvdHistogramModel.cxx
...es/Visualization/MonteverdiCore/src/mvdHistogramModel.cxx
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
...MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
...n/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
...tion/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h
...zation/MonteverdiGui/include/mvdAbstractModelController.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h
...ualization/MonteverdiGui/include/mvdApplicationLauncher.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h
...ualization/MonteverdiGui/include/mvdApplicationsToolBox.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h
.../MonteverdiGui/include/mvdApplicationsToolBoxController.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
...zation/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h
...zation/MonteverdiGui/include/mvdColorDynamicsController.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
...ualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h
...alization/MonteverdiGui/include/mvdColorSetupController.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
...Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h
.../Visualization/MonteverdiGui/include/mvdDoubleValidator.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
...les/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
...MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdGui.h
Modules/Visualization/MonteverdiGui/include/mvdGui.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h
...ualization/MonteverdiGui/include/mvdHistogramController.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
...ualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h
.../Visualization/MonteverdiGui/include/mvdHistogramWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h
.../Visualization/MonteverdiGui/include/mvdI18nApplication.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
...s/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h
...alization/MonteverdiGui/include/mvdImageViewManipulator.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
...isualization/MonteverdiGui/include/mvdImageViewRenderer.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h
.../Visualization/MonteverdiGui/include/mvdImageViewWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
...sualization/MonteverdiGui/include/mvdImportImagesDialog.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
...ization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
...les/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdLayerStackController.h
...alization/MonteverdiGui/include/mvdLayerStackController.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdLayerStackItemModel.h
...ualization/MonteverdiGui/include/mvdLayerStackItemModel.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
...Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdMainWindowTitleLoader.h
...lization/MonteverdiGui/include/mvdMainWindowTitleLoader.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
...n/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdMyWidget.h
Modules/Visualization/MonteverdiGui/include/mvdMyWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdOTBApplicationsModel.h
...alization/MonteverdiGui/include/mvdOTBApplicationsModel.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
...ization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdQtWidgetParameterInitializers.h
.../MonteverdiGui/include/mvdQtWidgetParameterInitializers.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
...les/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
+2
-2
Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewManipulator.h
...ation/MonteverdiGui/include/mvdQuicklookViewManipulator.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
...lization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdSearchableTreeWidget.h
...alization/MonteverdiGui/include/mvdSearchableTreeWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdShaderWidget.h
...les/Visualization/MonteverdiGui/include/mvdShaderWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
.../Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdTaskProgressDialog.h
...sualization/MonteverdiGui/include/mvdTaskProgressDialog.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
...s/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
+3
-3
Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
...erdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
+3
-3
SuperBuild/CMake/External_otb.cmake
SuperBuild/CMake/External_otb.cmake
+8
-0
SuperBuild/Packaging/CMakeLists.txt
SuperBuild/Packaging/CMakeLists.txt
+31
-28
SuperBuild/Packaging/PMacros.cmake
SuperBuild/Packaging/PMacros.cmake
+11
-20
SuperBuild/Packaging/PackageHelper.cmake
SuperBuild/Packaging/PackageHelper.cmake
+20
-23
Utilities/Data/Icons/layer-bottom_24x24.png.orig
Utilities/Data/Icons/layer-bottom_24x24.png.orig
+0
-0
Utilities/Data/Icons/layer-down_24x24.png.orig
Utilities/Data/Icons/layer-down_24x24.png.orig
+0
-0
Utilities/Data/Icons/layer-top_24x24.png.orig
Utilities/Data/Icons/layer-top_24x24.png.orig
+0
-0
Utilities/Data/Icons/layer-up_24x24.png.orig
Utilities/Data/Icons/layer-up_24x24.png.orig
+0
-0
No files found.
CMakeLists.txt
View file @
6d1409a2
...
...
@@ -386,6 +386,7 @@ endif()
# Create target to download data from the OTBData group. This must come after
# all tests have been added that reference the group, so we put it last.
#-----------------------------------------------------------------------------
# uninstall target
configure_file
(
"
${
CMAKE_SOURCE_DIR
}
/CMake/cmake_uninstall.cmake.in"
...
...
@@ -395,6 +396,18 @@ configure_file(
add_custom_target
(
uninstall
COMMAND
${
CMAKE_COMMAND
}
-P
${
CMAKE_BINARY_DIR
}
/cmake_uninstall.cmake
)
#-----------------------------------------------------------------------------
# Packaging options for Windows packages
if
(
WIN32 OR CMAKE_CROSSCOMPILING
)
option
(
GENERATE_PACKAGE
"Generate OTB package"
OFF
)
option
(
GENERATE_XDK
"Generate XDK for OTB development"
OFF
)
if
(
GENERATE_PACKAGE OR GENERATE_XDK
)
set
(
MXE_TARGET_DIR
""
CACHE PATH
"path to mxe directory"
)
add_subdirectory
(
${
OTB_SOURCE_DIR
}
/SuperBuild/Packaging
${
CMAKE_BINARY_DIR
}
/Packaging
)
endif
()
# (GENERATE_PACKAGE OR GENERATE_XDK)
endif
()
# (WIN32 OR CMAKE_CROSSCOMPILING)
#-----------------------------------------------------------------------------
#macro to put a fixed space between key, value in summary
macro
(
get_white_spaces var res
)
string
(
LENGTH
"
${
var
}
"
len
)
...
...
Modules/Visualization/Ice/src/otbGlVectorActor.cxx
View file @
6d1409a2
...
...
@@ -24,7 +24,7 @@
#include <GL/glew.h>
/*
#ifdef
__
APPLE__
#ifdef APPLE__
#include <OpenGL/glu.h>
#else
#include <GL/glu.h>
...
...
Modules/Visualization/Mapla/include/mvdMaplaApplication.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdMaplaApplication_h
#define
__
mvdMaplaApplication_h
#ifndef mvdMaplaApplication_h
#define mvdMaplaApplication_h
//
// Configuration include.
...
...
@@ -188,4 +188,4 @@ MaplaApplication
}
// end namespace 'mvd'
#endif //
__
maplaApplication_h
#endif // maplaApplication_h
Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdMaplaMainWindow_h
#define
__
mvdMaplaMainWindow_h
#ifndef mvdMaplaMainWindow_h
#define mvdMaplaMainWindow_h
//
// Configuration include.
...
...
@@ -233,4 +233,4 @@ namespace mvd
}
// end namespace 'mvd'
#endif //
__
maplaMainWindow_h
#endif // maplaMainWindow_h
Modules/Visualization/Monteverdi/include/mvdApplication.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdApplication_h
#define
__
mvdApplication_h
#ifndef mvdApplication_h
#define mvdApplication_h
//
// Configuration include.
...
...
@@ -231,4 +231,4 @@ Application
}
// end namespace 'mvd'
#endif //
__
Application_h
#endif //
mvd
Application_h
Modules/Visualization/Monteverdi/include/mvdMainWindow.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdMainWindow_h
#define
__
mvdMainWindow_h
#ifndef mvdMainWindow_h
#define mvdMainWindow_h
//
// Configuration include.
...
...
@@ -552,4 +552,4 @@ MainWindow
}
// end namespace 'mvd'
#endif //
__
MainWindow_h
#endif //
mvd
MainWindow_h
Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdPreferencesDialog_h
#define
__
mvdPreferencesDialog_h
#ifndef mvdPreferencesDialog_h
#define mvdPreferencesDialog_h
//
// Configuration include.
...
...
@@ -160,4 +160,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdAboutDialog_h
#endif // mvdAboutDialog_h
Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdAbstractImageModel_h
#define
__
mvdAbstractImageModel_h
#ifndef mvdAbstractImageModel_h
#define mvdAbstractImageModel_h
//
// Configuration include.
...
...
@@ -602,4 +602,4 @@ AbstractImageModel
}
// end namespace 'mvd'
#endif //
__
mvdAbstractImageModel_h
#endif // mvdAbstractImageModel_h
Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdAbstractLayerModel_h
#define
__
mvdAbstractLayerModel_h
#ifndef mvdAbstractLayerModel_h
#define mvdAbstractLayerModel_h
//
...
...
@@ -228,4 +228,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdAbstractLayerModel_h
#endif // mvdAbstractLayerModel_h
Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdAbstractModel_h
#define
__
mvdAbstractModel_h
#ifndef mvdAbstractModel_h
#define mvdAbstractModel_h
//
// Configuration include.
...
...
@@ -251,4 +251,4 @@ AbstractModel
}
// end namespace 'mvd'
#endif //
__
mvdAbstractModel_h
#endif // mvdAbstractModel_h
Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdAbstractWorker_h
#define
__
mvdAbstractWorker_h
#ifndef mvdAbstractWorker_h
#define mvdAbstractWorker_h
//
// Configuration include.
...
...
@@ -231,4 +231,4 @@ AbstractWorker::GetFirstProgressText() const
}
// end namespace 'mvd'
#endif //
__
mvdAbstractWorker_h
#endif // mvdAbstractWorker_h
Modules/Visualization/MonteverdiCore/include/mvdAlgorithm.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdAlgorithm_h
#define
__
mvdAlgorithm_h
#ifndef mvdAlgorithm_h
#define mvdAlgorithm_h
//
// Configuration include.
...
...
@@ -758,4 +758,4 @@ ToHumanReadableSize( qint64 size, bool isInBits )
}
// end namespace 'mvd'
#endif //
__
mvdAlgorithm_h
#endif // mvdAlgorithm_h
Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdApplicationsBrowser_h
#define
__
mvdApplicationsBrowser_h
#ifndef mvdApplicationsBrowser_h
#define mvdApplicationsBrowser_h
//
...
...
@@ -198,4 +198,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdApplicationsBrowser_h
#endif // mvdApplicationsBrowser_h
Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdBackgroundTask_h
#define
__
mvdBackgroundTask_h
#ifndef mvdBackgroundTask_h
#define mvdBackgroundTask_h
//
// Configuration include.
...
...
@@ -183,4 +183,4 @@ BackgroundTask::GetWorker() const
}
// end namespace 'mvd'
#endif //
__
mvdBackgroundTask_h
#endif // mvdBackgroundTask_h
Modules/Visualization/MonteverdiCore/include/mvdCore.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdCore_h
#define
__
mvdCore_h
#ifndef mvdCore_h
#define mvdCore_h
//
...
...
@@ -379,4 +379,4 @@ IsVersionGreaterEqual( const QString& v0, const QString& v1 )
}
// end namespace 'mvd'.
#endif //
__
mvdCore_h
#endif // mvdCore_h
Modules/Visualization/MonteverdiCore/include/mvdDataStream.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdDataStream_h
#define
__
mvdDataStream_h
#ifndef mvdDataStream_h
#define mvdDataStream_h
//
// Configuration include.
...
...
@@ -211,4 +211,4 @@ namespace mvd
}
// end namespace 'mvd'
#endif //
__
mvdDataStream_h
#endif // mvdDataStream_h
Modules/Visualization/MonteverdiCore/include/mvdFilenameInterface.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdFilenameInterface_h
#define
__
mvdFilenameInterface_h
#ifndef mvdFilenameInterface_h
#define mvdFilenameInterface_h
#include "OTBMonteverdiCoreExport.h"
//
...
...
@@ -151,4 +151,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdFilenameInterface_h
#endif // mvdFilenameInterface_h
Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdHistogramModel_h
#define
__
mvdHistogramModel_h
#ifndef mvdHistogramModel_h
#define mvdHistogramModel_h
//
// Configuration include.
...
...
@@ -708,4 +708,4 @@ HistogramModel
}
// end namespace 'mvd'
#endif //
__
mvdHistogramModel_h
#endif // mvdHistogramModel_h
Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdI18nCoreApplication_h
#define
__
mvdI18nCoreApplication_h
#ifndef mvdI18nCoreApplication_h
#define mvdI18nCoreApplication_h
//
// Configuration include.
...
...
@@ -707,4 +707,4 @@ I18nCoreApplication
}
// end namespace 'mvd'
#endif //
__
I18nCoreApplication_h
#endif // I18nCoreApplication_h
Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdImageImporter_h
#define
__
mvdImageImporter_h
#ifndef mvdImageImporter_h
#define mvdImageImporter_h
//
// Configuration include.
...
...
@@ -232,4 +232,4 @@ namespace mvd
}
// end namespace 'mvd'
#endif //
__
mvdImageImporter_h
#endif // mvdImageImporter_h
Modules/Visualization/MonteverdiCore/include/mvdImagePlacenameLoader.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdImagePlacenameLoader_h
#define
__
mvdImagePlacenameLoader_h
#ifndef mvdImagePlacenameLoader_h
#define mvdImagePlacenameLoader_h
//
// Configuration include.
...
...
@@ -96,4 +96,4 @@ private:
}
// end namespace 'mvd'
#endif //
__
mvdImageModel_h
#endif // mvdImageModel_h
Modules/Visualization/MonteverdiCore/include/mvdImageProperties.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdImageProperties_h
#define
__
mvdImageProperties_h
#ifndef mvdImageProperties_h
#define mvdImageProperties_h
//
// Configuration include.
...
...
@@ -304,4 +304,4 @@ ImageProperties
}
// end namespace 'mvd'
#endif //
__
mvdImageProperties_h
#endif // mvdImageProperties_h
Modules/Visualization/MonteverdiCore/include/mvdImageSettings.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdImageSettings_h
#define
__
mvdImageSettings_h
#ifndef mvdImageSettings_h
#define mvdImageSettings_h
//
// Configuration include.
...
...
@@ -409,4 +409,4 @@ ImageSettings
}
// end namespace 'mvd'
#endif //
__
mvdImageSettings_h
#endif // mvdImageSettings_h
Modules/Visualization/MonteverdiCore/include/mvdImageSettingsInterface.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdImageSettingsInterface_h
#define
__
mvdImageSettingsInterface_h
#ifndef mvdImageSettingsInterface_h
#define mvdImageSettingsInterface_h
//
// Configuration include.
...
...
@@ -209,4 +209,4 @@ ImageSettingsInterface
}
// end namespace 'mvd'
#endif //
__
mvdImageSettingsInterface_h
#endif // mvdImageSettingsInterface_h
Modules/Visualization/MonteverdiCore/include/mvdMath.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdMath_h
#define
__
mvdMath_h
#ifndef mvdMath_h
#define mvdMath_h
//
// Configuration include.
...
...
@@ -143,7 +143,7 @@ Lerp2( X& x, Y& y,
const
K
&
_1_minus_k
(
1
-
k
);
x
=
k
*
x1
+
_1_minus_k
*
x0
;
y
=
k
*
y1
+
_1_minus_k
*
y
1
;
y
=
k
*
y1
+
_1_minus_k
*
y
0
;
}
/*******************************************************************************/
...
...
@@ -184,4 +184,4 @@ Lerp( const T& k,
}
// end namespace 'mvd'
#endif //
__
mvdMath_h
#endif // mvdMath_h
Modules/Visualization/MonteverdiCore/include/mvdModifiableInterface.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdModifiableInterface_h
#define
__
mvdModifiableInterface_h
#ifndef mvdModifiableInterface_h
#define mvdModifiableInterface_h
//
// Configuration include.
...
...
@@ -126,4 +126,4 @@ namespace mvd
}
// end namespace 'mvd'
#endif //
__
mvdModifiableInterface_h
#endif // mvdModifiableInterface_h
Modules/Visualization/MonteverdiCore/include/mvdMyClass.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdMyClass_h
#define
__
mvdMyClass_h
#ifndef mvdMyClass_h
#define mvdMyClass_h
//
// Configuration include.
...
...
@@ -159,4 +159,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdMyClass_h
#endif // mvdMyClass_h
Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdOverviewBuilder_h
#define
__
mvdOverviewBuilder_h
#ifndef mvdOverviewBuilder_h
#define mvdOverviewBuilder_h
//
// Configuration include.
...
...
@@ -215,4 +215,4 @@ namespace mvd
}
// end namespace 'mvd'
#endif //
__
mvdOverviewBuilder_h
#endif // mvdOverviewBuilder_h
Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdProcessObjectObserver_h
#define
__
mvdProcessObjectObserver_h
#ifndef mvdProcessObjectObserver_h
#define mvdProcessObjectObserver_h
//
// Configuration include.
...
...
@@ -183,4 +183,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdProcessObjectObserver_h
#endif // mvdProcessObjectObserver_h
Modules/Visualization/MonteverdiCore/include/mvdProgressInterface.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdProgressInterface_h
#define
__
mvdProgressInterface_h
#ifndef mvdProgressInterface_h
#define mvdProgressInterface_h
//
// Configuration include.
...
...
@@ -137,4 +137,4 @@ namespace mvd
{
}
// end namespace 'mvd'
#endif //
__
mvdProgressInterface_h
#endif // mvdProgressInterface_h
Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdQuicklookModel_h
#define
__
mvdQuicklookModel_h
#ifndef mvdQuicklookModel_h
#define mvdQuicklookModel_h
//
// Configuration include.
...
...
@@ -230,4 +230,4 @@ QuicklookModel
}
// end namespace 'mvd'
#endif //
__
mvdQuicklookModel_h
#endif // mvdQuicklookModel_h
Modules/Visualization/MonteverdiCore/include/mvdSerializableInterface.h
View file @
6d1409a2
...
...
@@ -17,8 +17,8 @@
=========================================================================*/
#ifndef
__
mvdSerializableInterface_h
#define
__
mvdSerializableInterface_h
#ifndef mvdSerializableInterface_h
#define mvdSerializableInterface_h
//
// Configuration include.
...
...
@@ -148,4 +148,4 @@ namespace mvd
}
// end namespace 'mvd'
#endif //
__
mvdSerializableInterface_h
#endif // mvdSerializableInterface_h
Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef
__
mvdStackedLayerModel_h
#define
__
mvdStackedLayerModel_h
#ifndef mvdStackedLayerModel_h
#define mvdStackedLayerModel_h
//
// Configuration include.
...
...
@@ -954,4 +954,4 @@ trace( const std::vector< std::string > & strv )
}
// end namespace 'mvd'
#endif //
__
mvdStackedLayerModel_h
#endif // mvdStackedLayerModel_h
Modules/Visualization/MonteverdiCore/include/mvdSystemError.h
View file @
6d1409a2
...
...
@@ -16,8 +16,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/