From c5264f56cbd25577361d89165119ce40bdc112bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Mon, 5 Jun 2017 11:12:13 +0200 Subject: [PATCH] #1503 Added icons to fishbones and perforations --- .../RicNewFishbonesSubsAtMeasuredDepthFeature.cpp | 2 +- .../RicNewFishbonesSubsFeature.cpp | 2 +- .../RicWellPathImportCompletionsFileFeature.cpp | 2 +- .../Completions/RimFishboneWellPath.cpp | 2 +- .../Completions/RimFishboneWellPathCollection.cpp | 2 +- .../Completions/RimFishbonesCollection.cpp | 2 +- .../Completions/RimFishbonesMultipleSubs.cpp | 2 +- .../Completions/RimPerforationCollection.cpp | 2 +- .../Completions/RimPerforationInterval.cpp | 2 +- .../Completions/RimWellPathCompletions.cpp | 2 +- .../Resources/CompletionsSymbol16x16.png | Bin 0 -> 260 bytes ApplicationCode/Resources/FishBoneGroup16x16.png | Bin 0 -> 516 bytes .../Resources/FishBoneGroupFromFile16x16.png | Bin 0 -> 736 bytes .../Resources/FishBoneLateralFromFile16x16.png | Bin 0 -> 550 bytes ApplicationCode/Resources/FishBones16x16.png | Bin 0 -> 625 bytes .../Resources/PerforationInterval16x16.png | Bin 0 -> 544 bytes .../Resources/PerforationIntervals16x16.png | Bin 0 -> 611 bytes ApplicationCode/Resources/ResInsight.qrc | 7 +++++++ 18 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 ApplicationCode/Resources/CompletionsSymbol16x16.png create mode 100644 ApplicationCode/Resources/FishBoneGroup16x16.png create mode 100644 ApplicationCode/Resources/FishBoneGroupFromFile16x16.png create mode 100644 ApplicationCode/Resources/FishBoneLateralFromFile16x16.png create mode 100644 ApplicationCode/Resources/FishBones16x16.png create mode 100644 ApplicationCode/Resources/PerforationInterval16x16.png create mode 100644 ApplicationCode/Resources/PerforationIntervals16x16.png diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp index 4d10720ff4..d91ce7f5b8 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp @@ -82,7 +82,7 @@ RiuWellPathSelectionItem* RicNewFishbonesSubsAtMeasuredDepthFeature::wellPathSel //-------------------------------------------------------------------------------------------------- void RicNewFishbonesSubsAtMeasuredDepthFeature::setupActionLook(QAction* actionToSetup) { - //actionToSetup->setIcon(QIcon(":/FractureSymbol16x16.png")); + actionToSetup->setIcon(QIcon(":/FishBoneGroup16x16.png")); actionToSetup->setText("New Fishbones Subs Definition"); } diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp index 37a3b7a6d0..22a77e6885 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp @@ -82,7 +82,7 @@ RimFishbonesCollection* RicNewFishbonesSubsFeature::selectedFishbonesCollection( //-------------------------------------------------------------------------------------------------- void RicNewFishbonesSubsFeature::setupActionLook(QAction* actionToSetup) { - //actionToSetup->setIcon(QIcon(":/FractureSymbol16x16.png")); + actionToSetup->setIcon(QIcon(":/FishBoneGroup16x16.png")); actionToSetup->setText("New Fishbones Subs Definition"); } diff --git a/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp index 3d11812a51..0c24b02523 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp @@ -80,7 +80,7 @@ void RicWellPathImportCompletionsFileFeature::onActionTriggered(bool isChecked) void RicWellPathImportCompletionsFileFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Import Completions from File"); - actionToSetup->setIcon(QIcon(":/Well.png")); + actionToSetup->setIcon(QIcon(":/FishBoneGroupFromFile16x16.png")); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp index 9915e8e372..7ade5a00b5 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp @@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimFishboneWellPath, "WellPathCompletion"); //-------------------------------------------------------------------------------------------------- RimFishboneWellPath::RimFishboneWellPath() { - CAF_PDM_InitObject("WellPathCompletion", ":/Well.png", "", ""); + CAF_PDM_InitObject("WellPathCompletion", ":/FishBoneLateralFromFile16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_coordinates, "Coordinates", "Coordinates", "", "", ""); m_coordinates.uiCapability()->setUiHidden(true); CAF_PDM_InitFieldNoDefault(&m_measuredDepths, "MeasuredDepth", "MeasuredDepth", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp index f975b5e6b0..2d4cb878f9 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp @@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT(RimFishboneWellPathCollection, "WellPathCompletionCollection //-------------------------------------------------------------------------------------------------- RimFishboneWellPathCollection::RimFishboneWellPathCollection() { - CAF_PDM_InitObject("WellPathCompletions", ":/WellCollection.png", "", ""); + CAF_PDM_InitObject("WellPathCompletions", ":/FishBoneGroupFromFile16x16.png", "", ""); m_name.uiCapability()->setUiHidden(true); m_name = "Well Paths"; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp index 15f2063c48..6b266b9d1c 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp @@ -37,7 +37,7 @@ CAF_PDM_SOURCE_INIT(RimFishbonesCollection, "FishbonesCollection"); //-------------------------------------------------------------------------------------------------- RimFishbonesCollection::RimFishbonesCollection() { - CAF_PDM_InitObject("Fishbones", ":/Folder.png", "", ""); + CAF_PDM_InitObject("Fishbones", ":/FishBones16x16.png", "", ""); m_name.uiCapability()->setUiHidden(true); m_name = "Fishbones"; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp index a98d7a703b..420134caf1 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp @@ -57,7 +57,7 @@ namespace caf { //-------------------------------------------------------------------------------------------------- RimFishbonesMultipleSubs::RimFishbonesMultipleSubs() { - CAF_PDM_InitObject("FishbonesMultipleSubs", ":/Default.png", "", ""); + CAF_PDM_InitObject("FishbonesMultipleSubs", ":/FishBoneGroup16x16.png", "", ""); CAF_PDM_InitField(&fishbonesColor, "FishbonesColor", cvf::Color3f(0.999f, 0.333f, 0.999f), "Fishbones Color", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp index 825524ca73..808aa571d7 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp @@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT(RimPerforationCollection, "PerforationCollection"); //-------------------------------------------------------------------------------------------------- RimPerforationCollection::RimPerforationCollection() { - CAF_PDM_InitObject("Perforations", ":/Folder.png", "", ""); + CAF_PDM_InitObject("Perforations", ":/PerforationIntervals16x16.png", "", ""); m_name.uiCapability()->setUiHidden(true); m_name = "Perforations"; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp index 0599216b55..688fabb42a 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp @@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT(RimPerforationInterval, "Perforation"); //-------------------------------------------------------------------------------------------------- RimPerforationInterval::RimPerforationInterval() { - CAF_PDM_InitObject("Perforation", ":/Default.png", "", ""); + CAF_PDM_InitObject("Perforation", ":/PerforationInterval16x16.png", "", ""); CAF_PDM_InitField(&m_startMD, "StartMeasuredDepth", 0.0, "Start MD [m]", "", "", ""); CAF_PDM_InitField(&m_endMD, "EndMeasuredDepth", 0.0, "End MD [m]", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp b/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp index 0cf4c93386..d72230fc07 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp @@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimWellPathCompletions, "WellPathCompletions"); //-------------------------------------------------------------------------------------------------- RimWellPathCompletions::RimWellPathCompletions() { - CAF_PDM_InitObject("Completions", ":/WellCollection.png", "", ""); + CAF_PDM_InitObject("Completions", ":/CompletionsSymbol16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_perforationCollection, "Perforations", "Perforations", "", "", ""); m_perforationCollection = new RimPerforationCollection; diff --git a/ApplicationCode/Resources/CompletionsSymbol16x16.png b/ApplicationCode/Resources/CompletionsSymbol16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..54e797f90983e642cc3303bc913c0a5097a7088c GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPt8!IQ9#?hSMXFws@%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dD4yZz;uvCaIypfiaAM#u@HPy@>~0g))5{vb?R03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00C%8L_t(I%dL~WOG053 z#((!JWo1PTHS{%vK|`cnC6Y@K4UIK9HMm4;L-hU&2~AD4xwM2sjt15w1{pzv84V5L z5G^WxQGT@C3%AQF74^cqob&LU=Xp2>{`=jA2VK9xtCHH5gmmpk1O_l5!FfBV-LoqQ z0Z$UF@~r|>rWP$8+NS__9c+12A;hx~;-aqhY&UVlgb*^)q-3}cICJQ_{sGKB_Ibx2 z+}Z@NqU-w1?p$Nh(QYinN5UtmRH`hQzN|%yM~W#k*E`>R-@kMN>;sd)J5VwFE5Hko z4i*xD7HU_?Ih4z~{nv`stLa||F&!)<4!T?QsjK0QED!`dKoxj1eg&v0wy?g0Xa=Z7 zi%B7b-yj(SO28=Ka$2mN1Dm#>?f^fKj6@WFU8GbZ8()Nlj2>E@cM*00KlwL_t(I%XO2%OH@%5 zhrc^BZ=Rats8C{}2B}dk3e-jJDq6I%HntIQ7qn_&KKc(DXxXBLg0+km1rdy3Q7vX5 zMQ9--1_qMg=$jeGnR(N_@4ef?XFg3Y+|BQt`<>st=Ul-lYhrvN(Q~1X|^p0B}?3K28V zdjGK28c#!AxhUoS4_KN^HVn?~)|Km`T#x)t5yNzX>W7emT|!EAqJwc@Mk-ft{95PD z>sf>l2qE?%XtV~;RTS-=qkyH!C+%v>d6hw^ycM7l=lq|2Y@~ z*7lRChLV!YSFeyvwqlwleSLjsG}%ms`Sd(SEOrP8sxvsZ`y8N9EaNy1QcAvk{X(*} zmF}Kylu}43@jVX@h*_4k4y@I;Ulj~r&RUigNu^T0tD}j!xFbwkfJW@(* z+ooEn5RbDqsUYyUMxFbCq06_U!13j?VL|PoF&Y!ft)dgUM{?vfKFBv1_oPyic1W~7uJ_KC#Hv9{bw^H5fVs8a{`w=C=8NGbiy^y|H! z+ecS`5uhKa0o%c@0?rXY_z^?e^5ER=f@N7l0i+8k106s^xQ*|Cd&ko=77iRn(AUSdUfzs^0>6Rx#{iL&K3V{&0sI9G9S~$j Sr`c5i0000Eak-aeC?G{oc}r636VnYcIcF@ysNuz+}Y>vDFG3 zTwG0Ct{z<4+*}yo_~O!2fsz8jKgv2yE1J8TIrR8KUx@@1=va8omhxQpOs}&%UOYCW z=U95x!>2!O^!fJ$IKB+=sm@#ExXq{kf3xOZ?wt1G=)|Y-2jb3G zy<ZP>guaB+Gszig_i(S*(|A~AaxvTR{= z?mNs`z%s{M^S6(4yb%vCYk(>11QBo75{0L)z8PHLDPj2Qpnrk2hsi!K-}$}>Q{q+O zwn-f;7Ds3avwX^AXXty(u|V_$Q~jp!>)p-D^QX6_Hns$K9a4BuQ2)L1Kyq)rWVC?N zuB1pYM*)SUPo6!q-}ij)9}WIf&p$X literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/FishBones16x16.png b/ApplicationCode/Resources/FishBones16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..192c5450f2f5296b145f7f6b932202e82959475e GIT binary patch literal 625 zcmV-%0*?KOP)WFU8GbZ8()Nlj2>E@cM*00GrWL_t(I%iWSqYZFlv zhM!EM#FjcHYKugJQQ|Dyai|C`6jL`YbRh(n0}91`=+Hl)T*wb-bTjLMU|k3%9TCMA ztJA1pVbBsyimk(YU#RVW8c(^K9;W&pGdVKJJD8$6Qm*N3m?eT82dzheVRLSZ+JEy53e{P1keiMntVD3 znCj5cUy0_7vcu=B8FtXzCZ>16wgQG7IN`e|d?(V)znNwwivWKC3+Ju+9~Wp800000 LNkvXXu0mjf?yV1Q literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/PerforationInterval16x16.png b/ApplicationCode/Resources/PerforationInterval16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..81dd3f61b511adde69fcdabdc941bf6c1e6032d3 GIT binary patch literal 544 zcmV+*0^j|KP)WFU8GbZ8()Nlj2>E@cM*00D$aL_t(I%k7dsNLx`9 z#(y{OnI_mE#6Lx>*x1E@D3l8q9BM(@twSkVaLQB%lTDJjvkroy>qSry6~#IfO29!1 z6_-M3buk#MR1}R#Fd~nYl<>~CpX8=;GL`5S~t6Hhm zyX(DnGMW4=g!lq{0*vE0TOZk;0Xl&}U;-Eh#(=2Qs(UN;^;^}z=eq7D&;v{YBYwYs z`qAlwU_2fl3KoNhiA16cXaj11UZC#k1_B_JN_7LRfLkt?KlpsUCZObbUdghok}<|A z2F{On8!~~`{NvU7V%Pz4KwezGNoo~wyztbk?;RW2y8VI3pSEowgfzyqpWDu5$UOWF z905hZv8sci<$k|A|HC_2`IQU5ebTs=nj5W+h58ng3j^+ZFDg7Sk!{L0w4AlfUYLs= zTiAQRkzF+?yjgJnnVG_BrQDQS2_TSZ-b(|o)6w-M;H2;8i+uG3HzKuau4qhZ6_#3! i-zpzctLOhcbbkRBZiC<68%si|?FvGf(25j_*gP0`ZUzAal7^S1eOs-pd~`)7PB zD=T&WOGt<(Zq$+VIzGqK;^*APM#o+to_q7km5|4l*Sjr_<}b>crGHe;(AfC){>MKS zh%I>X?efKoA6NJG@}53_#eNYF5070Cqfx)4gv6btOeyb-3=BRP8W?Oa1~Lp@oZY

$PexLGw=fWTA z8@t#4h+Ap+Keg`s37`iR_Fg*uLs2GHc?*k6-88*Z(s%G_Fl)shm(=t08@U{rh9*4{w(VkAD$V zU|e^eWeLNU$NvvRFZk<|{hs$?^wC-Cucq5Rt$p^d{bj$#wH1bu3F}&pq_tf7yx@!3 zWY%YY`fShbycV1*ZjfmFz~|7(YL7Snf#LfT=p8?&R=>Hx;QP4w#Po9eoprX!ifS7{ s;n~^Pn5Z^oH?PmdKI;Vst0FG-C&j0`b literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index 22b393629a..2f4f2418c6 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -80,6 +80,13 @@ RightAxis16x16.png BottomAxis16x16.png Axes16x16.png + FishBones16x16.png + FishBoneGroup16x16.png + FishBoneGroupFromFile16x16.png + FishBoneLateralFromFile16x16.png + PerforationInterval16x16.png + PerforationIntervals16x16.png + CompletionsSymbol16x16.png WellAllocPlots16x16.png WellAllocPlot16x16.png WellFlowPlot16x16.png