diff --git a/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp index b8986dd7c8..10e598d309 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp @@ -99,6 +99,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked) curve->setWellPath(wellPath); curve->setWellLogChannelName(wellLog->name()); + curve->setWellLogFile(wellLogFile); curve->loadDataAndUpdate(true); } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index 7e41974825..05921198b4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -236,8 +236,8 @@ void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup("Curve Data"); curveDataGroup->add(&m_wellPath); - curveDataGroup->add(&m_wellLogChannnelName); curveDataGroup->add(&m_wellLogFile); + curveDataGroup->add(&m_wellLogChannnelName); caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance"); RimPlotCurve::appearanceUiOrdering(*appearanceGroup); @@ -313,11 +313,14 @@ QList RimWellLogFileCurve::calculateValueOptions(const c if (fieldNeedingOptions == &m_wellLogFile) { + if (m_wellPath() && m_wellPath->wellLogFiles().size() > 0) { + bool isRft = isInRftPlot(); + for (RimWellLogFile* const wellLogFile : m_wellPath->wellLogFiles()) { - if (RimWellRftPlot::hasPressureData(wellLogFile)) + if (!isRft || RimWellRftPlot::hasPressureData(wellLogFile)) { QFileInfo fileInfo(wellLogFile->fileName()); options.push_back(caf::PdmOptionItemInfo(fileInfo.baseName(), wellLogFile)); @@ -340,6 +343,16 @@ void RimWellLogFileCurve::initAfterRead() } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RimWellLogFileCurve::isInRftPlot() const +{ + RimWellRftPlot* rftPlot; + firstAncestorOrThisOfType(rftPlot); + return rftPlot != nullptr; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.h b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.h index d582904178..ae5da19711 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.h @@ -64,6 +64,8 @@ protected: virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly); virtual void initAfterRead() override; + bool isInRftPlot() const; + protected: caf::PdmPtrField m_wellPath; caf::PdmPtrField m_wellLogFile;