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
d378a4bd
Commit
d378a4bd
authored
Sep 07, 2016
by
Stéphane Albert
Browse files
Options
Browse Files
Download
Plain Diff
MRG: Merged from origin/rfc-51-mvd_modules
parents
6fb98e4d
39f7da30
Changes
62
Hide whitespace changes
Inline
Side-by-side
Showing
62 changed files
with
353 additions
and
160 deletions
+353
-160
CMakeLists.txt
CMakeLists.txt
+11
-0
Modules/Visualization/Mapla/src/mvdMaplaWin32.rc.in
Modules/Visualization/Mapla/src/mvdMaplaWin32.rc.in
+1
-1
Modules/Visualization/Monteverdi/src/CMakeLists.txt
Modules/Visualization/Monteverdi/src/CMakeLists.txt
+1
-1
Modules/Visualization/Monteverdi/src/main.cxx
Modules/Visualization/Monteverdi/src/main.cxx
+2
-11
Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
+15
-15
Modules/Visualization/MonteverdiCore/CMakeLists.txt
Modules/Visualization/MonteverdiCore/CMakeLists.txt
+0
-8
Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
...ualization/MonteverdiCore/include/mvdAbstractImageModel.h
+1
-0
Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
.../Visualization/MonteverdiCore/include/mvdHistogramModel.h
+1
-0
Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx
...Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx
+5
-3
Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
...MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
...n/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
+5
-1
Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
...tion/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
+4
-1
Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h
...zation/MonteverdiGui/include/mvdAbstractModelController.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h
...ualization/MonteverdiGui/include/mvdApplicationLauncher.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h
...ualization/MonteverdiGui/include/mvdApplicationsToolBox.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h
.../MonteverdiGui/include/mvdApplicationsToolBoxController.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
...zation/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h
...zation/MonteverdiGui/include/mvdColorDynamicsController.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
...ualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h
...alization/MonteverdiGui/include/mvdColorSetupController.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
...Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h
.../Visualization/MonteverdiGui/include/mvdDoubleValidator.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
...les/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
...MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h
...ualization/MonteverdiGui/include/mvdHistogramController.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
...ualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h
.../Visualization/MonteverdiGui/include/mvdHistogramWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h
.../Visualization/MonteverdiGui/include/mvdI18nApplication.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
...s/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
+39
-17
Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h
...alization/MonteverdiGui/include/mvdImageViewManipulator.h
+3
-1
Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
...isualization/MonteverdiGui/include/mvdImageViewRenderer.h
+4
-1
Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h
.../Visualization/MonteverdiGui/include/mvdImageViewWidget.h
+4
-1
Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
...sualization/MonteverdiGui/include/mvdImportImagesDialog.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
...ization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
...les/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdLayerStackController.h
...alization/MonteverdiGui/include/mvdLayerStackController.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdLayerStackItemModel.h
...ualization/MonteverdiGui/include/mvdLayerStackItemModel.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
...Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdMainWindowTitleLoader.h
...lization/MonteverdiGui/include/mvdMainWindowTitleLoader.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
...n/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdMyWidget.h
Modules/Visualization/MonteverdiGui/include/mvdMyWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdOTBApplicationsModel.h
...alization/MonteverdiGui/include/mvdOTBApplicationsModel.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
...ization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdQtWidgetParameterInitializers.h
.../MonteverdiGui/include/mvdQtWidgetParameterInitializers.h
+26
-0
Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
...les/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewManipulator.h
...ation/MonteverdiGui/include/mvdQuicklookViewManipulator.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
...lization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdSearchableTreeWidget.h
...alization/MonteverdiGui/include/mvdSearchableTreeWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdShaderWidget.h
...les/Visualization/MonteverdiGui/include/mvdShaderWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
.../Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdTaskProgressDialog.h
...sualization/MonteverdiGui/include/mvdTaskProgressDialog.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
...s/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
+1
-1
Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
...erdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
+1
-1
Modules/Visualization/MonteverdiGui/src/mvdI18nMainWindow.cxx
...les/Visualization/MonteverdiGui/src/mvdI18nMainWindow.cxx
+2
-2
Modules/Visualization/MonteverdiGui/src/mvdImageViewManipulator.cxx
...sualization/MonteverdiGui/src/mvdImageViewManipulator.cxx
+24
-0
Modules/Visualization/MonteverdiGui/src/mvdImageViewRenderer.cxx
.../Visualization/MonteverdiGui/src/mvdImageViewRenderer.cxx
+25
-4
Modules/Visualization/MonteverdiGui/src/mvdImageViewWidget.cxx
...es/Visualization/MonteverdiGui/src/mvdImageViewWidget.cxx
+116
-53
Modules/Visualization/MonteverdiGui/src/mvdLayerStackItemModel.cxx
...isualization/MonteverdiGui/src/mvdLayerStackItemModel.cxx
+1
-1
Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.cxx
...s/Visualization/MonteverdiGui/src/mvdLayerStackWidget.cxx
+6
-0
RELEASE_NOTES_MVD.txt
RELEASE_NOTES_MVD.txt
+18
-0
No files found.
CMakeLists.txt
View file @
d378a4bd
...
...
@@ -94,6 +94,17 @@ set(OTB_VERSION_MINOR "7")
set
(
OTB_VERSION_PATCH
"0"
)
set
(
OTB_VERSION_STRING
"
${
OTB_VERSION_MAJOR
}
.
${
OTB_VERSION_MINOR
}
.
${
OTB_VERSION_PATCH
}
"
)
# Monteverdi version number (follows OTB)
set
(
Monteverdi_VERSION_MAJOR
${
OTB_VERSION_MAJOR
}
)
set
(
Monteverdi_VERSION_MINOR
${
OTB_VERSION_MINOR
}
)
set
(
Monteverdi_VERSION_PATCH
${
OTB_VERSION_PATCH
}
)
set
(
Monteverdi_VERSION_SUFFIX
""
)
set
(
Monteverdi_VERSION_STRING
"
${
Monteverdi_VERSION_MAJOR
}
.
${
Monteverdi_VERSION_MINOR
}
.
${
Monteverdi_VERSION_PATCH
}${
Monteverdi_VERSION_SUFFIX
}
"
)
#-----------------------------------------------------------------------------
string
(
TIMESTAMP OTB_BUILD_TIMESTAMP
)
if
(
NOT OTB_INSTALL_RUNTIME_DIR
)
...
...
Modules/Visualization/Mapla/src/mvdMaplaWin32.rc.in
View file @
d378a4bd
#include "winver.h"
IDI_ICON1 ICON DISCARDABLE "@Mapla_WIN32_ICON@"
IDI_ICON1 ICON DISCARDABLE "@Mapla_
App_
WIN32_ICON@"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @Monteverdi_VERSION_MAJOR@,@Monteverdi_VERSION_MINOR@,@Monteverdi_VERSION_PATCH@,0
...
...
Modules/Visualization/Monteverdi/src/CMakeLists.txt
View file @
d378a4bd
...
...
@@ -51,7 +51,7 @@ otb_module_target( OTBMonteverdi )
if
(
WIN32
)
# Windows Resource file need to have the full path to icon
# if the .ico is not in the current dir
set
(
Monteverdi_App_WIN32_ICON
${
Monteverdi
_SOURCE_DIR
}
/Data/Icons/monteverdi.ico
)
set
(
Monteverdi_App_WIN32_ICON
${
OTB
_SOURCE_DIR
}
/
Utilities/
Data/Icons/monteverdi.ico
)
configure_file
(
mvdWin32.rc.in
mvdWin32.rc
...
...
Modules/Visualization/Monteverdi/src/main.cxx
View file @
d378a4bd
...
...
@@ -32,7 +32,7 @@
#include <QPixmap>
#include <QSplashScreen>
#define USE_SPLASH_SCREEN
0
#define USE_SPLASH_SCREEN
( ( !defined( OTB_DEBUG ) && 0 ) || 0 )
//
// System includes (sorted by alphabetic order)
...
...
@@ -72,7 +72,7 @@ main( int argc, char* argv[] )
//
// 0. Splash-screen.
#if
!defined( OTB_DEBUG ) &&
USE_SPLASH_SCREEN
#if USE_SPLASH_SCREEN
QPixmap
pixmap
(
QLatin1String
(
":/images/application_splash"
));
QSplashScreen
splash
(
pixmap
);
splash
.
show
();
...
...
@@ -155,21 +155,12 @@ main( int argc, char* argv[] )
//
// 3. Show window.
#if defined( OTB_DEBUG )
// Usefull when developping/debugging to avoid overlapping other windows.
mainWindow
.
show
();
#else // OTB_DEBUG
#if USE_SPLASH_SCREEN
splash
.
finish
(
&
mainWindow
);
#endif // USE_SPLASH_SCREEN
// TODO: Correctly manage main-window state via application settings.
mainWindow
.
showMaximized
();
#endif // OTB_DEBUG
//
// 4. Check OpenGL capabilities
if
(
!
mainWindow
.
CheckGLCapabilities
()
)
...
...
Modules/Visualization/Monteverdi/src/mvdMainWindow.cxx
View file @
d378a4bd
...
...
@@ -795,8 +795,7 @@ MainWindow
<
HistogramWidget
,
HistogramController
,
QDockWidget
>
(
"HISTOGRAM"
,
tr
(
"Histogram"
),
Qt
::
RightDockWidgetArea
,
false
Qt
::
RightDockWidgetArea
);
tabifyDockWidget
(
m_QuicklookViewDock
,
m_HistogramDock
);
...
...
@@ -835,7 +834,8 @@ MainWindow
<
ColorDynamicsWidget
,
ColorDynamicsController
,
QDockWidget
>
(
"COLOR_DYNAMICS"
,
tr
(
"Color dynamics"
),
Qt
::
RightDockWidgetArea
Qt
::
RightDockWidgetArea
,
I18nMainWindow
::
DOCK_LAYOUT_SCROLLABLE
);
// Tabify dock-widgets.
...
...
@@ -1189,19 +1189,19 @@ MainWindow
stackedLayerModel
->
SetCurrent
(
imageModel
);
bool
hasReference
=
stackedLayerModel
->
HasReference
();
if
(
!
hasReference
&&
srt
!=
SRT_UNKNOWN
)
stackedLayerModel
->
SetReference
(
imageModel
);
if
(
gcs
==
0
)
{
if
(
unk
==
0
)
{
if
(
srt
!=
SRT_UNKNOWN
)
stackedLayerModel
->
SetReference
(
imageModel
);
else
if
(
hasReference
&&
srt
==
SRT_UNKNOWN
)
UserZoomExtent
();
}
}
else
if
(
unk
==
0
&&
srt
==
SRT_UNKNOWN
)
stackedLayerModel
->
SetReference
(
StackedLayerModel
::
NIL_INDEX
);
//
// Set zoom-level which forces image-views refresh.
if
(
!
hasReference
)
UserZoomExtent
();
//
// Re-activate rendering of image-views.
m_ImageView
->
SetBypassRenderingEnabled
(
bypassImageView
);
...
...
@@ -1558,7 +1558,7 @@ MainWindow
(
"APPLICATIONS_BROWSER"
,
tr
(
"OTB-Applications browser"
),
Qt
::
RightDockWidgetArea
,
true
I18nMainWindow
::
DOCK_LAYOUT_FLOATING
);
tabifyDockWidget
(
m_HistogramDock
,
m_OtbApplicationsBrowserDock
);
...
...
@@ -2039,7 +2039,7 @@ MainWindow
void
MainWindow
::
OnApplicationToLaunchSelected
(
const
QString
&
appName
,
const
QString
&
docName
)
const
QString
&
/**
docName
*/
)
{
assert
(
Application
::
ConstInstance
()
!=
NULL
);
assert
(
Application
::
ConstInstance
()
->
GetOTBApplicationsModel
()
!=
NULL
);
...
...
Modules/Visualization/MonteverdiCore/CMakeLists.txt
View file @
d378a4bd
...
...
@@ -2,14 +2,6 @@
project
(
OTBMonteverdiCore
)
#############################################################################
set
(
Monteverdi_VERSION_MAJOR
"3"
)
set
(
Monteverdi_VERSION_MINOR
"5"
)
set
(
Monteverdi_VERSION_PATCH
"0"
)
set
(
Monteverdi_VERSION_SUFFIX
""
)
set
(
Monteverdi_VERSION_STRING
"
${
Monteverdi_VERSION_MAJOR
}
.
${
Monteverdi_VERSION_MINOR
}
.
${
Monteverdi_VERSION_PATCH
}${
Monteverdi_VERSION_SUFFIX
}
"
)
set
(
Monteverdi_FLOATING_TYPE
"float"
...
...
Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
View file @
d378a4bd
...
...
@@ -97,6 +97,7 @@ public:
/**
* \class BuildContext
* \brief WIP.
* \ingroup OTBMonteverdiCore
*/
class
BuildContext
{
...
...
Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
View file @
d378a4bd
...
...
@@ -125,6 +125,7 @@ public:
/**
* \class BuildContext
* \brief WIP.
* \ingroup OTBMonteverdiCore
*/
class
BuildContext
{
...
...
Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx
View file @
d378a4bd
...
...
@@ -247,7 +247,7 @@ StackedLayerModel
//
// Remember new current index.
SizeType
current
=
index
>
=
m_Current
index
>
m_Current
?
m_Current
:
(
m_Current
>
0
?
m_Current
-
1
...
...
@@ -281,9 +281,11 @@ StackedLayerModel
// Update reference pointer.
if
(
emitReferenceChanged
)
SetReference
(
index
>
=
m_Reference
index
>
m_Reference
?
m_Reference
:
m_Reference
-
1
,
:
(
m_Reference
>
0
?
m_Reference
-
1
:
StackedLayerModel
::
NIL_INDEX
),
true
);
...
...
Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
View file @
d378a4bd
...
...
@@ -59,7 +59,7 @@ class AboutDialog;
/** \class AboutDialog
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
*/
class
ITK_EXPORT
AboutDialog
:
...
...
Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
View file @
d378a4bd
...
...
@@ -68,7 +68,7 @@ namespace mvd
/**
* \class AbstractDragAndDropEventFilter
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Widget template skeleton to copy-paste when adding a new
* widget class.
...
...
Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
View file @
d378a4bd
...
...
@@ -69,7 +69,7 @@ namespace mvd
/** \class AbstractImageViewManipulator
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Base class for QWidget manipulation
*/
...
...
@@ -189,6 +189,10 @@ public:
*/
virtual
void
ResizeEvent
(
QResizeEvent
*
event
)
=
0
;
/**
*/
virtual
void
ResetViewport
()
=
0
;
//
// Public SLOTS.
public
slots
:
...
...
Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
View file @
d378a4bd
...
...
@@ -70,7 +70,7 @@ class StackedLayerModel;
/**
* \class AbstractImageViewRenderer
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief TODO.
*/
...
...
@@ -223,6 +223,9 @@ public:
/**
*/
inline
bool
IsGLSLEnabled
()
const
;
/**
*/
virtual
bool
IsEffectsEnabled
()
const
=
0
;
/**
*/
inline
bool
ZoomToRegion
(
const
PointType
&
origin
,
...
...
Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h
View file @
d378a4bd
...
...
@@ -67,7 +67,7 @@ class AbstractModel;
/**
* \class AbstractModelController
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*/
class
ITK_EXPORT
AbstractModelController
:
public
QObject
...
...
Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h
View file @
d378a4bd
...
...
@@ -72,7 +72,7 @@ class QtWidgetView;
/**
* \class ApplicationLauncher
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief WIP.
*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h
View file @
d378a4bd
...
...
@@ -74,7 +74,7 @@ class ApplicationsToolBox;
/**
* \class ApplicationsToolBox
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Widget template skeleton to copy-paste when adding a new
* widget class.
...
...
Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h
View file @
d378a4bd
...
...
@@ -72,7 +72,7 @@ class ApplicationsToolBox;
/**
* \class ApplicationsToolBoxController
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Color-setup widget controller for VectorImageModel objects.
*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
View file @
d378a4bd
...
...
@@ -73,7 +73,7 @@ class ColorBandDynamicsWidget;
/**
* \class ColorBandDynamicsWidget
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*/
class
ITK_EXPORT
ColorBandDynamicsWidget
:
public
QWidget
...
...
Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h
View file @
d378a4bd
...
...
@@ -69,7 +69,7 @@ class ColorDynamicsWidget;
/**
* \class ColorDynamicsController
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Color-dynamics widget controller for VectorImageModel objects.
*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
View file @
d378a4bd
...
...
@@ -72,7 +72,7 @@ class ColorDynamicsWidget;
/**
* \class ColorDynamicsWidget
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*/
class
ITK_EXPORT
ColorDynamicsWidget
:
public
QWidget
...
...
Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h
View file @
d378a4bd
...
...
@@ -69,7 +69,7 @@ class ColorSetupWidget;
/**
* \class ColorSetupController
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Color-setup widget controller for VectorImageModel objects.
*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
View file @
d378a4bd
...
...
@@ -60,7 +60,7 @@ class ColorSetupWidget;
/**
* \class ColorSetupWidget
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*/
class
ITK_EXPORT
ColorSetupWidget
:
public
QWidget
...
...
Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h
View file @
d378a4bd
...
...
@@ -67,7 +67,7 @@ namespace mvd
/**
* \class DoubleValidator
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief WIP.
*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
View file @
d378a4bd
...
...
@@ -72,7 +72,7 @@ namespace Ui
/**
* \class DropLineEdit
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Widget template skeleton to copy-paste when adding a new
* widget class.
...
...
Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
View file @
d378a4bd
...
...
@@ -68,7 +68,7 @@ namespace mvd
/**
* \class FilenameDragAndDropEventFilter
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Widget template skeleton to copy-paste when adding a new
* widget class.
...
...
Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h
View file @
d378a4bd
...
...
@@ -69,7 +69,7 @@ class HistogramWidget;
/**
* \class HistogramController
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Color-setup widget controller for VectorImageModel objects.
*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
View file @
d378a4bd
...
...
@@ -76,7 +76,7 @@ namespace mvd
/**
* \class HistogramPlotPicker
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Widget template skeleton to copy-paste when adding a new
* widget class.
...
...
Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h
View file @
d378a4bd
...
...
@@ -87,7 +87,7 @@ class HistogramWidget;
/**
* \class HistogramWidget
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Widget template skeleton to copy-paste when adding a new
* widget class.
...
...
Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h
View file @
d378a4bd
...
...
@@ -69,7 +69,7 @@ namespace mvd
/** \class I18nApplication
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief The MVD2 application (which is different from
* QApplication).
...
...
Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
View file @
d378a4bd
...
...
@@ -72,7 +72,7 @@ class VectorImageModel;
/**
* \class I18nMainWindow
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief Main-window widget base for the i18n application.
*/
...
...
@@ -89,6 +89,14 @@ class ITK_EXPORT I18nMainWindow
//
// Public types.
public:
enum
DockLayout
{
DOCK_LAYOUT_NONE
=
0
,
DOCK_LAYOUT_FLOATING
=
1
,
DOCK_LAYOUT_SCROLLABLE
=
2
,
};
typedef
QFlags
<
DockLayout
>
DockLayoutFlags
;
//
// Public methods.
...
...
@@ -227,7 +235,7 @@ protected:
const
QString
&
dockName
,
const
QString
&
dockTitle
,
Qt
::
DockWidgetArea
dockArea
,
bool
isFloating
=
false
);
DockLayoutFlags
flags
=
DOCK_LAYOUT_NONE
);
/**
*/
...
...
@@ -237,7 +245,7 @@ protected:
AddDockWidget
(
const
QString
&
dockName
,
const
QString
&
dockTitle
,
Qt
::
DockWidgetArea
dockArea
,
bool
isFloating
=
false
);
DockLayoutFlags
flags
=
DOCK_LAYOUT_NONE
);
/**
*/
...
...
@@ -247,7 +255,7 @@ protected:
AddDockWidget
(
const
QString
&
dockName
,
const
QString
&
dockTitle
,
Qt
::
DockWidgetArea
dockArea
,
bool
isFloating
=
false
);
DockLayoutFlags
flags
=
DOCK_LAYOUT_NONE
);
/**
*/
const
AbstractModelController
*
...
...
@@ -433,20 +441,20 @@ template< typename TWidget, typename TDockWidget >
inline
TDockWidget
*
I18nMainWindow
::
AddDockWidget
(
const
QString
&
dockName
,
const
QString
&
dockTitle
,
::
AddDockWidget
(
const
QString
&
dockName
,
const
QString
&
dockTitle
,
Qt
::
DockWidgetArea
dockArea
,
bool
isFloating
)
DockLayoutFlags
flags
)
{
TWidget
*
widget
=
new
TWidget
(
this
);
TWidget
*
widget
=
new
TWidget
(
this
);
TDockWidget
*
dockWidget
=
TDockWidget
*
dockWidget
=
AddWidgetToDock
(
widget
,
dockName
,
dockTitle
,
dockArea
,
isFloating
flags
);
return
dockWidget
;
...
...
@@ -457,20 +465,34 @@ template< typename TWidget, typename TController, typename TDockWidget >
inline
TDockWidget
*
I18nMainWindow
::
AddDockWidget
(
const
QString
&
dockName
,
const
QString
&
dockTitle
,
::
AddDockWidget
(
const
QString
&
dockName
,
const
QString
&
dockTitle
,
Qt
::
DockWidgetArea
dockArea
,
bool
isFloating
)
DockLayoutFlags
flags
)
{
TWidget
*
widget
=
new
TWidget
(
this
);
TWidget
*
widget
=
new
TWidget
(
this
);
QWidget
*
pannel
=
widget
;
if
(
flags
.
testFlag
(
DOCK_LAYOUT_SCROLLABLE
)
)
{
QScrollArea
*
scrollArea
=
new
QScrollArea
(
this
);
scrollArea
->
setWidgetResizable
(
true
);
TDockWidget
*
dockWidget
=
scrollArea
->
setWidget
(
widget
);
pannel
=
scrollArea
;
}
TDockWidget
*
dockWidget
=
AddWidgetToDock
(
widget
,
pannel
,
dockName
,
dockTitle
,
dockArea
,
isFloating
flags
);
new
TController
(
...
...
Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h
View file @
d378a4bd
...
...
@@ -72,7 +72,7 @@ namespace mvd
/**
* \class ImageViewManipulator
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*
* \brief TODO.
*/
...
...
@@ -168,6 +168,8 @@ public:
virtual
const
PointType
&
Transform
(
PointType
&
,
const
QPoint
&
)
const
;
virtual
void
ResetViewport
();
//
// Events.
...
...
Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
View file @
d378a4bd
...
...
@@ -82,7 +82,7 @@ namespace mvd
/**
* \class ImageViewRenderer
*
* \ingroup OTBMonteverdiG
ui
* \ingroup OTBMonteverdiG
UI
*/
class
ITK_EXPORT
ImageViewRenderer
:
public
AbstractImageViewRenderer
...
...
@@ -196,6 +196,8 @@ public:
const
PointType
&
vcenter
,
const
SpacingType
&
vspacing
)
const
;
virtual
bool
IsEffectsEnabled
()
const
;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
// public slots
...
...
@@ -212,6 +214,7 @@ signals:
void
ClearProjectionRequired
();
void
SetProjectionRequired
();
void
UpdateProjectionRequired
();
void
ResetViewport
();
/*-[ PROTECTED SECTION ]---------------------------------------------------*/
...
...
Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h
View file @
d378a4bd
...
...
@@ -70,7 +70,7 @@ class AbstractImageViewManipulator;
/** \class ImageViewWidget
*