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 pull request #9063 from OPM/more-rft-fixes-01

Browse Source 
More RFT fixes
This commit is contained in:
Magne Sjaastad
2022-06-17 17:24:58 +02:00
committed by GitHub
parent 62cf62b9a2
commit d854a3d3e7
17 changed files with 390 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectCaseOrEnsembleUi.cpp
View File

@@ -18,6 +18,8 @@
#include "RicSelectCaseOrEnsembleUi.h"
#include "RiaSummaryTools.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
@@ -78,14 +80,7 @@ QList<caf::PdmOptionItemInfo>
if ( fieldNeedingOptions == &m_selectedSummaryCase )
{
RimProject* proj = RimProject::current();
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
for ( RimSummaryCase* rimCase : cases )
{
options.push_back( caf::PdmOptionItemInfo( rimCase->displayCaseName(), rimCase ) );
}
options = RiaSummaryTools::optionsForAllSummaryCases();
}
else if ( fieldNeedingOptions == &m_selectedEnsemble )
{

18
ApplicationLibCode/Commands/RicWellLogTools.cpp
View File

@@ -29,6 +29,7 @@
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimSummaryCase.h"
#include "RimWellLogCurveCommonDataSource.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogFile.h"
@@ -378,6 +379,23 @@ RimWellLogRftCurve*
curve->setDefaultAddress( wellName );
}
}
else
{
auto sumCases = RimProject::current()->allSummaryCases();
for ( auto sc : sumCases )
{
if ( sc->rftReader() )
{
auto rftReader = sc->rftReader();
curve->setSummaryCase( sc );
auto addresses = rftReader->eclipseRftAddresses();
if ( !addresses.empty() ) curve->setRftAddress( *addresses.begin() );
}
}
}
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
curve->setColor( curveColor );