From 183f492d31e56ba9e03b61192b6e93a75a67bc9f Mon Sep 17 00:00:00 2001
From: Victor Poughon <victor.poughon@cnes.fr>
Date: Wed, 30 Nov 2016 09:00:15 +0100
Subject: [PATCH] WIP on effects reset button
---
.../include/mvdStackedLayerModel.h | 1 +
.../src/mvdStackedLayerModel.cxx | 5 ++++
.../include/mvdLayerStackWidget.h | 3 +++
.../src/mvdLayerStackController.cxx | 16 ++++++++++++
.../MonteverdiGui/src/mvdLayerStackWidget.cxx | 8 ++++++
.../MonteverdiGui/src/mvdLayerStackWidget.ui | 25 ++++++++++++-------
6 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h b/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h
index 34b5e501f5..407659d809 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 95dd12f706..a574e4cb34 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 ae0a08d1ec..93486c81d2 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 f5fe47211f..34ddebbb77 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 c52a9fea19..c0f3dd86f4 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 3e769442f6..c0887d423c 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>
--
GitLab