#2553 Well CF Visualization: Add findOrCreateSimWellExtractor()

This commit is contained in:
Magne Sjaastad 2018-04-05 13:46:50 +02:00
parent 0512d3fbbc
commit 50212fff0d
2 changed files with 21 additions and 14 deletions

View File

@ -24,6 +24,7 @@
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimWellLogPlotCollection.h" #include "RimWellLogPlotCollection.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -48,22 +49,32 @@ RigGeoMechWellLogExtractor* RiaExtractionTools::wellLogExtractorGeoMechCase(RimW
return wlPlotCollection->findOrCreateExtractor(wellPath, geomCase); return wlPlotCollection->findOrCreateExtractor(wellPath, geomCase);
} }
/*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigEclipseWellLogExtractor* RiaExtractionTools::findOrCreateSimWellExtractor(const QString& simWellName, RigEclipseWellLogExtractor* RiaExtractionTools::findOrCreateSimWellExtractor(const RimSimWellInView* simWell,
const QString& caseUserDescription, const RigWellPath* wellPathGeom)
const RigWellPath* wellPathGeom,
const RimEclipseCase* eclipseCase)
{ {
auto wlPlotCollection = wellLogPlotCollection(); auto wlPlotCollection = wellLogPlotCollection();
if (!wlPlotCollection) return nullptr; if (!wlPlotCollection) return nullptr;
if (!(simWell && wellPathGeom))
{
return nullptr;
}
RimEclipseCase* eclipseCase = nullptr;
simWell->firstAncestorOrThisOfType(eclipseCase);
if (!(eclipseCase && eclipseCase->eclipseCaseData()))
{
return nullptr;
}
QString caseUserDescription = eclipseCase->caseUserDescription();
return wlPlotCollection->findOrCreateSimWellExtractor( return wlPlotCollection->findOrCreateSimWellExtractor(
simWellName, caseUserDescription, wellPathGeom, eclipseCase->eclipseCaseData()); simWell->name, caseUserDescription, wellPathGeom, eclipseCase->eclipseCaseData());
} }
*/
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

View File

@ -20,11 +20,12 @@
class RigEclipseWellLogExtractor; class RigEclipseWellLogExtractor;
class RigGeoMechWellLogExtractor; class RigGeoMechWellLogExtractor;
class RigWellPath;
class RimEclipseCase; class RimEclipseCase;
class RimGeoMechCase; class RimGeoMechCase;
class RimSimWellInView;
class RimWellLogPlotCollection; class RimWellLogPlotCollection;
class RimWellPath; class RimWellPath;
class RigWellPath;
class QString; class QString;
@ -36,12 +37,7 @@ namespace RiaExtractionTools
RigEclipseWellLogExtractor* wellLogExtractorEclipseCase(RimWellPath* wellPath, RimEclipseCase* eclipseCase); RigEclipseWellLogExtractor* wellLogExtractorEclipseCase(RimWellPath* wellPath, RimEclipseCase* eclipseCase);
RigGeoMechWellLogExtractor* wellLogExtractorGeoMechCase(RimWellPath* wellPath, RimGeoMechCase* geomCase); RigGeoMechWellLogExtractor* wellLogExtractorGeoMechCase(RimWellPath* wellPath, RimGeoMechCase* geomCase);
/* RigEclipseWellLogExtractor* findOrCreateSimWellExtractor(const RimSimWellInView* simWell, const RigWellPath* wellPathGeom);
RigEclipseWellLogExtractor* findOrCreateSimWellExtractor(const QString& simWellName,
const QString& caseUserDescription,
const RigWellPath* wellPathGeom,
const RimEclipseCase* eclipseCase);
*/
RimWellLogPlotCollection* wellLogPlotCollection(); RimWellLogPlotCollection* wellLogPlotCollection();