diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp index 368bc8473a..f6bf2de5af 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp @@ -53,7 +53,7 @@ CAF_CMD_SOURCE_INIT( RicNewSummaryEnsembleCurveSetFeature, "RicNewSummaryEnsembl std::vector RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( RimSummaryPlot* plot, RimSummaryCaseCollection* ensemble ) { - CVF_ASSERT( plot && ensemble ); + CVF_ASSERT( plot && ensemble ); RimProject* project = RimProject::current(); CVF_ASSERT( project ); diff --git a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp index cc0c258174..466c9fb247 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp @@ -349,14 +349,13 @@ void RimWellPathGeometryDef::defineUiOrdering( QString uiConfigName, caf::PdmUiO { uiOrdering.add( &m_referencePointUtmXyd ); uiOrdering.add( &m_airGap ); - if ( !m_useAutoGeneratedTargetAtSeaLevel() ) - { - uiOrdering.add( &m_mdAtFirstTarget ); - } - + uiOrdering.add( &m_mdAtFirstTarget ); uiOrdering.add( &m_useAutoGeneratedTargetAtSeaLevel ); uiOrdering.add( &m_wellTargets ); uiOrdering.add( &m_pickPointsEnabled ); + + m_mdAtFirstTarget.uiCapability()->setUiReadOnly( m_useAutoGeneratedTargetAtSeaLevel() ); + uiOrdering.skipRemainingFields( true ); } diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp b/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp index 824d7823e9..f11f3174ff 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp @@ -168,6 +168,7 @@ std::vector RigWellLogCurveData::depths( RiaDefines::DepthTypeEnum depth } return tvds; } + return std::vector(); }