From 8b95f1c06dfd0db5b948b0ff8463c511fc8160e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Fri, 18 Nov 2016 10:48:35 +0100 Subject: [PATCH] #962 Added axis-icons in the project tree. --- .../ProjectDataModel/Summary/RimSummaryPlot.cpp | 2 +- .../Summary/RimSummaryTimeAxisProperties.cpp | 2 +- .../Summary/RimSummaryYAxisProperties.cpp | 4 +++- ApplicationCode/Resources/Axes16x16.png | Bin 0 -> 221 bytes ApplicationCode/Resources/BottomAxis16x16.png | Bin 0 -> 202 bytes ApplicationCode/Resources/Copy.png | Bin 0 -> 303 bytes ApplicationCode/Resources/Erase.png | Bin 0 -> 269 bytes ApplicationCode/Resources/LeftAxis16x16.png | Bin 0 -> 200 bytes ApplicationCode/Resources/ResInsight.qrc | 11 +++++++++-- ApplicationCode/Resources/RightAxis16x16.png | Bin 0 -> 193 bytes ApplicationCode/Resources/clipboard.png | Bin 0 -> 293 bytes 11 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 ApplicationCode/Resources/Axes16x16.png create mode 100644 ApplicationCode/Resources/BottomAxis16x16.png create mode 100644 ApplicationCode/Resources/Copy.png create mode 100644 ApplicationCode/Resources/Erase.png create mode 100644 ApplicationCode/Resources/LeftAxis16x16.png create mode 100644 ApplicationCode/Resources/RightAxis16x16.png create mode 100644 ApplicationCode/Resources/clipboard.png diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 9b1fc0003e..0d92221f48 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -478,7 +478,7 @@ QImage RimSummaryPlot::snapshotWindowContent() //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) { - caf::PdmUiTreeOrdering* axisFolder = uiTreeOrdering.add("Axis", ":/Folder.png"); + caf::PdmUiTreeOrdering* axisFolder = uiTreeOrdering.add("Axes", ":/Axes16x16.png"); axisFolder->add(&m_timeAxisProperties); axisFolder->add(&m_leftYAxisProperties); axisFolder->add(&m_rightYAxisProperties); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index 7cf123cee4..d4e58328ba 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryTimeAxisProperties, "SummaryTimeAxisProperties"); //-------------------------------------------------------------------------------------------------- RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties() { - CAF_PDM_InitObject("Time Axis", ":/SummaryPlot16x16.png", "", ""); + CAF_PDM_InitObject("Time Axis", ":/BottomAxis16x16.png", "", ""); CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", ""); m_isActive.uiCapability()->setUiHidden(true); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp index 16e79ac187..9597a47230 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp @@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryYAxisProperties, "SummaryYAxisProperties"); //-------------------------------------------------------------------------------------------------- RimSummaryYAxisProperties::RimSummaryYAxisProperties() { - CAF_PDM_InitObject("Y-Axis Properties", ":/SummaryPlot16x16.png", "", ""); + CAF_PDM_InitObject("Y-Axis Properties", ":/LeftAxis16x16.png", "", ""); CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", ""); m_isActive.uiCapability()->setUiHidden(true); @@ -106,6 +106,8 @@ void RimSummaryYAxisProperties::setNameAndAxis(const QString& name, QwtPlot::Axi { m_name = name; m_axis = axis; + + if (axis == QwtPlot::yRight) this->setUiIcon(QIcon(":/RightAxis16x16.png")); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Resources/Axes16x16.png b/ApplicationCode/Resources/Axes16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..58919d35739407b3bc3f3c139f560aa60731c108 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=D4fK$x*l%_tfu$X?><>&pIsTZmJJD^7XBYoJh;r;B5V#p$>G8wDE_1X#k`6@Q6w z$gf(+X4PExqG5{G34_35lPkS>dOLRB4Jqw2^w1PcP7!6kQ2m^9Ygk#_Cgv6ajiokH z1`KPrmh;!Op4WabXSTTI^QS#qzv=Dy?j0HWyo^slspG_^gN)1gI@}IN$!r1I%HZkh K=d#Wzp$P!8MM^3F literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/BottomAxis16x16.png b/ApplicationCode/Resources/BottomAxis16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..a61212a60aeabdb470f30e01d77a70615e7c8134 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=D4fK$x*l%_tfu$X?><>&pIsTZn^0^pCqj4NxfD)5S5w;`G}-MWF)VN3o#$o)n<>%CS|Q{gnfr?@Tq&3I<>&pIsTZmmtK;iJ!cR-;%o-U3d7N@sf-k8PYD8TkWzg=vR z1Z(!jzNNjbjPVEVozm)`aBccW-WqwsP>)qhcy7!&D|aXM8=wD9`L@=F^Z(DEdvmGk zn~7mZR;|itV7+GXQ1-Ks`cd(?*%t3E91YftKfrm~BYfuL=oe`-PXAY4C2%51`mwrc z^P7j3TlnT11}%4cpzqQa*fYf>;_dszOpouBz7u+JyzQ>b1M4~5F?q4cIdd~BDp==y u6w;iN*evh!TBgtPYk$XM#>rv(-il_-HT_z4|CBP&9}J$ZelF{r5}E+t8+yF} literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/Erase.png b/ApplicationCode/Resources/Erase.png new file mode 100644 index 0000000000000000000000000000000000000000..8de141595a51c2d3e9eac685ebbe7fde1d1940cc GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=D4fK$x*l%_tfu$X?><>&pIsTZluL#s1)F5ung4PZ!4!i_>o}+4C_b3b1~dZ{ODb)`i)bHF^2?Qv@d$TF!`c&@j{P_nDp+Y6<5vQ&#uf*Gy3z9uQ<>&pIsTZn^K&F;ZgeV|aNr;B5V#p$<`4Fwq#d052Rv}dmH z^zGd8;~=B1)}_X__D9lT2hQaddb)(UT!=b+=7$&KjN&4v_jAvvN;-rVephy6lt{j# oTfwRS@Oz7j68C~@RVB}PxpSummaryCurveFilter16x16.png FormationCollection16x16.png Formations16x16.png - Parallel16x16.png - Perspective16x16.png + Parallel24x24.png + Perspective24x24.png IntersectionBox16x16.png IntersectionXPlane16x16.png IntersectionYPlane16x16.png @@ -73,6 +73,13 @@ 3DView16x16.png SummaryCase48x48.png openFolder24x24.png + clipboard.png + Copy.png + Erase.png + LeftAxis16x16.png + RightAxis16x16.png + BottomAxis16x16.png + Axes16x16.png fs_CellFace.glsl diff --git a/ApplicationCode/Resources/RightAxis16x16.png b/ApplicationCode/Resources/RightAxis16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..683d02efc79b9da10f5d0a79a78f15aaba4daf1d GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=D4fK$x*l%_tfu$X?><>&pIsTZn_#;>i0BAE1z*r;B5V#p$<`H}W1(;9=1ZvN<>&pIsTZmnO<-oU>l0czNo-U3d7N@sP*5zYzeS!FL~fUgCXf$