From 07f82216766861b447eeab885edb059aaa71dbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 18 Dec 2018 17:15:54 +0100 Subject: [PATCH] #3898, #3899, #3900 Better source stepping command icons. Combine curve and stepping icons. Improved Clear source curve command enabling --- ...rSourceSteppingEnsembleCurveSetFeature.cpp | 23 +++++++++++++++-- ...ClearSourceSteppingSummaryCurveFeature.cpp | 24 ++++++++++++++++-- ...tSourceSteppingEnsembleCurveSetFeature.cpp | 2 +- ...icSetSourceSteppingSummaryCurveFeature.cpp | 2 +- .../Summary/RimEnsembleCurveSet.cpp | 7 ++++- .../Summary/RimSummaryCurve.cpp | 7 ++++- ApplicationCode/Resources/ResInsight.qrc | 3 ++- ApplicationCode/Resources/StepUpDown16x16.png | Bin 0 -> 2189 bytes .../Resources/StepUpDownCorner16x16.png | Bin 0 -> 1357 bytes ApplicationCode/Resources/updownarrow.png | Bin 531 -> 0 bytes 10 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 ApplicationCode/Resources/StepUpDown16x16.png create mode 100644 ApplicationCode/Resources/StepUpDownCorner16x16.png delete mode 100644 ApplicationCode/Resources/updownarrow.png diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingEnsembleCurveSetFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingEnsembleCurveSetFeature.cpp index 0d93905fa1..b715c7323e 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingEnsembleCurveSetFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingEnsembleCurveSetFeature.cpp @@ -37,7 +37,26 @@ CAF_CMD_SOURCE_INIT(RicClearSourceSteppingEnsembleCurveSetFeature, "RicClearSour //-------------------------------------------------------------------------------------------------- bool RicClearSourceSteppingEnsembleCurveSetFeature::isCommandEnabled() { - return true; + std::vector objects; + caf::SelectionManager::instance()->objectsByType(&objects); + + if (objects.size() == 1) + { + auto c = objects[0]; + + RimSummaryPlot* summaryPlot = nullptr; + c->firstAncestorOrThisOfTypeAsserted(summaryPlot); + if (summaryPlot) + { + if (summaryPlot->ensembleCurveSetCollection()->curveSetForSourceStepping() + || summaryPlot->summaryCurveCollection()->curveForSourceStepping()) + { + return true; + } + } + } + + return false; } //-------------------------------------------------------------------------------------------------- @@ -91,5 +110,5 @@ void RicClearSourceSteppingEnsembleCurveSetFeature::clearAllSourceSteppingInSumm void RicClearSourceSteppingEnsembleCurveSetFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Clear Source Stepping Curve Set"); - actionToSetup->setIcon(QIcon(":/updownarrow.png")); + actionToSetup->setIcon(QIcon(":/StepUpDown16x16.png")); } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingSummaryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingSummaryCurveFeature.cpp index 226bcfb6ce..56490344d3 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingSummaryCurveFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicClearSourceSteppingSummaryCurveFeature.cpp @@ -28,6 +28,7 @@ #include "cafSelectionManager.h" #include +#include "RimEnsembleCurveSetCollection.h" CAF_CMD_SOURCE_INIT(RicClearSourceSteppingSummaryCurveFeature, "RicClearSourceSteppingSummaryCurveFeature"); @@ -36,7 +37,26 @@ CAF_CMD_SOURCE_INIT(RicClearSourceSteppingSummaryCurveFeature, "RicClearSourceSt //-------------------------------------------------------------------------------------------------- bool RicClearSourceSteppingSummaryCurveFeature::isCommandEnabled() { - return true; + std::vector objects; + caf::SelectionManager::instance()->objectsByType(&objects); + + if (objects.size() == 1) + { + auto c = objects[0]; + + RimSummaryPlot* summaryPlot = nullptr; + c->firstAncestorOrThisOfTypeAsserted(summaryPlot); + if (summaryPlot) + { + if (summaryPlot->ensembleCurveSetCollection()->curveSetForSourceStepping() + || summaryPlot->summaryCurveCollection()->curveForSourceStepping()) + { + return true; + } + } + } + + return false; } //-------------------------------------------------------------------------------------------------- @@ -66,5 +86,5 @@ void RicClearSourceSteppingSummaryCurveFeature::onActionTriggered(bool isChecked void RicClearSourceSteppingSummaryCurveFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Clear Source Stepping Curve"); - actionToSetup->setIcon(QIcon(":/updownarrow.png")); + actionToSetup->setIcon(QIcon(":/StepUpDown16x16.png")); } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingEnsembleCurveSetFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingEnsembleCurveSetFeature.cpp index 41f58fbc09..fec1dbfcc8 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingEnsembleCurveSetFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingEnsembleCurveSetFeature.cpp @@ -94,5 +94,5 @@ void RicSetSourceSteppingEnsembleCurveSetFeature::onActionTriggered(bool isCheck void RicSetSourceSteppingEnsembleCurveSetFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Set as Source Stepping Curve Set"); - actionToSetup->setIcon(QIcon(":/updownarrow.png")); + actionToSetup->setIcon(QIcon(":/StepUpDown16x16.png")); } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingSummaryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingSummaryCurveFeature.cpp index 87be98f560..153d664cd6 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingSummaryCurveFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSetSourceSteppingSummaryCurveFeature.cpp @@ -94,5 +94,5 @@ void RicSetSourceSteppingSummaryCurveFeature::onActionTriggered(bool isChecked) void RicSetSourceSteppingSummaryCurveFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Set as Source Stepping Curve"); - actionToSetup->setIcon(QIcon(":/updownarrow.png")); + actionToSetup->setIcon(QIcon(":/StepUpDown16x16.png")); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 83c13f947c..9b9c41119a 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -670,7 +670,12 @@ void RimEnsembleCurveSet::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrd this->firstAncestorOrThisOfType(coll); if (coll && coll->curveSetForSourceStepping() == this) { - icon = QIcon(":/updownarrow.png"); + QPixmap combined = icon.pixmap(16, 16); + QPainter painter(&combined); + QPixmap updownpixmap(":/StepUpDownCorner16x16.png"); + painter.drawPixmap(0,0,updownpixmap); + + icon = QIcon(combined); } this->setUiIcon(icon); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index f18edd006c..d513634176 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -581,7 +581,12 @@ void RimSummaryCurve::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrderin this->firstAncestorOrThisOfType(coll); if (coll && coll->curveForSourceStepping() == this) { - icon = QIcon(":/updownarrow.png"); + QPixmap combined = icon.pixmap(16, 16); + QPainter painter(&combined); + QPixmap updownpixmap(":/StepUpDownCorner16x16.png"); + painter.drawPixmap(0,0,updownpixmap); + + icon = QIcon(combined); } this->setUiIcon(icon); diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index 12b6cf613c..c0353f52ce 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -140,7 +140,8 @@ ToggleOnOff16x16.png ToggleOnOthersOff16x16.png ExportCompletionsSymbol16x16.png - updownarrow.png + StepUpDown16x16.png + StepUpDownCorner16x16.png fs_CellFace.glsl diff --git a/ApplicationCode/Resources/StepUpDown16x16.png b/ApplicationCode/Resources/StepUpDown16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..96caf453cc619439f10d25ddbda3fbb7fc658eb9 GIT binary patch literal 2189 zcmV;82y*v{P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3vtlJqDDfd6}nJ%WPxaUA1E)!tx_zi5PXCo|Kt zwQr|7v55lm0JiD>{5{NH`~gSFc#0|H5G;Ru_8AHfl083V-JSL8zJFL5yvdEe02U!X z@%)*>mUor|&xb9qTTfv*y(r3kzc}7sl&uKTHXs(aA#|q!yA_+V6(MZP{``HM+p;02 z__~F<=a2nylbww;re=3SJ_1m9U?ygDxj-|g^6Kgs0+8Bmm3f< zV`IpGmD2%P3hIknX7e&vU1Gz{CBxa{SlP^#|8<$)Od4Yrlyf#|tk^G@nay5Ia?Tm+ zcp4LNV+WO1faSV>CRb#Fw8ETtgT)?G1LHr)UCD(DH1b5^=UGQCwyl6e#2yek%1BZ9_Gf=3JthpT{X^P1?^R3JFT+z1&2VK5k(O~%5o zyeH0|=o9BqAtX;kfg&Z!R04)sVIjmYJ8Fp-eWVy-j49?=Ov2<7rI2DuDW{SlBX?ZN zT#q^BoJ(P&g*6vmU3fw%2ON0#gN|^-BOUoD6->qIE7eeAO*Pljpkd=WZlT4NT5hGg z&Z*RWryhFjspnn>r`o{b2aPb|NF$q3l-kDnxc&n*x2eG*H77=;#?lx?g`4e!CNm}m z-ZAhv2{<$WlbKDKkTVnA zFUUQ)eMPO6bQj(OAlp4? zYYN@SrlQ6GWr6+h#G>0J@d(SYWlj_(G218bH40)ih$PAEZnDS*v|oDi@N6zLrD4GywLb6a}exO84*v`%%HKEwV%R}AIEPW=_-k3R=${KGobsK2Gpvtq-!NAz75~dByRRY}RlNr6_IW$}s9m zv3#O9u6-uPe`-p)yQpa<3$pedaStlpw_vXD&^_p%F}mJlD<)`3*Y<2!&x~*QXgn*z zW-Sx|R2~aE#g9c-7yfr=Y8MS&imj-brX5YYrWUTDa__AgQgm0>{M3`ckaj1@09BAS0k~He7q71uQPgAy^uCuMvuQCUQ4$s!sovw{&$tlzidq9Chte= zV*mgE24YJ`L;(K){{V~k)e^P<000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jUD8 z4+tu-hGyRY000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008iNklhAySCQ)-#Ctcwk+#;tyVibI5-#rEVy*_dR?!suF4q@Bx zB3`#``>V~(&EalnVSj($EH5vgan7G)S>`IGKnMYxbC6O3r4)n^rrmD8y=-9!SYKZ! zX_|UcO6UCi960AdDTQja3ZCZyB7#yXFN#7KW3B=wCMF0X-eHXWh>EBAJw}`k%DRn&0gD8q13`4lMxah`l{7(18%5>HGfEe!rg_A0Ll|G>l??ejeuL=E%v(i9y6OL|j0`8(|ps0pK?&|9^CJ^rcd2A&R2r?Cfls zB+00S@$qqjh}W_#duWV_Ip-Fo^j)jf%3asJ6-Ci)0Qiqm`rH`vZm|0R*Z6TeQM_^& P00000NkvXXu0mjfFgF-O literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/StepUpDownCorner16x16.png b/ApplicationCode/Resources/StepUpDownCorner16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..8d410e29839e868b91793c4596b413fdb1f3e486 GIT binary patch literal 1357 zcmV-T1+w~yP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHb|WbahTmDmECES?U^x_*b7lv#{Q1E^Y$xgI zj&tTIg$2$;;A{A@_HRQdk=p9?tkT8#Iog!{^I4U~rA4AXgW^ZNq#7#&n`Zzok zxGzyMdY(NLqgTwwI3#rQ6tvh_#XRk}{`&fr=VrUUkUtI+#{Xb?ktCJEI-IoKPC=2v+?y_WAE*Dy6ggu9M+-sQRWQ$t`V*IR6tXFy^SN- zqb0P6k|@Agkz^NIp+pRfog7ul)Tzy}P=Sk%8!JZU!a~JB7y%=3nNZzm)LA7-1$>r* zbP!1S_(Iccn&t{c7_JlzvWK8-MN*z z26(sUYj711^fSy62h8>w8i4=u^p;#QK?^o|jJG->txEwy1P?r%L3uc`fy7fFtIS4; z5XcBX8LqQ9zJP_i=L#p;i3Gqw6~H#0QJP!X^G%EwAwYNu21OV_CNTip)TG%&i7xsWqQ)3g%!!lWjq4NYF~yWp&M=yx zIpgV!4LM(Y$>lD8g-fq^r7IUUMT#rFgrX&uRC47i6?I%g)f#K6xluzZHP?I#O)Nx< zdB@1E$*bd0Bzfx=Y40qD<&|wGF10-z&wNLGmLeql66I?{ayy-5=f-u`(zV_5ccXb0 zd|@P14_;G9b$+C)(_I_JK^ zFuYGXQ3&xyL|0?Xg)#O~6vZ&5VCMV&-Z{7E`~KcE%}PpnZrfJFzrW-M0uoG$IBvCc P00000NkvXXu0mjfy*zCg literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/updownarrow.png b/ApplicationCode/Resources/updownarrow.png deleted file mode 100644 index 7407a4c85b349008f88cfee9e5eb96f3d9db7e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^>XP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jNntK~z{r?Up@m z!!Qg+?V<?uT0Q?IXN(F_-~8I6Ca%6~3iMtC;j+3`&7J-X`zz zd`!^5FL)@l$E2Vwyzy3fw#ht!^t%<>N7=wnCuWYSnH^XJeDfS<)H{hgY&JQW9aszOn_GFd@Qj&GN}QAE0X;#f2%f4N6*rCw4$pNf zutl){)`=@)0uPYCY=eCtpuhXh_6z%Z!6gH@@~?33^`n~JX19$I_MBMScU1v%;ssmy z;sTan2Pc2_U$Hkh89e=sStt!o+?Gcc5e-h_R>dP0oX6w>h%Uk=w*^ia{7F?+)i?H) VwFSbm1gii5002ovPDHLkV1hcr