#2326 Well allocation plot: Remove formation options regarding well path

This commit is contained in:
Rebecca Cox
2018-01-26 10:28:24 +01:00
parent 78068e547d
commit 007602dbf9
3 changed files with 33 additions and 6 deletions

View File

@@ -253,6 +253,7 @@ void RimWellAllocationPlot::updateFromWell()
RimWellLogTrack* plotTrack = new RimWellLogTrack(); RimWellLogTrack* plotTrack = new RimWellLogTrack();
plotTrack->setDescription(QString("Branch %1").arg(brIdx + 1)); plotTrack->setDescription(QString("Branch %1").arg(brIdx + 1));
plotTrack->setFormationsForCaseWithSimWellOnly(true);
plotTrack->setFormationBranchIndex((int)brIdx); plotTrack->setFormationBranchIndex((int)brIdx);
accumulatedWellFlowPlot()->addTrack(plotTrack); accumulatedWellFlowPlot()->addTrack(plotTrack);

View File

@@ -152,6 +152,8 @@ RimWellLogTrack::RimWellLogTrack()
CAF_PDM_InitFieldNoDefault(&m_formationLevel, "FormationLevel", "Well Pick Filter", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_formationLevel, "FormationLevel", "Well Pick Filter", "", "", "");
CAF_PDM_InitField(&m_showformationFluids, "ShowFormationFluids", false, "Show Fluids", "", "", ""); CAF_PDM_InitField(&m_showformationFluids, "ShowFormationFluids", false, "Show Fluids", "", "", "");
m_formationsForCaseWithSimWellOnly = false;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -807,21 +809,33 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
formationGroup->add(&m_showFormations); formationGroup->add(&m_showFormations);
formationGroup->add(&m_formationSource); if (!m_formationsForCaseWithSimWellOnly)
{
formationGroup->add(&m_formationSource);
}
else
{
m_formationSource = CASE;
}
if (m_formationSource() == CASE) if (m_formationSource() == CASE)
{ {
formationGroup->add(&m_formationCase); formationGroup->add(&m_formationCase);
formationGroup->add(&m_formationTrajectoryType); if (!m_formationsForCaseWithSimWellOnly)
if (m_formationTrajectoryType() == WELL_PATH)
{ {
formationGroup->add(&m_formationWellPathForSourceCase); formationGroup->add(&m_formationTrajectoryType);
if (m_formationTrajectoryType() == WELL_PATH)
{
formationGroup->add(&m_formationWellPathForSourceCase);
}
} }
else
if (m_formationsForCaseWithSimWellOnly || m_formationTrajectoryType() == SIMULATION_WELL)
{ {
formationGroup->add(&m_formationSimWellName); formationGroup->add(&m_formationSimWellName);
RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromSimWellName(formationGroup, RiaSimWellBranchTools::appendSimWellBranchFieldsIfRequiredFromSimWellName(formationGroup,
m_formationSimWellName, m_formationSimWellName,
m_formationBranchDetection, m_formationBranchDetection,
@@ -996,6 +1010,14 @@ void RimWellLogTrack::uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering)
gridGroup->add(&m_visibleXRangeMax); gridGroup->add(&m_visibleXRangeMax);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::setFormationsForCaseWithSimWellOnly(bool caseWithSimWellOnly)
{
m_formationsForCaseWithSimWellOnly = caseWithSimWellOnly;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@@ -119,6 +119,8 @@ public:
void uiOrderingForRftPltFormations(caf::PdmUiOrdering& uiOrdering); void uiOrderingForRftPltFormations(caf::PdmUiOrdering& uiOrdering);
void uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering); void uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering);
void setFormationsForCaseWithSimWellOnly(bool caseWithSimWellOnly);
private: private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
@@ -178,6 +180,8 @@ private:
caf::PdmField<bool> m_formationBranchDetection; caf::PdmField<bool> m_formationBranchDetection;
bool m_formationsForCaseWithSimWellOnly;
QPointer<RiuWellLogTrack> m_wellLogTrackPlotWidget; QPointer<RiuWellLogTrack> m_wellLogTrackPlotWidget;
std::unique_ptr<RiuPlotAnnotationTool> m_annotationTool; std::unique_ptr<RiuPlotAnnotationTool> m_annotationTool;