diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp index 3edc3fc9ca..ea75d8afbe 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp @@ -25,6 +25,7 @@ #include "RiuPlotMainWindow.h" #include "RimProject.h" +#include "RimWellMeasurementCollection.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" @@ -99,6 +100,11 @@ std::vector RicExportCompletionsForVisibleWellPathsFeature::visibl { std::vector wellPaths; + { + auto measurementColl = caf::SelectionManager::instance()->selectedItemAncestorOfType(); + if ( measurementColl ) return wellPaths; + } + { std::vector wellPathCollections; caf::SelectionManager::instance()->objectsByType( &wellPathCollections ); diff --git a/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp index 252247fe3c..4e2a51a5fa 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp @@ -150,5 +150,11 @@ RimWellPathCollection* RicImportWellMeasurementsFeature::selectedWellPathCollect return objects[0]; } + auto measurementColl = caf::SelectionManager::instance()->selectedItemAncestorOfType(); + if ( measurementColl ) + { + return caf::SelectionManager::instance()->selectedItemAncestorOfType(); + } + return nullptr; } diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index ea1cdd73c2..26d45f08e1 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -117,6 +117,7 @@ #include "RimWellLogPlot.h" #include "RimWellLogPlotCollection.h" #include "RimWellLogTrack.h" +#include "RimWellMeasurementCollection.h" #include "RimWellMeasurementFilePath.h" #include "RimWellPath.h" #include "RimWellPathAttributeCollection.h" @@ -330,6 +331,11 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() else if ( dynamic_cast( firstUiItem ) ) { menuBuilder << "RicDeleteWellMeasurementFilePathFeature"; + menuBuilder << "RicImportWellMeasurementsFeature"; + } + else if ( dynamic_cast( firstUiItem ) ) + { + menuBuilder << "RicImportWellMeasurementsFeature"; } else if ( dynamic_cast( firstUiItem ) ) {