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

Well path delete command supports multi selection

Browse Source
This commit is contained in:
Magne Sjaastad
2017-02-23 08:42:27 +01:00
parent 8eb8a6fd3b
commit dc886b7e9c
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.cpp
View File

@@ -29,6 +29,7 @@
namespace caf
{
CAF_CMD_SOURCE_INIT(RicWellPathDeleteFeature, "RicWellPathDeleteFeature");
@@ -40,7 +41,7 @@ bool RicWellPathDeleteFeature::isCommandEnabled()
std::vector<RimWellPath*> objects;
caf::SelectionManager::instance()->objectsByType(&objects);
if (objects.size() == 1)
if (objects.size() > 0)
{
return true;
}
@@ -58,13 +59,17 @@ void RicWellPathDeleteFeature::onActionTriggered(bool isChecked)
if (objects.size() == 0) return;
RimWellPath* wellPath = objects[0];
RimWellPath* firstWellPath = objects[0];
RimWellPathCollection* wellPathCollection = NULL;
wellPath->firstAncestorOrThisOfType(wellPathCollection);
RimWellPathCollection* wellPathCollection = nullptr;
firstWellPath->firstAncestorOrThisOfType(wellPathCollection);
if (!wellPathCollection) return;
wellPathCollection->removeWellPath(wellPath);;
delete wellPath;
for (RimWellPath* wellPath : objects)
{
wellPathCollection->removeWellPath(wellPath);;
delete wellPath;
}
wellPathCollection->uiCapability()->updateConnectedEditors();
wellPathCollection->scheduleGeometryRegenAndRedrawViews();
@@ -75,7 +80,7 @@ void RicWellPathDeleteFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
void RicWellPathDeleteFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Delete Well Path");
actionToSetup->setText("Delete Well Path(s)");
actionToSetup->setIcon(QIcon(":/Erase.png"));
}

10
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -213,8 +213,6 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
commandIds << "RicNewWellLogFileCurveFeature";
commandIds << "RicNewWellLogCurveExtractionFeature";
commandIds << "RicNewWellPathIntersectionFeature";
commandIds << "Separator";
commandIds << "RicWellPathDeleteFeature";
}
else if (dynamic_cast<RimCalcScript*>(uiItem))
{
@@ -445,6 +443,14 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
commandIds << "RicDeleteItemFeature";
}
if (caf::CmdFeatureManager::instance()->getCommandFeature("RicWellPathDeleteFeature")->canFeatureBeExecuted())
{
// Special delete command for Well paths
// Placed here to fit context menu location of general delete feature
commandIds << "Separator";
commandIds << "RicWellPathDeleteFeature";
}
if ( caf::CmdFeatureManager::instance()->getCommandFeature("RicCloseCaseFeature")->canFeatureBeExecuted() )
{
commandIds << "Separator";