OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5327 Well Measurements : Improve context menus

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-11 08:23:45 +01:00
parent cc65ce581f
commit 276114f668
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp
View File

@ -25,6 +25,7 @@
#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindow.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimWellMeasurementCollection.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
@ -99,6 +100,11 @@ std::vector<RimWellPath*> RicExportCompletionsForVisibleWellPathsFeature::visibl
{ {
std::vector<RimWellPath*> wellPaths; std::vector<RimWellPath*> wellPaths;
{
auto measurementColl = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellMeasurementCollection>();
if ( measurementColl ) return wellPaths;
}
{ {
std::vector<RimWellPathCollection*> wellPathCollections; std::vector<RimWellPathCollection*> wellPathCollections;
caf::SelectionManager::instance()->objectsByType( &wellPathCollections ); caf::SelectionManager::instance()->objectsByType( &wellPathCollections );

6
ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp
View File

@ -150,5 +150,11 @@ RimWellPathCollection* RicImportWellMeasurementsFeature::selectedWellPathCollect
return objects[0]; return objects[0];
} }
auto measurementColl = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellMeasurementCollection>();
if ( measurementColl )
{
return caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPathCollection>();
}
return nullptr; return nullptr;
} }

6
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -117,6 +117,7 @@
#include "RimWellLogPlot.h" #include "RimWellLogPlot.h"
#include "RimWellLogPlotCollection.h" #include "RimWellLogPlotCollection.h"
#include "RimWellLogTrack.h" #include "RimWellLogTrack.h"
#include "RimWellMeasurementCollection.h"
#include "RimWellMeasurementFilePath.h" #include "RimWellMeasurementFilePath.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RimWellPathAttributeCollection.h" #include "RimWellPathAttributeCollection.h"
@ -330,6 +331,11 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
else if ( dynamic_cast<RimWellMeasurementFilePath*>( firstUiItem ) ) else if ( dynamic_cast<RimWellMeasurementFilePath*>( firstUiItem ) )
{ {
menuBuilder << "RicDeleteWellMeasurementFilePathFeature"; menuBuilder << "RicDeleteWellMeasurementFilePathFeature";
menuBuilder << "RicImportWellMeasurementsFeature";
}
else if ( dynamic_cast<RimWellMeasurementCollection*>( firstUiItem ) )
{
menuBuilder << "RicImportWellMeasurementsFeature";
} }
else if ( dynamic_cast<RimWellPath*>( firstUiItem ) ) else if ( dynamic_cast<RimWellPath*>( firstUiItem ) )
{ {