From 1ba3978a4ee465fa3b96a82ae5bdc03c95cd8909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 2 Sep 2015 12:13:38 +0200 Subject: [PATCH] Renamed to RimWellLogExtractionCurve --- .../Commands/RicNewWellLogPlotCurveFeature.cpp | 2 +- .../RimEclipseResultDefinition.cpp | 2 +- .../RimEclipseResultDefinition.h | 2 +- .../RimGeoMechResultDefinition.cpp | 2 +- .../RimGeoMechResultDefinition.h | 2 +- .../ProjectDataModel/RimWellLogPlotCurve.cpp | 16 +++++++++------- .../ProjectDataModel/RimWellLogPlotCurve.h | 6 +++--- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ApplicationCode/Commands/RicNewWellLogPlotCurveFeature.cpp b/ApplicationCode/Commands/RicNewWellLogPlotCurveFeature.cpp index ee2de88622..beaa04e3b5 100644 --- a/ApplicationCode/Commands/RicNewWellLogPlotCurveFeature.cpp +++ b/ApplicationCode/Commands/RicNewWellLogPlotCurveFeature.cpp @@ -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())); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 83924f2700..c0d09a8cf0 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -129,7 +129,7 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha RimEclipsePropertyFilter* propFilter = dynamic_cast(this->parentField()->ownerObject()); RimView* view = NULL; this->firstAnchestorOrThisOfType(view); - RimWellLogEclipseCurve* curve = NULL; + RimWellLogExtractionCurve* curve = NULL; this->firstAnchestorOrThisOfType(curve); if (&m_resultVariableUiField == changedField) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index 9e2f5b7c62..f1f7d95254 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -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; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp index 3d02f6319e..8b1328b27f 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp @@ -156,7 +156,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha RimGeoMechPropertyFilter* propFilter = dynamic_cast(this->parentField()->ownerObject()); RimView* view = NULL; this->firstAnchestorOrThisOfType(view); - RimWellLogEclipseCurve* curve = NULL; + RimWellLogExtractionCurve* curve = NULL; this->firstAnchestorOrThisOfType(curve); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h index 22d8c8232e..205d947e5b 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h @@ -79,7 +79,7 @@ private: caf::PdmField 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 > m_resultPositionTypeUiField; caf::PdmField m_resultVariableUiField; diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp index 0013eaadaf..5cb21e82de 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp @@ -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 values; @@ -277,6 +277,8 @@ void RimWellLogEclipseCurve::updatePlotData() } m_plot->replot(); + m_plot-> + } @@ -285,7 +287,7 @@ void RimWellLogEclipseCurve::updatePlotData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QList RimWellLogEclipseCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) +QList RimWellLogExtractionCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { QList optionList; @@ -331,7 +333,7 @@ QList RimWellLogEclipseCurve::calculateValueOptions(cons //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogEclipseCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { RimGeoMechCase* geomCase = dynamic_cast(m_case.value()); RimEclipseCase* eclipseCase = dynamic_cast(m_case.value()); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h b/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h index 7fa02e3bf8..b5f359c26d 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h @@ -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: