From d748cfc96fffc688a82232acfdd511a31e384381 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 9 Apr 2020 14:15:05 +0200 Subject: [PATCH] #5777 Well Measurements : Add icons --- .../WellPathCommands/RicImportWellMeasurementsFeature.cpp | 1 + ApplicationCode/ProjectDataModel/RimWellMeasurement.cpp | 2 +- .../ProjectDataModel/RimWellMeasurementCollection.cpp | 2 +- ApplicationCode/ProjectDataModel/RimWellMeasurementFilePath.cpp | 2 +- ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp | 2 +- .../ProjectDataModel/RimWellMeasurementInViewCollection.cpp | 2 +- ApplicationCode/Resources/ResInsight.qrc | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp index 5b5a57be27..98c4b4083b 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp @@ -69,4 +69,5 @@ void RicImportWellMeasurementsFeature::onActionTriggered( bool isChecked ) void RicImportWellMeasurementsFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Import Measurements" ); + actionToSetup->setIcon( QIcon( ":/WellMeasurement16x16.png" ) ); } diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurement.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurement.cpp index 940368313b..cf754f3d5e 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurement.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurement.cpp @@ -29,7 +29,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurement, "WellMeasurement" ); //-------------------------------------------------------------------------------------------------- RimWellMeasurement::RimWellMeasurement() { - CAF_PDM_InitObject( "RimWellMeasurement", "", "", "" ); + CAF_PDM_InitObject( "RimWellMeasurement", ":/WellMeasurement16x16.png", "", "" ); CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name", "", "", "" ); CAF_PDM_InitField( &m_MD, "Depth", -1.0, "MD", "", "", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp index 696698fb59..a8d626d839 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp @@ -37,7 +37,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurementCollection, "WellMeasurements" ); //-------------------------------------------------------------------------------------------------- RimWellMeasurementCollection::RimWellMeasurementCollection() { - CAF_PDM_InitObject( "Well Measurements", "", "", "" ); + CAF_PDM_InitObject( "Well Measurements", ":/WellMeasurement16x16.png", "", "" ); CAF_PDM_InitFieldNoDefault( &m_measurements, "Measurements", "Well Measurements", "", "", "" ); m_measurements.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementFilePath.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementFilePath.cpp index 544ec49079..21ac554355 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementFilePath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementFilePath.cpp @@ -29,7 +29,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurementFilePath, "WellMeasurementFilePath" ); //-------------------------------------------------------------------------------------------------- RimWellMeasurementFilePath::RimWellMeasurementFilePath() { - CAF_PDM_InitObject( "RimWellMeasurementFilePath", "", "", "" ); + CAF_PDM_InitObject( "RimWellMeasurementFilePath", ":/WellMeasurement16x16.png", "", "" ); CAF_PDM_InitFieldNoDefault( &m_userDescription, "UserDecription", "Name", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path", "", "", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp index f764a58687..5e989edd2e 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp @@ -47,7 +47,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurementInView, "WellMeasurementInView" ); //-------------------------------------------------------------------------------------------------- RimWellMeasurementInView::RimWellMeasurementInView() { - CAF_PDM_InitObject( "Well Measurement", "", "", "" ); + CAF_PDM_InitObject( "Well Measurement", ":/WellMeasurement16x16.png", "", "" ); CAF_PDM_InitFieldNoDefault( &m_measurementKind, "MeasurementKind", "Measurement Kind", "", "", "" ); m_measurementKind.uiCapability()->setUiHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementInViewCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementInViewCollection.cpp index a9e9709eba..2979b9cf6c 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementInViewCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementInViewCollection.cpp @@ -43,7 +43,7 @@ CAF_PDM_SOURCE_INIT( RimWellMeasurementInViewCollection, "WellMeasurementsInView //-------------------------------------------------------------------------------------------------- RimWellMeasurementInViewCollection::RimWellMeasurementInViewCollection() { - CAF_PDM_InitObject( "Well Measurements", "", "", "" ); + CAF_PDM_InitObject( "Well Measurements", ":/WellMeasurement16x16.png", "", "" ); CAF_PDM_InitFieldNoDefault( &m_measurementsInView, "MeasurementKinds", "Measurement Kinds", "", "", "" ); m_measurementsInView.uiCapability()->setUiHidden( true ); diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index 46ebd4b74f..8f62f45f1e 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -154,6 +154,7 @@ WellLogPlot16x16.png WellLogPlots16x16.png WellLogTrack16x16.png + WellMeasurement16x16.png WellTargetPoint16x16.png WellTargetPointTangent16x16.png WellTargets.png