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

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
This commit is contained in:
Magne Sjaastad
2017-02-16 10:18:39 +01:00
parent 8a603c7f73 f323aa05e4
commit f9d8ab8bad
128 changed files with 7589 additions and 3420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@@ -40,6 +40,7 @@
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h"
#include "RimViewController.h"
#include "RimWellAllocationPlot.h"
#include "RimWellFlowRateCurve.h"
#include "RimWellLogCurve.h"
#include "RimWellLogPlot.h"
@@ -62,7 +63,17 @@ namespace caf
bool isDeletable(PdmUiItem * uiItem)
{
if (dynamic_cast<RimWellFlowRateCurve*>(uiItem)) return false;
caf::PdmObjectHandle* destinationObject = dynamic_cast<caf::PdmObjectHandle*>(uiItem);
if (destinationObject)
{
RimWellAllocationPlot* wellAllocationPlot = nullptr;
destinationObject->firstAncestorOrThisOfType(wellAllocationPlot);
if (wellAllocationPlot)
{
return false;
}
}
if (dynamic_cast<RimGeoMechView*>(uiItem)) return true;
if (dynamic_cast<RimEclipseView*>(uiItem)) return true;