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

Use RiaRftPltCurveDefinition in Plt Plot

Browse Source
This commit is contained in:
Jacob Støren 2017-11-15 17:08:09 +01:00
parent 7ff93e9154
commit 0007682f03
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,9 +261,9 @@ void RimWellPltPlot::updateWidgetTitleWindowTitle()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::set < std::pair<RifDataSourceForRftPlt, QDateTime>> RimWellPltPlot::selectedCurveDefs() const std::set < RiaRftPltCurveDefinition > RimWellPltPlot::selectedCurveDefs() const
{ {
std::set<std::pair<RifDataSourceForRftPlt, QDateTime>> curveDefs; std::set<RiaRftPltCurveDefinition> curveDefs;
const QString simWellName = RimWellPlotTools::simWellName(m_wellPathName); const QString simWellName = RimWellPlotTools::simWellName(m_wellPathName);
std::set<QDateTime> selectedTimeSteps(m_selectedTimeSteps.v().begin(), m_selectedTimeSteps.v().end()); std::set<QDateTime> selectedTimeSteps(m_selectedTimeSteps.v().begin(), m_selectedTimeSteps.v().end());
@ -279,7 +279,7 @@ std::set < std::pair<RifDataSourceForRftPlt, QDateTime>> RimWellPltPlot::selecte
{ {
if ( selectedTimeSteps.count(time) ) if ( selectedTimeSteps.count(time) )
{ {
curveDefs.insert(std::make_pair(addr, time)); curveDefs.insert(RiaRftPltCurveDefinition(addr, time));
} }
} }
} }
@ -291,7 +291,7 @@ std::set < std::pair<RifDataSourceForRftPlt, QDateTime>> RimWellPltPlot::selecte
{ {
if ( selectedTimeSteps.count(time) ) if ( selectedTimeSteps.count(time) )
{ {
curveDefs.insert(std::make_pair(addr, time)); curveDefs.insert(RiaRftPltCurveDefinition(addr, time));
} }
} }
} }
@ -301,7 +301,7 @@ std::set < std::pair<RifDataSourceForRftPlt, QDateTime>> RimWellPltPlot::selecte
{ {
if ( selectedTimeSteps.count(addr.wellLogFile()->date()) ) if ( selectedTimeSteps.count(addr.wellLogFile()->date()) )
{ {
curveDefs.insert(std::make_pair(addr, addr.wellLogFile()->date())); curveDefs.insert(RiaRftPltCurveDefinition(addr, addr.wellLogFile()->date()));
} }
} }
} }
@ -518,7 +518,7 @@ public:
void RimWellPltPlot::syncCurvesFromUiSelection() void RimWellPltPlot::syncCurvesFromUiSelection()
{ {
RimWellLogTrack* plotTrack = m_wellLogPlot->trackByIndex(0); RimWellLogTrack* plotTrack = m_wellLogPlot->trackByIndex(0);
const std::set<std::pair<RifDataSourceForRftPlt, QDateTime>>& curveDefs = selectedCurveDefs(); const std::set<RiaRftPltCurveDefinition>& curveDefs = selectedCurveDefs();
setPlotXAxisTitles(plotTrack); setPlotXAxisTitles(plotTrack);
@ -532,14 +532,14 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
RimWellPath* wellPath = RimWellPlotTools::wellPathByWellPathNameOrSimWellName(m_wellPathName); RimWellPath* wellPath = RimWellPlotTools::wellPathByWellPathNameOrSimWellName(m_wellPathName);
// Add curves // Add curves
for (const std::pair<RifDataSourceForRftPlt, QDateTime>& curveDefToAdd : curveDefs) for (const RiaRftPltCurveDefinition& curveDefToAdd : curveDefs)
{ {
std::set<FlowPhase> selectedPhases = m_phaseSelectionMode == FLOW_TYPE_PHASE_SPLIT ? std::set<FlowPhase> selectedPhases = m_phaseSelectionMode == FLOW_TYPE_PHASE_SPLIT ?
std::set<FlowPhase>(m_phases().begin(), m_phases().end()) : std::set<FlowPhase>(m_phases().begin(), m_phases().end()) :
std::set<FlowPhase>({ FLOW_PHASE_TOTAL }); std::set<FlowPhase>({ FLOW_PHASE_TOTAL });
RifDataSourceForRftPlt sourceDef = curveDefToAdd.first; RifDataSourceForRftPlt sourceDef = curveDefToAdd.address();
QDateTime timeStep = curveDefToAdd.second; QDateTime timeStep = curveDefToAdd.timeStep();
std::unique_ptr<RigResultPointCalculator> resultPointCalc; std::unique_ptr<RigResultPointCalculator> resultPointCalc;

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

@ -107,7 +107,7 @@ private:
void syncSourcesIoFieldFromGuiField(); void syncSourcesIoFieldFromGuiField();
void syncCurvesFromUiSelection(); void syncCurvesFromUiSelection();
std::set<std::pair<RifDataSourceForRftPlt, QDateTime>> selectedCurveDefs() const; std::set<RiaRftPltCurveDefinition> selectedCurveDefs() const;
void addStackedCurve(const QString& tracerName, void addStackedCurve(const QString& tracerName,
const std::vector<double>& depthValues, const std::vector<double>& depthValues,
const std::vector<double>& accFlow, const std::vector<double>& accFlow,