diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h index 2aa0cc7c01..2fbc469d12 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h @@ -45,53 +45,51 @@ public: enum TrajectoryType { WELL_PATH, SIMULATION_WELL}; - void setWellPath(RimWellPath* wellPath); - RimWellPath* wellPath() const; + void setWellPath(RimWellPath* wellPath); + RimWellPath* wellPath() const; - void setFromSimulationWellName(const QString& simWellName, int branchIndex); + void setFromSimulationWellName(const QString& simWellName, int branchIndex); - void setCase(RimCase* rimCase); - RimCase* rimCase() const; + void setCase(RimCase* rimCase); + RimCase* rimCase() const; - void setPropertiesFromView(RimView* view); + void setPropertiesFromView(RimView* view); virtual QString wellName() const; virtual QString wellLogChannelName() const; virtual QString wellDate() const; - bool isEclipseCurve() const; - QString caseName() const; - double rkbDiff() const; + bool isEclipseCurve() const; + QString caseName() const; + double rkbDiff() const; - int currentTimeStep() const; + int currentTimeStep() const; protected: - virtual QString createCurveAutoName(); - virtual void onLoadDataAndUpdate(bool updateParentPlot); + virtual QString createCurveAutoName(); + virtual void onLoadDataAndUpdate(bool updateParentPlot); - virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); - - virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly); - - virtual void initAfterRead(); - - virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = ""); + virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); + virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = ""); + virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly); + virtual void initAfterRead(); private: - void setLogScaleFromSelectedResult(); - void clampTimestep(); - void clampBranchIndex(); - std::set findSortedWellNames(); - void updateGeneratedSimulationWellpath(); - void clearGeneratedSimWellPaths(); + void setLogScaleFromSelectedResult(); + void clampTimestep(); + void clampBranchIndex(); + std::set findSortedWellNames(); + void updateGeneratedSimulationWellpath(); + void clearGeneratedSimWellPaths(); private: - caf::PdmPtrField m_wellPath; + caf::PdmPtrField m_case; caf::PdmField > m_trajectoryType; + caf::PdmPtrField m_wellPath; caf::PdmField m_simWellName; caf::PdmField m_branchIndex; - caf::PdmPtrField m_case; + caf::PdmChildField m_eclipseResultDefinition; caf::PdmChildField m_geomResultDefinition; caf::PdmField m_timeStep;