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

Renamed to RimWellLogExtractionCurve

Browse Source
This commit is contained in:
Jacob Støren
2015-09-02 12:13:38 +02:00
parent 5a265b66a6
commit 1ba3978a4e
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicNewWellLogPlotCurveFeature.cpp
View File

@@ -47,7 +47,7 @@ void RicNewWellLogPlotCurveFeature::onActionTriggered(bool isChecked)
RimWellLogPlotTrace* wellLogPlotTrace = selectedWellLogPlotTrace();
if (wellLogPlotTrace)
{
RimWellLogPlotCurve* curve = new RimWellLogEclipseCurve();
RimWellLogPlotCurve* curve = new RimWellLogExtractionCurve();
wellLogPlotTrace->addCurve(curve);
curve->setUiName(QString("Curve %1").arg(wellLogPlotTrace->curves.size()));

2
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -129,7 +129,7 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
RimEclipsePropertyFilter* propFilter = dynamic_cast<RimEclipsePropertyFilter*>(this->parentField()->ownerObject());
RimView* view = NULL;
this->firstAnchestorOrThisOfType(view);
RimWellLogEclipseCurve* curve = NULL;
RimWellLogExtractionCurve* curve = NULL;
this->firstAnchestorOrThisOfType(curve);
if (&m_resultVariableUiField == changedField)

2
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@@ -72,7 +72,7 @@ protected:
friend class RimEclipsePropertyFilter;
friend class RimEclipseFaultColors;
friend class RimWellLogEclipseCurve;
friend class RimWellLogExtractionCurve;
// User interface only fields, to support "filtering"-like behaviour etc.
caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultTypeUiField;

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -156,7 +156,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
RimGeoMechPropertyFilter* propFilter = dynamic_cast<RimGeoMechPropertyFilter*>(this->parentField()->ownerObject());
RimView* view = NULL;
this->firstAnchestorOrThisOfType(view);
RimWellLogEclipseCurve* curve = NULL;
RimWellLogExtractionCurve* curve = NULL;
this->firstAnchestorOrThisOfType(curve);

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
View File

@@ -79,7 +79,7 @@ private:
caf::PdmField<QString> m_resultComponentName;
friend class RimGeoMechPropertyFilter; // Property filter needs the ui fields
friend class RimWellLogEclipseCurve; // Curve needs the ui fields
friend class RimWellLogExtractionCurve; // Curve needs the ui fields
caf::PdmField<caf::AppEnum<RigFemResultPosEnum> > m_resultPositionTypeUiField;
caf::PdmField<QString> m_resultVariableUiField;

16
ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp
View File

@@ -180,11 +180,11 @@ bool RimWellLogPlotCurve::depthRange(double* minimumDepth, double* maximumDepth)
///
//==================================================================================================
CAF_PDM_SOURCE_INIT(RimWellLogEclipseCurve, "WellLogEclipseCurve");
CAF_PDM_SOURCE_INIT(RimWellLogExtractionCurve, "WellLogEclipseCurve");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogEclipseCurve::RimWellLogEclipseCurve()
RimWellLogExtractionCurve::RimWellLogExtractionCurve()
{
CAF_PDM_InitObject("Well Log Curve", "", "", "");
@@ -206,7 +206,7 @@ RimWellLogEclipseCurve::RimWellLogEclipseCurve()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogEclipseCurve::~RimWellLogEclipseCurve()
RimWellLogExtractionCurve::~RimWellLogExtractionCurve()
{
}
@@ -214,7 +214,7 @@ RimWellLogEclipseCurve::~RimWellLogEclipseCurve()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogEclipseCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimWellLogPlotCurve::fieldChangedByUi(changedField, oldValue, newValue);
@@ -231,7 +231,7 @@ void RimWellLogEclipseCurve::fieldChangedByUi(const caf::PdmFieldHandle* changed
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogEclipseCurve::updatePlotData()
void RimWellLogExtractionCurve::updatePlotData()
{
bool isNeedingUpdate = false;
std::vector<double> values;
@@ -277,6 +277,8 @@ void RimWellLogEclipseCurve::updatePlotData()
}
m_plot->replot();
m_plot->
}
@@ -285,7 +287,7 @@ void RimWellLogEclipseCurve::updatePlotData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellLogEclipseCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimWellLogExtractionCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> optionList;
@@ -331,7 +333,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogEclipseCurve::calculateValueOptions(cons
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogEclipseCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>(m_case.value());
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_case.value());

6
ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h
View File

@@ -74,12 +74,12 @@ class RimCase;
///
///
//==================================================================================================
class RimWellLogEclipseCurve : public RimWellLogPlotCurve
class RimWellLogExtractionCurve : public RimWellLogPlotCurve
{
CAF_PDM_HEADER_INIT;
public:
RimWellLogEclipseCurve();
virtual ~RimWellLogEclipseCurve();
RimWellLogExtractionCurve();
virtual ~RimWellLogExtractionCurve();
virtual void updatePlotData();
protected: