Merge branch 'annotation-items' into dev

This commit is contained in:
Magne Sjaastad
2019-03-19 15:00:30 +01:00
45 changed files with 2104 additions and 117 deletions

View File

@@ -95,6 +95,7 @@
#include "RimWellPathCollection.h"
#include "RimWellPltPlot.h"
#include "RimWellRftPlot.h"
#include "RimSaturationPressurePlotCollection.h"
#include "RimEllipseFractureTemplate.h"
#include "RimStimPlanFractureTemplate.h"
@@ -472,6 +473,10 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "RicCreateGridCrossPlotFeature";
}
else if (dynamic_cast<RimSaturationPressurePlotCollection*>(uiItem))
{
menuBuilder << "RicCreateSaturationPressurePlotsFeature";
}
else if (dynamic_cast<RimGridCrossPlot*>(uiItem))
{
menuBuilder << "RicPasteGridCrossPlotCurveSetFeature";