Merge perforation updates into dev #2422

This commit is contained in:
Magne Sjaastad 2018-02-01 13:04:04 +01:00
commit c5333d09b2

View File

@ -71,6 +71,7 @@ void RicWellPathImportPerforationIntervalsFeature::onActionTriggered(bool isChec
std::map<QString, std::vector<RifPerforationInterval> > perforationIntervals = RifPerforationIntervalReader::readPerforationIntervals(wellPathFilePaths);
RimPerforationInterval* lastPerforationInterval = nullptr;
for (auto& entry : perforationIntervals)
{
RimWellPath* wellPath = wellPathCollection->tryFindMatchingWellPath(entry.first);
@ -95,14 +96,21 @@ void RicWellPathImportPerforationIntervalsFeature::onActionTriggered(bool isChec
perforationInterval->setDate(interval.date);
}
wellPath->perforationIntervalCollection()->appendPerforation(perforationInterval);
lastPerforationInterval = perforationInterval;
}
}
}
wellPathCollection->uiCapability()->updateConnectedEditors();
if (app->project())
{
app->project()->createDisplayModelAndRedrawAllViews();
}
if (lastPerforationInterval)
{
RiuMainWindow::instance()->selectAsCurrentItem(lastPerforationInterval);
}
}
//--------------------------------------------------------------------------------------------------