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

#4189 RFT Plot : Move common code to RifEclipseRftAddress

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-12 08:26:42 +01:00
parent 564ab1d84b
commit 246326229e
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -301,8 +301,10 @@ void RimWellRftPlot::applyInitialSelections()
m_selectedSources = sourcesToSelect;
{
auto relevantTimeSteps = RimWellPlotTools::calculateRelevantTimeStepsFromCases(
associatedSimWellName(), m_selectedSources, {RifEclipseRftAddress::PRESSURE});
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes();
auto relevantTimeSteps =
RimWellPlotTools::calculateRelevantTimeStepsFromCases(associatedSimWellName(), m_selectedSources, channelTypesToUse);
std::vector<QDateTime> timeStepVector;
for (const auto& item : relevantTimeSteps)
@@ -411,10 +413,10 @@ void RimWellRftPlot::syncCurvesFromUiSelection()
//--------------------------------------------------------------------------------------------------
std::set<RiaRftPltCurveDefinition> RimWellRftPlot::selectedCurveDefs() const
{
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse{RifEclipseRftAddress::PRESSURE};
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes();
return RimWellPlotTools::curveDefsFromTimesteps(
associatedSimWellName(), m_selectedTimeSteps.v(), true, selectedSourcesExpanded());
associatedSimWellName(), m_selectedTimeSteps.v(), true, selectedSourcesExpanded(), channelTypesToUse);
}
//--------------------------------------------------------------------------------------------------
@@ -660,8 +662,10 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptions(const caf::P
}
else if (fieldNeedingOptions == &m_selectedTimeSteps)
{
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes();
RimWellPlotTools::calculateValueOptionsForTimeSteps(
associatedSimWellName(), selectedSourcesExpanded(), {RifEclipseRftAddress::PRESSURE}, options);
associatedSimWellName(), selectedSourcesExpanded(), channelTypesToUse, options);
}
else if (fieldNeedingOptions == &m_branchIndex)
{