Make draw plane selection for curves be unrelated to 3d Track (somewhat related to #2825).

* Makes more sense user wise and makes for better code. * Helps refactor code to relate grids to curves so the curves can have access to the grid it is being drawn on. * This will help fix #2825 by being able to project curve points onto the exact triangle geometry.
2025-02-25 18:55:39 -06:00 · 2018-04-30 09:22:59 +02:00
parent 7307b97466
commit 1f44ea1ea3
14 changed files with 153 additions and 216 deletions
--- a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
@@ -28,17 +28,6 @@

 CAF_PDM_SOURCE_INIT(Rim3dWellLogCurveCollection, "Rim3dWellLogCurveCollection");

-namespace caf
-{
-    template<>
-    void AppEnum< Rim3dWellLogCurveCollection::PlanePosition >::setUp()
-    {
-        addItem(Rim3dWellLogCurveCollection::ALONG_WELLPATH, "ALONG_WELLPATH", "Beside Well Path");
-        addItem(Rim3dWellLogCurveCollection::ON_WELLPATH, "ON_WELLPATH", "Centered On Well Path");
-        setDefault(Rim3dWellLogCurveCollection::ALONG_WELLPATH);
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -49,8 +38,6 @@ Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection()
    CAF_PDM_InitField(&m_showPlot, "Show3dWellLogCurves", true, "Show 3d Well Log Curves", "", "", "");
    m_showPlot.uiCapability()->setUiHidden(true);

-    CAF_PDM_InitFieldNoDefault(&m_planePositionVertical, "PlanePositionVertical", "Vertical Position", "", "", "");
-    CAF_PDM_InitFieldNoDefault(&m_planePositionHorizontal, "PlanePositionHorizontal", "Horizontal Position", "", "", "");
    CAF_PDM_InitField(&m_planeWidthScaling, "PlaneWidthScaling", 1.0f, "Width Scaling", "", "", "");    
    m_planeWidthScaling.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
    CAF_PDM_InitField(&m_showGrid, "Show3dWellLogGrid", true, "Show Grid", "", "", "");
@@ -121,22 +108,6 @@ bool Rim3dWellLogCurveCollection::isShowingBackground() const
    return m_showBackground;
 }

-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-Rim3dWellLogCurveCollection::PlanePosition Rim3dWellLogCurveCollection::planePositionVertical() const
-{
-    return m_planePositionVertical();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-Rim3dWellLogCurveCollection::PlanePosition Rim3dWellLogCurveCollection::planePositionHorizontal() const
-{
-    return m_planePositionHorizontal();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -232,8 +203,6 @@ caf::PdmFieldHandle* Rim3dWellLogCurveCollection::objectToggleField()
 void Rim3dWellLogCurveCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
    caf::PdmUiGroup* settingsGroup = uiOrdering.addNewGroup("Draw Plane Configuration");
-    settingsGroup->add(&m_planePositionVertical);
-    settingsGroup->add(&m_planePositionHorizontal);
    settingsGroup->add(&m_planeWidthScaling);

    caf::PdmUiGroup* appearanceSettingsGroup = uiOrdering.addNewGroup("Draw Plane Appearance");
--- a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h
+++ b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h
@@ -36,13 +36,6 @@ class Rim3dWellLogCurveCollection : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;

-public:
-    enum PlanePosition
-    {
-        ALONG_WELLPATH,
-        ON_WELLPATH
-    };
-
 public:
    Rim3dWellLogCurveCollection();
    virtual ~Rim3dWellLogCurveCollection();
@@ -55,8 +48,6 @@ public:
    bool isShowingGrid() const;
    bool isShowingBackground() const;

-    PlanePosition planePositionVertical() const;
-    PlanePosition planePositionHorizontal() const;
    float         planeWidthScaling() const;

    std::vector<Rim3dWellLogCurve*> vectorOf3dWellLogCurves() const;
@@ -73,8 +64,6 @@ private:
    virtual void                 defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
 private:
    caf::PdmField<bool>                         m_showPlot;
-    caf::PdmField<caf::AppEnum<PlanePosition>>  m_planePositionVertical;
-    caf::PdmField<caf::AppEnum<PlanePosition>>  m_planePositionHorizontal;
    caf::PdmField<float>                        m_planeWidthScaling;

    caf::PdmField<bool>                         m_showGrid;
--- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
@@ -44,8 +44,10 @@ namespace caf
    void AppEnum< Rim3dWellLogCurve::DrawPlane >::setUp()
    {
        addItem(Rim3dWellLogCurve::VERTICAL_ABOVE, "VERTICAL_ABOVE", "Above");
+        addItem(Rim3dWellLogCurve::VERTICAL_CENTER, "VERTICAL_CENTER", "Centered - Vertical");
        addItem(Rim3dWellLogCurve::VERTICAL_BELOW, "VERTICAL_BELOW", "Below");
        addItem(Rim3dWellLogCurve::HORIZONTAL_LEFT, "HORIZONTAL_LEFT", "Left");
+        addItem(Rim3dWellLogCurve::HORIZONTAL_CENTER, "HORIZONTAL_CENTER", "Centered - Horizontal");
        addItem(Rim3dWellLogCurve::HORIZONTAL_RIGHT, "HORIZONTAL_RIGHT", "Right");
        setDefault(Rim3dWellLogCurve::VERTICAL_ABOVE);
    } 
@@ -96,6 +98,28 @@ Rim3dWellLogCurve::DrawPlane Rim3dWellLogCurve::drawPlane() const
    return m_drawPlane();
 }

+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+double Rim3dWellLogCurve::drawPlaneAngle() const
+{
+    switch (drawPlane())
+    {
+        case HORIZONTAL_LEFT:
+        case HORIZONTAL_CENTER:
+            return cvf::PI_D / 2.0;
+        case HORIZONTAL_RIGHT:
+            return -cvf::PI_D / 2.0;
+        case VERTICAL_ABOVE:
+        case VERTICAL_CENTER:
+            return 0.0;
+        case VERTICAL_BELOW:
+            return cvf::PI_D;
+        default:
+            return 0;
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -173,35 +197,6 @@ void Rim3dWellLogCurve::configurationUiOrdering(caf::PdmUiOrdering& uiOrdering)
    configurationGroup->add(&m_maxCurveValue);
 }

-QList<caf::PdmOptionItemInfo> Rim3dWellLogCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
-{
-    QList<caf::PdmOptionItemInfo> options;
-    if (fieldNeedingOptions == &m_drawPlane)
-    {
-        Rim3dWellLogCurveCollection* collection;
-        this->firstAncestorOrThisOfTypeAsserted(collection);
-        if (collection->planePositionVertical() == Rim3dWellLogCurveCollection::ALONG_WELLPATH)
-        {
-            options.push_back(caf::PdmOptionItemInfo(DrawPlaneEnum::uiText(Rim3dWellLogCurve::VERTICAL_ABOVE), Rim3dWellLogCurve::VERTICAL_ABOVE));
-            options.push_back(caf::PdmOptionItemInfo(DrawPlaneEnum::uiText(Rim3dWellLogCurve::VERTICAL_BELOW), Rim3dWellLogCurve::VERTICAL_BELOW));
-        }
-        else
-        {
-            options.push_back(caf::PdmOptionItemInfo(QString("Vertical"), Rim3dWellLogCurve::VERTICAL_ABOVE));
-        }
-        if (collection->planePositionHorizontal() == Rim3dWellLogCurveCollection::ALONG_WELLPATH)
-        {
-            options.push_back(caf::PdmOptionItemInfo(DrawPlaneEnum::uiText(Rim3dWellLogCurve::HORIZONTAL_LEFT), Rim3dWellLogCurve::HORIZONTAL_LEFT));
-            options.push_back(caf::PdmOptionItemInfo(DrawPlaneEnum::uiText(Rim3dWellLogCurve::HORIZONTAL_RIGHT), Rim3dWellLogCurve::HORIZONTAL_RIGHT));
-        }
-        else
-        {
-            options.push_back(caf::PdmOptionItemInfo(QString("Horizontal"), Rim3dWellLogCurve::HORIZONTAL_LEFT));
-        }
-    }
-    return options;
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h
+++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h
@@ -43,9 +43,11 @@ public:
    enum DrawPlane
    {
        VERTICAL_ABOVE,
-        VERTICAL_BELOW,
+        VERTICAL_CENTER,
+        VERTICAL_BELOW,        
        HORIZONTAL_LEFT,
-        HORIZONTAL_RIGHT
+        HORIZONTAL_CENTER,
+        HORIZONTAL_RIGHT        
    };
    typedef caf::AppEnum<DrawPlane> DrawPlaneEnum;
 public:
@@ -56,7 +58,10 @@ public:

    virtual QString name() const = 0;
    virtual QString resultPropertyString() const = 0;
+    
    DrawPlane       drawPlane() const;
+    double          drawPlaneAngle() const;
+
    cvf::Color3f    color() const;
    bool            isShowingCurve() const;

@@ -79,7 +84,6 @@ protected:
    virtual caf::PdmFieldHandle*            objectToggleField() override;
    virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
    void                                    configurationUiOrdering(caf::PdmUiOrdering& uiOrdering);
-    virtual QList<caf::PdmOptionItemInfo>   calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
    virtual void                            defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);    
    virtual void                            initAfterRead();
 private:
--- a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp
@@ -78,7 +78,7 @@ Rim3dWellLogExtractionCurve::Rim3dWellLogExtractionCurve()
    m_geomResultDefinition.uiCapability()->setUiTreeChildrenHidden(true);
    m_geomResultDefinition = new RimGeoMechResultDefinition;

-    CAF_PDM_InitFieldNoDefault(&m_nameConfig, "NameGenerator", "", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_nameConfig, "NameConfig", "", "", "", "");
    m_nameConfig = new RimWellLogExtractionCurveNameConfig(this);    
 }

@@ -328,7 +328,7 @@ void Rim3dWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::Pd

    Rim3dWellLogCurve::configurationUiOrdering(uiOrdering);

-    caf::PdmUiGroup* nameGroup = m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
+    m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);

    uiOrdering.skipRemainingFields(true);
 }
--- a/ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp
@@ -252,7 +252,7 @@ void Rim3dWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd

    Rim3dWellLogCurve::configurationUiOrdering(uiOrdering);

-    caf::PdmUiGroup* nameGroup = m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
+    m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);

    uiOrdering.skipRemainingFields(true);
 }
--- a/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp
@@ -213,6 +213,8 @@ void Rim3dWellLogRftCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrde

    Rim3dWellLogCurve::configurationUiOrdering(uiOrdering);

+    m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
+
    uiOrdering.skipRemainingFields(true);
 }

--- a/ApplicationCode/ProjectDataModel/RimWellLogCurveNameConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogCurveNameConfig.cpp
@@ -26,7 +26,7 @@
 ///  
 //==================================================================================================

-CAF_PDM_SOURCE_INIT(RimCurveNameConfig, "RimCurveNameGenerator");
+CAF_PDM_SOURCE_INIT(RimCurveNameConfig, "RimCurveNameConfig");

 //--------------------------------------------------------------------------------------------------
 /// 
@@ -108,7 +108,6 @@ void RimCurveNameConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
    if (changedField == &m_isUsingAutoName && !isUsingAutoName())
    {
        m_customName = m_configHolder->createCurveAutoName();
-        m_customName.uiCapability()->updateConnectedEditors();
    }

    updateAllSettings();
@@ -152,7 +151,7 @@ void RimCurveNameConfig::updateAllSettings()
 ///  
 //==================================================================================================

-CAF_PDM_SOURCE_INIT(RimWellLogExtractionCurveNameConfig, "RimWellLogExtractionCurveNameGenerator");
+CAF_PDM_SOURCE_INIT(RimWellLogExtractionCurveNameConfig, "RimWellLogExtractionCurveNameConfig");

 //--------------------------------------------------------------------------------------------------
 /// 
@@ -244,7 +243,7 @@ void RimWellLogExtractionCurveNameConfig::updateAllSettings()
 ///  
 //==================================================================================================

-CAF_PDM_SOURCE_INIT(RimWellLogFileCurveNameConfig, "RimWellLogFileCurveNameGenerator");
+CAF_PDM_SOURCE_INIT(RimWellLogFileCurveNameConfig, "RimWellLogFileCurveNameConfig");

 //--------------------------------------------------------------------------------------------------
 /// 
@@ -261,7 +260,7 @@ RimWellLogFileCurveNameConfig::RimWellLogFileCurveNameConfig(const RimCurveNameC
 ///  
 //==================================================================================================

-CAF_PDM_SOURCE_INIT(RimWellLogRftCurveNameConfig, "RimWellLogRftCurveNameGenerator");
+CAF_PDM_SOURCE_INIT(RimWellLogRftCurveNameConfig, "RimWellLogRftCurveNameConfig");

 //--------------------------------------------------------------------------------------------------
 ///