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

Merged intersection-box into dev

Browse Source
This commit is contained in:
Jacob Støren
2016-09-28 14:27:17 +02:00
parent 88e40aa2d9 fa6a6b4f08
commit cbb626aa31
67 changed files with 3868 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -23,8 +23,8 @@
#include "RimCaseCollection.h"
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCrossSection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCellColors.h"
@@ -42,6 +42,8 @@
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionBoxCollection.h"
#include "RimScriptCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
@@ -211,7 +213,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicNewWellLogFileCurveFeature";
commandIds << "RicNewWellLogCurveExtractionFeature";
commandIds << "RicNewWellPathCrossSectionFeature";
commandIds << "RicNewWellPathIntersectionFeature";
commandIds << "RicWellPathDeleteFeature";
}
else if (dynamic_cast<RimCalcScript*>(uiItem))
@@ -297,19 +299,29 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicAddWellLogToPlotFeature";
}
else if (dynamic_cast<RimCrossSectionCollection*>(uiItem))
else if (dynamic_cast<RimIntersectionCollection*>(uiItem))
{
commandIds << "RicAppendCrossSectionFeature";
commandIds << "RicAppendIntersectionFeature";
}
else if (dynamic_cast<RimCrossSection*>(uiItem))
else if (dynamic_cast<RimIntersection*>(uiItem))
{
commandIds << "RicAppendCrossSectionFeature";
commandIds << "RicAppendIntersectionFeature";
commandIds << "Separator";
commandIds << "RicDeleteItemFeature";
}
else if (dynamic_cast<RimIntersectionBoxCollection*>(uiItem))
{
commandIds << "RicAppendIntersectionBoxFeature";
}
else if (dynamic_cast<RimIntersectionBox*>(uiItem))
{
commandIds << "RicAppendIntersectionBoxFeature";
commandIds << "Separator";
commandIds << "RicDeleteItemFeature";
}
else if (dynamic_cast<RimEclipseWell*>(uiItem))
{
commandIds << "RicNewSimWellCrossSectionFeature";
commandIds << "RicNewSimWellIntersectionFeature";
}
else if(dynamic_cast<RimFormationNames*>(uiItem))
{