Release 2023.06

This commit is contained in:
Magne Sjaastad
2023-06-19 13:48:44 +02:00
committed by GitHub
parent a7108f0a09
commit 77bf792b1a
1390 changed files with 66974 additions and 11511 deletions

View File

@@ -62,8 +62,7 @@ void RimWellMeasurementCollection::updateAllCurves()
{
RimMainPlotCollection* plotCollection = RimMainPlotCollection::current();
std::vector<RimWellMeasurementCurve*> measurementCurves;
plotCollection->descendantsIncludingThisOfType( measurementCurves );
std::vector<RimWellMeasurementCurve*> measurementCurves = plotCollection->descendantsIncludingThisOfType<RimWellMeasurementCurve>();
for ( auto curve : measurementCurves )
{
@@ -80,15 +79,13 @@ void RimWellMeasurementCollection::deleteAllEmptyCurves()
{
RimMainPlotCollection* plotCollection = RimMainPlotCollection::current();
std::vector<RimWellMeasurementCurve*> measurementCurves;
plotCollection->descendantsIncludingThisOfType( measurementCurves );
std::vector<RimWellMeasurementCurve*> measurementCurves = plotCollection->descendantsIncludingThisOfType<RimWellMeasurementCurve>();
for ( auto curve : measurementCurves )
{
if ( curve->curveData()->propertyValues().empty() )
{
RimWellLogTrack* track = nullptr;
curve->firstAncestorOrThisOfTypeAsserted( track );
auto track = curve->firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
track->removeCurve( curve );
delete curve;