diff --git a/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp b/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp index fca0f83a40..47e6246cca 100644 --- a/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp +++ b/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp @@ -55,6 +55,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked) { RimFractureDefinition* fractureDef = new RimFractureDefinition(); fracDefColl->fractureDefinitions.push_back(fractureDef); + fractureDef->name = "Fracture Template"; fracDefColl->updateConnectedEditors(); RiuMainWindow::instance()->selectAsCurrentItem(fractureDef); diff --git a/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp b/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp index 9332717202..0fdad1955d 100644 --- a/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp +++ b/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp @@ -70,7 +70,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked) RimSimWellFracture* fracture = new RimSimWellFracture(); fractureCollection->simwellFractures.push_back(fracture); - fracture->name = "New SimWell Fracture"; + fracture->name = "Simulation Well Fracture"; fracture->setijk(simWellItem->i, simWellItem->j, simWellItem->k); fractureCollection->updateConnectedEditors(); diff --git a/ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp b/ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp index 562e2a79ca..b8506aaee0 100644 --- a/ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp +++ b/ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp @@ -57,7 +57,7 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked) RimSimWellFracture* fracture = new RimSimWellFracture(); fractureCollection->simwellFractures.push_back(fracture); - fracture->name = "New Simulation Well Fracture"; + fracture->name = "Simulation Well Fracture"; fractureCollection->updateConnectedEditors(); RiuMainWindow::instance()->selectAsCurrentItem(fracture); diff --git a/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp index c627af4361..8273a23847 100644 --- a/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp +++ b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp @@ -77,7 +77,7 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked) RimWellPathFracture* fracture = new RimWellPathFracture(); fractureCollection->fractures.push_back(fracture); - fracture->name = "New Well Path Fracture"; + fracture->name = "Well Path Fracture"; fracture->positionAtWellpath = wellPathItem->m_pipeCenterlineIntersectionInDomainCoords; fracture->measuredDepth = wellPathItem->m_measuredDepth; diff --git a/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp b/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp index 18ed9fa8f0..60a171673a 100644 --- a/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp +++ b/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp @@ -58,7 +58,7 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked) RimWellPathFracture* fracture = new RimWellPathFracture(); fractureCollection->fractures.push_back(fracture); - fracture->name = "New Well Path Fracture"; + fracture->name = "Well Path Fracture"; fractureCollection->updateConnectedEditors(); RiuMainWindow::instance()->selectAsCurrentItem(fracture); diff --git a/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp b/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp index ff50f563f5..cc42d87a85 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp @@ -65,6 +65,14 @@ RimFractureDefinition::~RimFractureDefinition() } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::PdmFieldHandle* RimFractureDefinition::userDescriptionField() +{ + return &name; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimFractureDefinition.h b/ApplicationCode/ProjectDataModel/RimFractureDefinition.h index c8d6054438..22e28faa35 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimFractureDefinition.h @@ -41,6 +41,9 @@ public: caf::PdmField height; caf::PdmField width; + caf::PdmField skinFactor; + caf::PdmField permeability; + enum FracOrientationEnum { AZIMUTH, @@ -48,13 +51,9 @@ public: TRANSVERSE_WELL_PATH }; caf::PdmField< caf::AppEnum< FracOrientationEnum > > orientation; - - - caf::PdmField skinFactor; - caf::PdmField permeability; + + virtual caf::PdmFieldHandle* userDescriptionField() override; protected: - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); - }; diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp index de0e466c32..6cde390b54 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp @@ -111,6 +111,14 @@ RimFractureDefinition* RimSimWellFracture::attachedFractureDefinition() return fractureDefinition(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::PdmFieldHandle* RimSimWellFracture::userDescriptionField() +{ + return &name; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.h b/ApplicationCode/ProjectDataModel/RimSimWellFracture.h index d48051e3ae..a056ee5a17 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.h +++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.h @@ -41,26 +41,23 @@ public: RimSimWellFracture(void); virtual ~RimSimWellFracture(void); - caf::PdmField name; - caf::PdmPtrField fractureDefinition; - - size_t gridindex; - virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; - void setijk(size_t i, size_t j, size_t k); + caf::PdmField name; + caf::PdmPtrField fractureDefinition; + size_t gridindex; + 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); // Overrides from RimFracture - virtual cvf::Vec3d centerPointForFracture() override; - virtual RimFractureDefinition* attachedFractureDefinition() override; + virtual cvf::Vec3d centerPointForFracture() override; + virtual RimFractureDefinition* attachedFractureDefinition() override; protected: - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); private: - caf::PdmField m_i; //Eclipse indexing, lowest value is 1 - caf::PdmField m_j; - caf::PdmField m_k; - - - + caf::PdmField m_i; //Eclipse indexing, lowest value is 1 + caf::PdmField m_j; + caf::PdmField m_k; }; diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp b/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp index 5e9ddf05e7..6067cabb84 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp @@ -120,6 +120,14 @@ RimFractureDefinition* RimWellPathFracture::attachedFractureDefinition() return fractureDefinition(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::PdmFieldHandle* RimWellPathFracture::userDescriptionField() +{ + return &name; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFracture.h b/ApplicationCode/ProjectDataModel/RimWellPathFracture.h index 5fb5cb110e..bf53b686ff 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathFracture.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathFracture.h @@ -46,33 +46,28 @@ public: RimWellPathFracture(void); virtual ~RimWellPathFracture(void); - caf::PdmField name; - caf::PdmPtrField fractureDefinition; + caf::PdmField name; + caf::PdmPtrField fractureDefinition; - caf::PdmField measuredDepth; - caf::PdmField positionAtWellpath; + caf::PdmField measuredDepth; + caf::PdmField positionAtWellpath; + caf::PdmProxyValueField ui_positionAtWellpath; - caf::PdmProxyValueField ui_positionAtWellpath; + caf::PdmField i; + caf::PdmField j; + caf::PdmField k; - - caf::PdmField i; - caf::PdmField j; - caf::PdmField k; - - - - virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; + virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; + virtual caf::PdmFieldHandle* userDescriptionField() override; // Overrides from RimFracture - virtual cvf::Vec3d centerPointForFracture() override; - virtual RimFractureDefinition* attachedFractureDefinition() override; + virtual cvf::Vec3d centerPointForFracture() override; + virtual RimFractureDefinition* attachedFractureDefinition() override; protected: - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); - + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); private: - cvf::Vec3d wellPositionForUi() const; - void setWellPositionFromUi(const cvf::Vec3d& vec); - + cvf::Vec3d wellPositionForUi() const; + void setWellPositionFromUi(const cvf::Vec3d& vec); };