pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition

2025-02-25 18:55:39 -06:00 · 2017-01-12 10:33:33 +01:00
parent 63e975f6ff
commit 44aefe6ed7
20 changed files with 54 additions and 54 deletions
--- a/ApplicationCode/Commands/RicDeleteItemFeature.cpp
+++ b/ApplicationCode/Commands/RicDeleteItemFeature.cpp
@@ -27,7 +27,7 @@
 #include "RimEclipseView.h"
 #include "RimFormationNames.h"
 #include "RimFormationNamesCollection.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechView.h"
 #include "RimIdenticalGridCaseGroup.h"
@@ -79,7 +79,7 @@ bool isDeletable(PdmUiItem * uiItem)
    if (dynamic_cast<RimFormationNamesCollection*>(uiItem))  return true;
    if (dynamic_cast<RimWellPathFractureCollection*>(uiItem))        return true;
    if (dynamic_cast<RimWellPathFracture*>(uiItem))                  return true;
-    if (dynamic_cast<RimFractureDefinition*>(uiItem))        return true;
+    if (dynamic_cast<RimFractureEllipseDefinition*>(uiItem))        return true;
    if (dynamic_cast<RimSimWellFractureCollection*>(uiItem))        return true;
    if (dynamic_cast<RimSimWellFracture*>(uiItem))                  return true;

--- a/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp
+++ b/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp
@@ -21,7 +21,7 @@
 #include "RiaApplication.h"

 #include "RimOilField.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimProject.h"

@@ -51,7 +51,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)

    if (fracDefColl)
    {
-        RimFractureDefinition* fractureDef = new RimFractureDefinition();
+        RimFractureEllipseDefinition* fractureDef = new RimFractureEllipseDefinition();
        fracDefColl->fractureDefinitions.push_back(fractureDef);
        fractureDef->name = "Fracture Template";
        
--- a/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
+++ b/ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
@@ -22,7 +22,7 @@

 #include "RimCase.h"
 #include "RimEclipseWell.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -84,7 +84,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)

    if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
    {
-        RimFractureDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
+        RimFractureEllipseDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
        fracture->fractureDefinition = fracDef;
    }

--- a/ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp
+++ b/ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp
@@ -22,7 +22,7 @@

 #include "RimCase.h"
 #include "RimEclipseWell.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -68,7 +68,7 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked)

    if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
    {
-        RimFractureDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
+        RimFractureEllipseDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
        fracture->fractureDefinition = fracDef;
    }

--- a/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp
+++ b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp
@@ -21,7 +21,7 @@
 #include "RiaApplication.h"

 #include "RimCase.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -90,7 +90,7 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)

    if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
    {
-        RimFractureDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
+        RimFractureEllipseDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
        fracture->fractureDefinition = fracDef;
    }

--- a/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp
+++ b/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp
@@ -21,7 +21,7 @@
 #include "RiaApplication.h"

 #include "RimCase.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -81,7 +81,7 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked)

    if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
    {
-        RimFractureDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
+        RimFractureEllipseDefinition* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
        fracture->fractureDefinition = fracDef;
    }

--- a/ApplicationCode/FileInterface/RifEclipseExportTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseExportTools.cpp
@@ -27,7 +27,7 @@
 #include "RimEclipseView.h"
 #include "RimEclipseWell.h"
 #include "RimFracture.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimWellPath.h"

 #include "cafProgressInfo.h"
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -84,7 +84,7 @@ ${CEE_CURRENT_LIST_DIR}RimPlotCurve.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseInputCaseOpm.h
 ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.h
 ${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.h
-${CEE_CURRENT_LIST_DIR}RimFractureDefinition.h
+${CEE_CURRENT_LIST_DIR}RimFractureEllipseDefinition.h
 ${CEE_CURRENT_LIST_DIR}RimFractureDefinitionCollection.h
 ${CEE_CURRENT_LIST_DIR}RimFracture.h
 ${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h
@@ -175,7 +175,7 @@ ${CEE_CURRENT_LIST_DIR}RimPlotCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseInputCaseOpm.cpp
 ${CEE_CURRENT_LIST_DIR}RimIntersectionBox.cpp
 ${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.cpp
-${CEE_CURRENT_LIST_DIR}RimFractureDefinition.cpp
+${CEE_CURRENT_LIST_DIR}RimFractureEllipseDefinition.cpp
 ${CEE_CURRENT_LIST_DIR}RimFractureDefinitionCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimFracture.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp
--- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
+++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
@@ -37,7 +37,7 @@
 #include "RimFault.h"
 #include "RimFormationNames.h"
 #include "RimFormationNamesCollection.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechPropertyFilter.h"
@@ -376,7 +376,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
            commandIds << "RicSimWellFracturesDeleteAllFeature";
        }
        else if (dynamic_cast<RimFractureDefinitionCollection*>(uiItem) ||
-                 dynamic_cast<RimFractureDefinition*>(uiItem))
+                 dynamic_cast<RimFractureEllipseDefinition*>(uiItem))
        {
            commandIds << "RicNewFractureDefinitionFeature";
            commandIds << "RicFractureDefinitionsDeleteAllFeature";
--- a/ApplicationCode/ProjectDataModel/RimFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFracture.cpp
@@ -21,7 +21,7 @@
 #include "RigFracture.h"
 #include "RigTesselatorTools.h"

-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimView.h"

 #include "cafPdmUiDoubleSliderEditor.h"
@@ -96,7 +96,7 @@ void RimFracture::computeGeometry()
    std::vector<cvf::uint>  polygonIndices;

    cvf::Vec3d center = centerPointForFracture();
-    RimFractureDefinition* fractureDef = attachedFractureDefinition();
+    RimFractureEllipseDefinition* fractureDef = attachedFractureDefinition();
    if (fractureDef && !center.isUndefined())
    {
        RigEllipsisTesselator tesselator(20);
--- a/ApplicationCode/ProjectDataModel/RimFracture.h
+++ b/ApplicationCode/ProjectDataModel/RimFracture.h
@@ -27,7 +27,7 @@
 #include "cvfVector3.h"


-class RimFractureDefinition;
+class RimFractureEllipseDefinition;
 class RigFracture;

 //==================================================================================================
@@ -45,8 +45,8 @@ public:
    caf::PdmField<double>           azimuth;

    virtual cvf::Vec3d              centerPointForFracture() = 0;
-    virtual cvf::Mat4d              transformMatrix() = 0;
-    virtual RimFractureDefinition*  attachedFractureDefinition() = 0;
+//    virtual cvf::Mat4d              transformMatrix() = 0; TODO: add such method
+    virtual RimFractureEllipseDefinition*  attachedFractureDefinition() = 0;
    cvf::ref<RigFracture>           attachedRigFracture();

    bool                            hasValidGeometry() const;
--- a/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp
@@ -18,7 +18,7 @@

 #include "RimFractureDefinitionCollection.h"

-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "cafPdmObject.h"


--- a/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.h
@@ -22,7 +22,7 @@
 #include "cafPdmObject.h"
 #include "cafPdmChildArrayField.h"

-class RimFractureDefinition;
+class RimFractureEllipseDefinition;

 //==================================================================================================
 ///  
@@ -36,7 +36,7 @@ public:
    RimFractureDefinitionCollection(void);
    virtual ~RimFractureDefinitionCollection(void);
    
-    caf::PdmChildArrayField<RimFractureDefinition*> fractureDefinitions;
+    caf::PdmChildArrayField<RimFractureEllipseDefinition*> fractureDefinitions;

    caf::PdmField<bool>                             isActive;

--- a/ApplicationCode/ProjectDataModel/RimFractureEllipseDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFractureEllipseDefinition.cpp
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"

 #include "cafPdmObject.h"
 #include "RimProject.h"
@@ -28,23 +28,23 @@ namespace caf
 {
    template<>
   
-    void caf::AppEnum< RimFractureDefinition::FracOrientationEnum>::setUp()
+    void caf::AppEnum< RimFractureEllipseDefinition::FracOrientationEnum>::setUp()
    {
-        addItem(RimFractureDefinition::AZIMUTH, "Az", "Azimuth");
-        addItem(RimFractureDefinition::ALONG_WELL_PATH, "AlongWellPath", "Along Well Path");
-        addItem(RimFractureDefinition::TRANSVERSE_WELL_PATH, "TransverseWellPath", "Transverse (normal) to Well Path");
+        addItem(RimFractureEllipseDefinition::AZIMUTH, "Az", "Azimuth");
+        addItem(RimFractureEllipseDefinition::ALONG_WELL_PATH, "AlongWellPath", "Along Well Path");
+        addItem(RimFractureEllipseDefinition::TRANSVERSE_WELL_PATH, "TransverseWellPath", "Transverse (normal) to Well Path");

-        setDefault(RimFractureDefinition::TRANSVERSE_WELL_PATH);
+        setDefault(RimFractureEllipseDefinition::TRANSVERSE_WELL_PATH);
    }
 }


-CAF_PDM_SOURCE_INIT(RimFractureDefinition, "FractureDefinition");
+CAF_PDM_SOURCE_INIT(RimFractureEllipseDefinition, "FractureDefinition");

 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFractureDefinition::RimFractureDefinition(void)
+RimFractureEllipseDefinition::RimFractureEllipseDefinition(void)
 {
    CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");

@@ -62,7 +62,7 @@ RimFractureDefinition::RimFractureDefinition(void)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFractureDefinition::~RimFractureDefinition()
+RimFractureEllipseDefinition::~RimFractureEllipseDefinition()
 {
 }

@@ -70,7 +70,7 @@ RimFractureDefinition::~RimFractureDefinition()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimFractureDefinition::userDescriptionField()
+caf::PdmFieldHandle* RimFractureEllipseDefinition::userDescriptionField()
 {
    return &name;
 }
@@ -78,7 +78,7 @@ caf::PdmFieldHandle* RimFractureDefinition::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFractureDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimFractureEllipseDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
    if (changedField == &halfLength || changedField == &height)
    {
@@ -107,7 +107,7 @@ void RimFractureDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedF
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-double RimFractureDefinition::effectiveKh()
+double RimFractureEllipseDefinition::effectiveKh()
 {
    //TODO: Handle different units!
    return width * permeability;
@@ -117,7 +117,7 @@ double RimFractureDefinition::effectiveKh()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFractureDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimFractureEllipseDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
    uiOrdering.add(&name);

--- a/ApplicationCode/ProjectDataModel/RimFractureEllipseDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimFractureEllipseDefinition.h
@@ -28,13 +28,13 @@
 ///  
 ///  
 //==================================================================================================
-class RimFractureDefinition : public caf::PdmObject //TODO: Rename to RimFractureEllipseDefinition
+class RimFractureEllipseDefinition : public caf::PdmObject //TODO: Rename to RimFractureEllipseDefinition
 {
     CAF_PDM_HEADER_INIT;

 public:
-    RimFractureDefinition(void);
-    virtual ~RimFractureDefinition(void);
+    RimFractureEllipseDefinition(void);
+    virtual ~RimFractureEllipseDefinition(void);
    
    caf::PdmField<QString>   name;

--- a/ApplicationCode/ProjectDataModel/RimProject.h
+++ b/ApplicationCode/ProjectDataModel/RimProject.h
@@ -33,7 +33,7 @@ class RigMainGrid;
 class RimCase;
 class RimCommandObject;
 class RimEclipseCase;
-class RimFractureDefinition;
+class RimFractureEllipseDefinition;
 class RimWellPathFractureCollection;
 class RimIdenticalGridCaseGroup;
 class RimMainPlotCollection;
--- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
@@ -26,7 +26,7 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseView.h"
-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -99,7 +99,7 @@ QList<caf::PdmOptionItemInfo> RimSimWellFracture::calculateValueOptions(const ca
        RimFractureDefinitionCollection* fracDefColl = oilField->fractureDefinitionCollection();
        if (fracDefColl == nullptr) return options;

-        for (RimFractureDefinition* fracDef : fracDefColl->fractureDefinitions())
+        for (RimFractureEllipseDefinition* fracDef : fracDefColl->fractureDefinitions())
        {
            options.push_back(caf::PdmOptionItemInfo(fracDef->name(), fracDef));
        }
@@ -137,7 +137,7 @@ cvf::Vec3d RimSimWellFracture::centerPointForFracture()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFractureDefinition* RimSimWellFracture::attachedFractureDefinition()
+RimFractureEllipseDefinition* RimSimWellFracture::attachedFractureDefinition()
 {
    return fractureDefinition();
 }
--- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.h
+++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.h
@@ -31,7 +31,7 @@
 #include "cvfVector3.h"


-class RimFractureDefinition;
+class RimFractureEllipseDefinition;

 //==================================================================================================
 ///  
@@ -46,7 +46,7 @@ public:
    virtual ~RimSimWellFracture(void);

    caf::PdmField<QString>                          name;
-    caf::PdmPtrField<RimFractureDefinition*>        fractureDefinition;
+    caf::PdmPtrField<RimFractureEllipseDefinition*>        fractureDefinition;
    size_t                                          gridindex;

    virtual QList<caf::PdmOptionItemInfo>           calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
@@ -55,7 +55,7 @@ public:
    void                                            setCellCenterPosition();
    // Overrides from RimFracture
    virtual cvf::Vec3d                              centerPointForFracture() override;
-    virtual RimFractureDefinition*                  attachedFractureDefinition() override;
+    virtual RimFractureEllipseDefinition*                  attachedFractureDefinition() override;
    virtual std::vector<std::pair<size_t, size_t>>  getFracturedCells() override;

    virtual void                                    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
--- a/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
@@ -22,7 +22,7 @@

 #include "RigTesselatorTools.h"

-#include "RimFractureDefinition.h"
+#include "RimFractureEllipseDefinition.h"
 #include "RimFractureDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -94,7 +94,7 @@ QList<caf::PdmOptionItemInfo> RimWellPathFracture::calculateValueOptions(const c
        RimFractureDefinitionCollection* fracDefColl = oilField->fractureDefinitionCollection();
        if (fracDefColl == nullptr) return options;

-        for (RimFractureDefinition* fracDef : fracDefColl->fractureDefinitions())
+        for (RimFractureEllipseDefinition* fracDef : fracDefColl->fractureDefinitions())
        {
            options.push_back(caf::PdmOptionItemInfo(fracDef->name(), fracDef));
        }
@@ -118,7 +118,7 @@ cvf::Vec3d RimWellPathFracture::centerPointForFracture()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFractureDefinition* RimWellPathFracture::attachedFractureDefinition()
+RimFractureEllipseDefinition* RimWellPathFracture::attachedFractureDefinition()
 {
    return fractureDefinition();
 }
--- a/ApplicationCode/ProjectDataModel/RimWellPathFracture.h
+++ b/ApplicationCode/ProjectDataModel/RimWellPathFracture.h
@@ -31,7 +31,7 @@

 #include "cafPdmProxyValueField.h"

-class RimFractureDefinition;
+class RimFractureEllipseDefinition;
 class RimWellPath;

 //==================================================================================================
@@ -47,7 +47,7 @@ public:
    virtual ~RimWellPathFracture(void);

    caf::PdmField<QString>                          name;
-    caf::PdmPtrField<RimFractureDefinition* >       fractureDefinition;
+    caf::PdmPtrField<RimFractureEllipseDefinition* >       fractureDefinition;

    caf::PdmField<float>                            measuredDepth;
    caf::PdmField<cvf::Vec3d>                       positionAtWellpath;
@@ -63,7 +63,7 @@ public:

    // Overrides from RimFracture
    virtual cvf::Vec3d                              centerPointForFracture() override;
-    virtual RimFractureDefinition*                  attachedFractureDefinition() override;
+    virtual RimFractureEllipseDefinition*                  attachedFractureDefinition() override;


    virtual std::vector<std::pair<size_t, size_t>>  getFracturedCells() override;