diff --git a/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h b/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h index 34b5e501f569f77f32401a0a79ebfaf6a00fbe04..407659d80966fd18c31eaf6f19191b7a4b692cfc 100644 --- a/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h +++ b/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h @@ -221,6 +221,7 @@ public slots: inline void SelectLast(); inline void SelectPrevious(); inline void SelectNext(); + void ResetEffects(); /*-[ SIGNALS SECTION ]-----------------------------------------------------*/ diff --git a/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx b/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx index 95dd12f7068a7bd3fae173f1cbbd84976780ff2d..a574e4cb34f967c8d7a1679c5349ccf73548a9d1 100644 --- a/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx +++ b/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx @@ -727,5 +727,10 @@ StackedLayerModel /*******************************************************************************/ /* SLOTS */ /*******************************************************************************/ +void +StackedLayerModel +::ResetEffects() +{ +} } // end namespace 'mvd' diff --git a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h index ae0a08d1ecc2f1c519e2c8030b74564e07e2bb85..93486c81d232175d4faa219fc4d94a1b015aa3fc 100644 --- a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h +++ b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h @@ -188,6 +188,9 @@ signals: /** */ void ApplyButtonClicked(); + /** + */ + void ResetEffectsButtonClicked(); /** */ void CopyLayerRequested( const AbstractLayerModel * ); diff --git a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackController.cxx b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackController.cxx index f5fe47211f4a4aa9b3b5c2f7d899f7b36117385b..34ddebbb771d076012f444e0a582b941b3cea6b5 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackController.cxx +++ b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackController.cxx @@ -220,6 +220,14 @@ LayerStackController this, SIGNAL( ApplyAllRequested() ) ); + + QObject::connect( + widget, + SIGNAL( ResetEffectsButtonClicked() ), + // to: + model, + SLOT( ResetEffects() ) + ); } /*******************************************************************************/ @@ -351,6 +359,14 @@ LayerStackController this, SIGNAL( ApplyAllRequested() ) ); + + QObject::disconnect( + widget, + SIGNAL( ResetEffectsButtonClicked() ), + // to: + model, + SLOT( ResetEffects() ) + ); } /*******************************************************************************/ diff --git a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.cxx b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.cxx index c52a9fea19f5e326b5b14fd5dd399d54d81075d4..c0f3dd86f49104da53e6fd565d8d697b6ee903d9 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.cxx +++ b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.cxx @@ -166,6 +166,14 @@ LayerStackWidget this, SIGNAL( ApplyButtonClicked() ) ); + + QObject::connect( + m_UI->resetEffectsButton, + SIGNAL( clicked() ), + // to: + this, + SIGNAL( ResetEffectsButtonClicked() ) + ); } /*******************************************************************************/ diff --git a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui index 3e769442f6ebe8436d66bc15d6310f253e7a24e9..c0887d423cfdbcceb5a1f8a9056e1a477434dc83 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui +++ b/Modules/Visualization/MonteverdiGui/src/mvdLayerStackWidget.ui @@ -56,7 +56,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerTop_Icon</normaloff>:/icons/action_LayerTop_Icon</iconset> </property> </widget> @@ -73,7 +73,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerUp_Icon</normaloff>:/icons/action_LayerUp_Icon</iconset> </property> </widget> @@ -90,7 +90,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerDown_Icon</normaloff>:/icons/action_LayerDown_Icon</iconset> </property> </widget> @@ -107,7 +107,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerBottom_Icon</normaloff>:/icons/action_LayerBottom_Icon</iconset> </property> </widget> @@ -124,7 +124,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerProjection_Icon</normaloff>:/icons/action_LayerProjection_Icon</iconset> </property> </widget> @@ -141,7 +141,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_ApplyAll_Icon</normaloff>:/icons/action_ApplyAll_Icon</iconset> </property> </widget> @@ -158,7 +158,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_Reload_Icon</normaloff>:/icons/action_Reload_Icon</iconset> </property> </widget> @@ -179,6 +179,13 @@ </property> </spacer> </item> + <item> + <widget class="QToolButton" name="resetEffectsButton"> + <property name="text"> + <string>R</string> + </property> + </widget> + </item> <item> <widget class="QToolButton" name="deleteAllButton"> <property name="toolTip"> @@ -191,7 +198,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerDeleteAll_Icon</normaloff>:/icons/action_LayerDeleteAll_Icon</iconset> </property> </widget> @@ -208,7 +215,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../Application/Monteverdi/mvdMainWindow.qrc"> + <iconset> <normaloff>:/icons/action_LayerDelete_Icon</normaloff>:/icons/action_LayerDelete_Icon</iconset> </property> </widget>