diff --git a/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp b/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp index 0fdad1955d..e74bc96c85 100644 --- a/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp +++ b/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp @@ -71,7 +71,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked) fractureCollection->simwellFractures.push_back(fracture); fracture->name = "Simulation Well Fracture"; - fracture->setijk(simWellItem->i, simWellItem->j, simWellItem->k); + fracture->setIJK(simWellItem->i, simWellItem->j, simWellItem->k); fractureCollection->updateConnectedEditors(); RiuMainWindow::instance()->selectAsCurrentItem(fracture); diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp index 6cde390b54..add7d69a0d 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp @@ -122,7 +122,7 @@ caf::PdmFieldHandle* RimSimWellFracture::userDescriptionField() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSimWellFracture::setijk(size_t i, size_t j, size_t k) +void RimSimWellFracture::setIJK(size_t i, size_t j, size_t k) { m_i = static_cast(i + 1); m_j = static_cast(j + 1); diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.h b/ApplicationCode/ProjectDataModel/RimSimWellFracture.h index a056ee5a17..4c259d2e8f 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.h +++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.h @@ -18,14 +18,17 @@ #pragma once +#include "RimFracture.h" +#include "RimView.h" + #include "cafAppEnum.h" #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmPtrField.h" -#include "RimView.h" + +#include "cvfBase.h" #include "cvfVector3.h" -#include "RimFracture.h" class RimFractureDefinition; @@ -47,7 +50,7 @@ public: virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; virtual caf::PdmFieldHandle* userDescriptionField() override; - void setijk(size_t i, size_t j, size_t k); + void setIJK(size_t i, size_t j, size_t k); // Overrides from RimFracture virtual cvf::Vec3d centerPointForFracture() override; diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp b/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp index 6067cabb84..ca4bcbc301 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp @@ -61,7 +61,7 @@ RimWellPathFracture::RimWellPathFracture(void) CAF_PDM_InitField(&j, "J", 1, "Fracture location cell J", "", "", ""); CAF_PDM_InitField(&k, "K", 1, "Fracture location cell K", "", "", ""); - CAF_PDM_InitFieldNoDefault(&fractureDefinition, "FractureDef", "FractureDef", "", "", ""); + CAF_PDM_InitFieldNoDefault(&fractureDefinition, "FractureDef", "Fracture Template", "", "", ""); } diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h b/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h index 752f4d39d1..28b87ac297 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h @@ -37,8 +37,7 @@ public: virtual ~RimWellPathFractureCollection(void); caf::PdmChildArrayField fractures; - caf::PdmField isActive; - - void deleteFractures(); + caf::PdmField isActive; + void deleteFractures(); };