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

Make sure relevant changes in patch branch are merged to dev

Browse Source
This commit is contained in:
Magne Sjaastad 2020-05-27 09:10:34 +02:00
parent b8d9dedad2
commit bb4bdc048d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@ -53,7 +53,7 @@ CAF_CMD_SOURCE_INIT( RicNewSummaryEnsembleCurveSetFeature, "RicNewSummaryEnsembl
std::vector<RimEnsembleCurveSet*>
RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( RimSummaryPlot* plot, RimSummaryCaseCollection* ensemble )
{
CVF_ASSERT( plot && ensemble );
CVF_ASSERT( plot && ensemble );
RimProject* project = RimProject::current();
CVF_ASSERT( project );

9
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp
View File

@ -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 );
}

1
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp
View File

@ -168,6 +168,7 @@ std::vector<double> RigWellLogCurveData::depths( RiaDefines::DepthTypeEnum depth
}
return tvds;
}
return std::vector<double>();
}