From b7208d80c7e78c30e7f0001e61b53d9dbee500d7 Mon Sep 17 00:00:00 2001 From: Victor Poughon <victor.poughon@cnes.fr> Date: Tue, 29 Nov 2016 11:20:39 +0100 Subject: [PATCH] ENH: Add a gamma reset button --- .../include/mvdColorDynamicsWidget.h | 2 ++ .../MonteverdiGui/src/CMakeLists.txt | 2 +- .../MonteverdiGui/src/mvdColorDynamicsWidget.cxx | 7 +++++++ .../MonteverdiGui/src/mvdColorDynamicsWidget.ui | 15 ++++++++++++++- .../Visualization/MonteverdiGui/src/mvdIcons.qrc | 1 + Utilities/Data/Icons/view-refresh.png | Bin 0 -> 912 bytes 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Utilities/Data/Icons/view-refresh.png diff --git a/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h index 3182a3ed83..fe9d894eb9 100644 --- a/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h +++ b/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h @@ -323,6 +323,8 @@ private slots: /** */ void on_gammaSlider_valueChanged( int gamma ); + + void on_gammaResetButton_clicked(); }; } // end namespace 'mvd'. diff --git a/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt b/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt index b61d29567f..99b784c31c 100644 --- a/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt +++ b/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt @@ -120,7 +120,7 @@ set( OTBMonteverdiGUI_FORMS ############################################################################# set( OTBMonteverdiGUI_RESOURCES - # mvdIcons.qrc + mvdIcons.qrc ) ############################################################################# diff --git a/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.cxx b/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.cxx index 4b3c384fb8..0e0daa8022 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.cxx +++ b/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.cxx @@ -454,4 +454,11 @@ ColorDynamicsWidget QToolTip::showText(mapToGlobal(m_UI->gammaSlider->pos()),tr("Gamma: ") % QString::number(GetGamma()) ); } +void +ColorDynamicsWidget +::on_gammaResetButton_clicked() +{ + this->SetGamma(1.0); +} + } // end namespace 'mvd' diff --git a/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.ui b/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.ui index be9da91299..09afa39e08 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.ui +++ b/Modules/Visualization/MonteverdiGui/src/mvdColorDynamicsWidget.ui @@ -158,6 +158,17 @@ </property> </widget> </item> + <item> + <widget class="QToolButton" name="gammaResetButton"> + <property name="toolTip"> + <string>Reset value to 1.</string> + </property> + <property name="icon"> + <iconset resource="mvdIcons.qrc"> + <normaloff>:/Utilities/Data/Icons/view-refresh.png</normaloff>:/Utilities/Data/Icons/view-refresh.png</iconset> + </property> + </widget> + </item> </layout> </widget> </item> @@ -307,7 +318,9 @@ <tabstop>noDataLineEdit</tabstop> <tabstop>noDataButton</tabstop> </tabstops> - <resources/> + <resources> + <include location="mvdIcons.qrc"/> + </resources> <connections> <connection> <sender>noDataCheckBox</sender> diff --git a/Modules/Visualization/MonteverdiGui/src/mvdIcons.qrc b/Modules/Visualization/MonteverdiGui/src/mvdIcons.qrc index 835ed71337..137b7dc137 100644 --- a/Modules/Visualization/MonteverdiGui/src/mvdIcons.qrc +++ b/Modules/Visualization/MonteverdiGui/src/mvdIcons.qrc @@ -3,5 +3,6 @@ <file>../../../../Utilities/Data/Icons/execute.png</file> <file>../../../../Utilities/Data/Icons/locked.png</file> <file>../../../../Utilities/Data/Icons/unlocked.png</file> + <file>../../../../Utilities/Data/Icons/view-refresh.png</file> </qresource> </RCC> diff --git a/Utilities/Data/Icons/view-refresh.png b/Utilities/Data/Icons/view-refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..3fd71d6e5929ba0c40db1960e36e9acba9d7e525 GIT binary patch literal 912 zcmV;B18@9^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$TB1uF+R5*=o zQcY}BWfVR4d+(L`tut*0Td1}Qh7zWsqBD(u(U?Xz#9&ycyhMzUf$+0o2OA7c3=wo; zqTmCgF-#?xGyymK1R;{t!mDx7(2~^B#sNk<v>oWowDaEkzU!j%l38$)o7}}cCnx7z zVrKYAWwOsS=-Lqw-t?qu)r6QQ!notg696vQmg&~r9t3cLe1UW(yG7H)Ku^~yeO+g> z(bg0Jm{BNJFfw+(d}sQhCl&9uE%R)8S2n|p?*PPznUTt5*BiPR+1l3~ipPS`iO?Jk zARN#U4H*a;0yD)$9M29{3dM>Y4K?&WE>{g^G!Zl7)jelV^{i|AG#D_%t<fB+t_MTc z<eJs7#lH0O;okMFqzQr$gkP>rsJC8h7YDw+>Nu`!(E)&&KfE(t5U!_KF)uRXGsl%@ z#;0eK6ZhtiUhin`+P8I6C=m<c<9EA6Ed~Oh1OP~>!d1ufk}o{_gOutKfI-_b^R{JP z`QzJ<UK*V&?A?9r67D}NVS1(vsTcqQ01GUys_Cgne`6%@RcHIkZU9qtY3sTsc5Zto z>2^LHMWS&9G(o-t)@yh1Uq9cxfG6X$C)H~ghbOC7?WrZ-yyL0>0QOs`0x)U>uAAQg z>;&LGL0Gpf^PVr@oj>}%1`wDT7wv!4sq=s3q*Oh&WftpMhqGg=O68@F-$%x80Ep=T zKm-sG?*3PXAs8nI|0Dok)RR-0Y?z4d_HJBzCO<Qm0-yn?3IGs91OOe05LUN@@#X%v zsjVe)?3Fz~-%4e&>6*s&6^5?o^0No>h2ra)My_p{u2^<JcwBLDVQ7jykI}v|io-kJ z2z}6(e7UtbaxJ}Uz%_L7jZ`u|_h<o4jX~0c7z6<Sk*NR2p{0r3+~lR<$<EA{P2of= zi0-usdagYlDwbXRJ6nR|coYd5ICpup;z@M`0G1y~F-_#=PTxGaE%~6Z@JavoH|CEI z+$;^>&LcltM%9%NL@3Oc<hjeEi&CkKZJA>L;J5G-fbF(raxE|ez<UjbwpTH4kW$4B mU7I1oP}Px#Y|H%H5BGmARd#9<Wz5C^0000<MNUMnLSTZGTBDT! literal 0 HcmV?d00001 -- GitLab