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

RFT Plot: Make extractor on correct path type

Browse Source
This commit is contained in:
Rebecca Cox 2017-11-06 16:08:28 +01:00
parent 726adcacf3
commit 4120aecdc2
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -40,16 +40,12 @@
#include "RimEclipseCase.h"
#include "RimGeoMechCase.h"
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RimWellFlowRateCurve.h"
#include "RimWellLogCurve.h"
#include "RimWellLogPlotCollection.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimWellPltPlot.h"
#include "RimWellRftPlot.h"
#include "RiuMainWindow.h"
#include "RiuPlotAnnotationTool.h"
@ -113,7 +109,6 @@ RimWellLogTrack::RimWellLogTrack()
CAF_PDM_InitFieldNoDefault(&m_formationCase, "FormationCase", "Formation Case", "", "", "");
m_formationCase.uiCapability()->setUiTreeChildrenHidden(true);
m_simulationWellChosen = false;
}
//--------------------------------------------------------------------------------------------------
@ -282,14 +277,6 @@ void RimWellLogTrack::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
{
loadDataAndUpdate();
}
RimWellRftPlot* rftPlot(nullptr);
this->firstAncestorOrThisOfType(rftPlot);
if (rftPlot)
{
rftPlot->updateConnectedEditors();
}
}
//--------------------------------------------------------------------------------------------------
@ -451,11 +438,6 @@ void RimWellLogTrack::loadDataAndUpdate()
curves[cIdx]->loadDataAndUpdate(true);
}
if (m_formationTrajectoryType == RimWellLogTrack::SIMULATION_WELL)
{
m_simulationWellChosen = true;
}
if (m_showFormations)
{
setFormationFieldsUiReadOnly(false);
@ -478,9 +460,13 @@ void RimWellLogTrack::updateFormationNamesData(RimCase* rimCase, TrajectoryType
m_formationWellPath = wellPath;
m_formationSimWellName = simWellName;
m_formationBranchIndex = branchIndex;
updateConnectedEditors();
updateFormationNamesOnPlot();
if (m_showFormations)
{
updateFormationNamesOnPlot();
}
}
//--------------------------------------------------------------------------------------------------
@ -1057,7 +1043,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
RigEclipseWellLogExtractor* eclWellLogExtractor;
RigGeoMechWellLogExtractor* geoMechWellLogExtractor;
if (m_simulationWellChosen)
if (m_formationTrajectoryType == SIMULATION_WELL)
{
eclWellLogExtractor = RimWellLogTrack::createSimWellExtractor(wellLogCollection, m_formationCase, m_formationSimWellName, m_formationBranchIndex);
}

2
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
View File

@ -159,8 +159,6 @@ private:
caf::PdmField<QString> m_formationSimWellName;
caf::PdmField<int> m_formationBranchIndex;
bool m_simulationWellChosen;
cvf::Collection<RigWellPath> m_generatedSimulationWellPathBranches;