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

#2126, #2139 Rftplot alignment with PLT plot. WIP 2

Browse Source
This commit is contained in:
Jacob Støren 2017-11-16 16:17:54 +01:00
parent 49c2d6df0d
commit 6b2231478c
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@ -262,13 +262,28 @@ void RimWellPltPlot::updateWidgetTitleWindowTitle()
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::set < RiaRftPltCurveDefinition > RimWellPltPlot::selectedCurveDefs() const std::set < RiaRftPltCurveDefinition > RimWellPltPlot::selectedCurveDefs() const
{
return curveDefsFromTimesteps(RimWellPlotTools::simWellName(m_wellPathName),
m_selectedTimeSteps.v(),
{RifEclipseRftAddress::ORAT,
RifEclipseRftAddress::WRAT,
RifEclipseRftAddress::GRAT},
selectedSourcesExpanded());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set < RiaRftPltCurveDefinition > RimWellPltPlot::curveDefsFromTimesteps(const QString& simWellName,
const std::vector<QDateTime>& selectedTimeSteps,
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults,
const std::vector<RifDataSourceForRftPlt>& selectedSourcesExpanded)
{ {
std::set<RiaRftPltCurveDefinition> curveDefs; std::set<RiaRftPltCurveDefinition> curveDefs;
const QString simWellName = RimWellPlotTools::simWellName(m_wellPathName);
std::set<QDateTime> selectedTimeSteps(m_selectedTimeSteps.v().begin(), m_selectedTimeSteps.v().end()); std::set<QDateTime> selectedTimeStepSet(selectedTimeSteps.begin(), selectedTimeSteps.end());
for ( const RifDataSourceForRftPlt& addr : selectedSourcesExpanded() ) for ( const RifDataSourceForRftPlt& addr : selectedSourcesExpanded )
{ {
if ( addr.rftReader() ) if ( addr.rftReader() )
{ {
@ -277,7 +292,7 @@ std::set < RiaRftPltCurveDefinition > RimWellPltPlot::selectedCurveDefs() const
RifEclipseRftAddress::GRAT }); RifEclipseRftAddress::GRAT });
for ( const QDateTime& time : rftTimes ) for ( const QDateTime& time : rftTimes )
{ {
if ( selectedTimeSteps.count(time) ) if ( selectedTimeStepSet.count(time) )
{ {
curveDefs.insert(RiaRftPltCurveDefinition(addr, time)); curveDefs.insert(RiaRftPltCurveDefinition(addr, time));
} }
@ -289,7 +304,7 @@ std::set < RiaRftPltCurveDefinition > RimWellPltPlot::selectedCurveDefs() const
for ( const QDateTime& time : timeSteps ) for ( const QDateTime& time : timeSteps )
{ {
if ( selectedTimeSteps.count(time) ) if ( selectedTimeStepSet.count(time) )
{ {
curveDefs.insert(RiaRftPltCurveDefinition(addr, time)); curveDefs.insert(RiaRftPltCurveDefinition(addr, time));
} }
@ -299,7 +314,7 @@ std::set < RiaRftPltCurveDefinition > RimWellPltPlot::selectedCurveDefs() const
{ {
if ( addr.wellLogFile() ) if ( addr.wellLogFile() )
{ {
if ( selectedTimeSteps.count(addr.wellLogFile()->date()) ) if ( selectedTimeStepSet.count(addr.wellLogFile()->date()) )
{ {
curveDefs.insert(RiaRftPltCurveDefinition(addr, addr.wellLogFile()->date())); curveDefs.insert(RiaRftPltCurveDefinition(addr, addr.wellLogFile()->date()));
} }
@ -1023,7 +1038,7 @@ void RimWellPltPlot::calculateValueOptionsForWells(QList<caf::PdmOptionItemInfo>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellPltPlot::calculateValueOptionsForTimeSteps(const QString& simWellName, void RimWellPltPlot::calculateValueOptionsForTimeSteps(const QString& simWellName,
const std::vector<RifDataSourceForRftPlt>& selSources, const std::vector<RifDataSourceForRftPlt>& selSources,
const std::set<RifEclipseRftAddress::RftWellLogChannelType> interestingRFTResults, const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults,
QList<caf::PdmOptionItemInfo>& options) QList<caf::PdmOptionItemInfo>& options)
{ {
//std::vector<RifDataSourceForRftPlt> selSources = selectedSourcesExpanded(); //std::vector<RifDataSourceForRftPlt> selSources = selectedSourcesExpanded();

6
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h
View File

@ -85,8 +85,12 @@ public:
static void calculateValueOptionsForTimeSteps(const QString& wellPathNameOrSimWellName, static void calculateValueOptionsForTimeSteps(const QString& wellPathNameOrSimWellName,
const std::vector<RifDataSourceForRftPlt>& selSources, const std::vector<RifDataSourceForRftPlt>& selSources,
const std::set<RifEclipseRftAddress::RftWellLogChannelType> interestingRFTResults, const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults,
QList<caf::PdmOptionItemInfo>& options); QList<caf::PdmOptionItemInfo>& options);
static std::set < RiaRftPltCurveDefinition > curveDefsFromTimesteps(const QString& simWellName,
const std::vector<QDateTime>& selectedTimeStepVector,
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& interestingRFTResults,
const std::vector<RifDataSourceForRftPlt>& selectedSourcesExpanded);
protected: protected:
// Overridden PDM methods // Overridden PDM methods

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

@ -424,6 +424,18 @@ void RimWellRftPlot::syncCurvesFromUiSelection()
updateCurvesInPlot(allCurveDefs, newCurveDefs, curvesToDelete); updateCurvesInPlot(allCurveDefs, newCurveDefs, curvesToDelete);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set < RiaRftPltCurveDefinition > RimWellRftPlot::selectedCurveDefs() const
{
return RimWellPltPlot::curveDefsFromTimesteps(associatedSimWellName(),
m_selectedTimeSteps.v(),
{ RifEclipseRftAddress::PRESSURE },
selectedSourcesExpanded());
}
#if 0
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -476,7 +488,7 @@ std::set < RiaRftPltCurveDefinition> RimWellRftPlot::selectedCurveDefs() const
return curveDefs; return curveDefs;
} }
#endif
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------