Use polygon as data source for intersection

- Use polygon as data source for intersection
- Add padlock icon
- Show padlock icon on read only polygons
- Add Fwk function appendMenuItems() to make it possible to define context menu content in a PdmObject
- Context menu "Create Polygon Intersection"
- Updates to make visualization consistent with object and object collection enabled state

ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp

@@ -21,23 +21,20 @@
 
 #include "RiaVec3Tools.h"
 
-#include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
+#include "RigPolyLinesData.h"
 #include "RigSimulationWellCenterLineCalculator.h"
 #include "RigWellPath.h"
 
+#include "Polygons/RimPolygon.h"
+#include "Polygons/RimPolygonCollection.h"
+#include "Polygons/RimPolygonTools.h"
+
 #include "Rim2dIntersectionView.h"
 #include "Rim3dView.h"
 #include "RimCase.h"
-#include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEnsembleSurface.h"
 #include "RimGeoMechView.h"
-#include "RimGridView.h"
-#include "RimIntersectionResultDefinition.h"
-#include "RimIntersectionResultsDefinitionCollection.h"
-#include "RimOilField.h"
-#include "RimProject.h"
 #include "RimSimWellInView.h"
 #include "RimSimWellInViewCollection.h"
 #include "RimSurface.h"
@@ -48,12 +45,8 @@
 #include "RimTools.h"
 #include "RimWellPath.h"
 
-#include "RiuViewer.h"
-
 #include "RivExtrudedCurveIntersectionPartMgr.h"
 
-#include "cafCmdFeature.h"
-#include "cafCmdFeatureManager.h"
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmFieldScriptingCapabilityCvfVec3d.h"
 #include "cafPdmObjectScriptingCapability.h"
@@ -61,12 +54,9 @@
 #include "cafPdmUiDoubleSliderEditor.h"
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiPushButtonEditor.h"
-#include "cafPdmUiSliderEditor.h"
 #include "cafPdmUiTreeOrdering.h"
-#include "cafPdmUiTreeSelectionEditor.h"
 #include "cvfBoundingBox.h"
 #include "cvfGeometryTools.h"
-#include "cvfPlane.h"
 
 namespace caf
 {
@@ -77,6 +67,7 @@ void caf::AppEnum<RimExtrudedCurveIntersection::CrossSectionEnum>::setUp()
     addItem( RimExtrudedCurveIntersection::CrossSectionEnum::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well" );
     addItem( RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYLINE, "CS_POLYLINE", "Polyline" );
     addItem( RimExtrudedCurveIntersection::CrossSectionEnum::CS_AZIMUTHLINE, "CS_AZIMUTHLINE", "Azimuth and Dip" );
+    addItem( RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYGON, "CS_POLYGON", "Project Polygon" );
     setDefault( RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYLINE );
 }
 
@@ -186,6 +177,17 @@ void RimExtrudedCurveIntersection::configureForPolyLine()
     m_inputPolylineFromViewerEnabled = true;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimExtrudedCurveIntersection::configureForProjectPolyLine( RimPolygon* polygon )
+{
+    m_type           = CrossSectionEnum::CS_POLYGON;
+    m_projectPolygon = polygon;
+
+    updateName();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -207,6 +209,11 @@ RimExtrudedCurveIntersection::RimExtrudedCurveIntersection()
     CAF_PDM_InitFieldNoDefault( &m_direction, "Direction", "Direction" );
     CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "Well Path        " );
     CAF_PDM_InitScriptableFieldNoDefault( &m_simulationWell, "SimulationWell", "Simulation Well" );
+
+    CAF_PDM_InitFieldNoDefault( &m_projectPolygon, "ProjectPolygon", "Project Polygon" );
+    CAF_PDM_InitField( &m_editPolygonButton, "EditPolygonButton", false, "Edit" );
+    caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_editPolygonButton );
+
     CAF_PDM_InitScriptableFieldNoDefault( &m_userPolylineXyz, "Points", "Points", "", "Use Ctrl-C for copy and Ctrl-V for paste", "" );
 
     CAF_PDM_InitFieldNoDefault( &m_userPolylineXydForUi, "PointsUi", "Points", "", "Use Ctrl-C for copy and Ctrl-V for paste", "" );
@@ -439,11 +446,11 @@ void RimExtrudedCurveIntersection::setKFilterOverride( bool collectionOverride,
 void RimExtrudedCurveIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
 {
     if ( changedField == &m_isActive || changedField == &m_type || changedField == &m_direction || changedField == &m_wellPath ||
-         changedField == &m_simulationWell || changedField == &m_branchIndex || changedField == &m_extentLength ||
-         changedField == &m_lengthUp || changedField == &m_lengthDown || changedField == &m_showInactiveCells ||
-         changedField == &m_useSeparateDataSource || changedField == &m_separateDataSource || changedField == &m_depthUpperThreshold ||
-         changedField == &m_depthLowerThreshold || changedField == &m_depthThresholdOverridden || changedField == &m_depthFilterType ||
-         changedField == &m_enableKFilter || changedField == &m_kFilterText || changedField == &m_kFilterCollectionOverride )
+         changedField == &m_simulationWell || changedField == &m_branchIndex || changedField == &m_extentLength || changedField == &m_lengthUp ||
+         changedField == &m_lengthDown || changedField == &m_showInactiveCells || changedField == &m_useSeparateDataSource ||
+         changedField == &m_separateDataSource || changedField == &m_depthUpperThreshold || changedField == &m_depthLowerThreshold ||
+         changedField == &m_depthThresholdOverridden || changedField == &m_depthFilterType || changedField == &m_enableKFilter ||
+         changedField == &m_kFilterText || changedField == &m_kFilterCollectionOverride || changedField == &m_projectPolygon )
     {
         rebuildGeometryAndScheduleCreateDisplayModel();
     }
@@ -453,7 +460,8 @@ void RimExtrudedCurveIntersection::fieldChangedByUi( const caf::PdmFieldHandle*
         recomputeSimulationWellBranchData();
     }
 
-    if ( changedField == &m_simulationWell || changedField == &m_wellPath || changedField == &m_branchIndex )
+    if ( changedField == &m_simulationWell || changedField == &m_wellPath || changedField == &m_branchIndex ||
+         changedField == &m_projectPolygon || changedField == &m_type )
     {
         updateName();
     }
@@ -511,6 +519,15 @@ void RimExtrudedCurveIntersection::fieldChangedByUi( const caf::PdmFieldHandle*
     {
         rebuildGeometryAndScheduleCreateDisplayModel();
     }
+
+    if ( changedField == &m_editPolygonButton )
+    {
+        RimPolygonTools::selectAndActivatePolygonInView( m_projectPolygon(), this );
+
+        m_editPolygonButton = false;
+
+        return;
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -540,6 +557,11 @@ void RimExtrudedCurveIntersection::defineUiOrdering( QString uiConfigName, caf::
         geometryGroup->add( &m_userPolylineXydForUi );
         geometryGroup->add( &m_inputPolylineFromViewerEnabled );
     }
+    else if ( type() == CrossSectionEnum::CS_POLYGON )
+    {
+        geometryGroup->add( &m_projectPolygon );
+        geometryGroup->add( &m_editPolygonButton, { .newRow = false } );
+    }
     else if ( type() == CrossSectionEnum::CS_AZIMUTHLINE )
     {
         geometryGroup->add( &m_twoAzimuthPoints );
@@ -668,6 +690,19 @@ QList<caf::PdmOptionItemInfo> RimExtrudedCurveIntersection::calculateValueOption
             options.push_front( caf::PdmOptionItemInfo( "None", nullptr ) );
         }
     }
+    else if ( fieldNeedingOptions == &m_projectPolygon )
+    {
+        options.push_back( caf::PdmOptionItemInfo( "None", nullptr ) );
+
+        RimTools::polygonOptionItems( &options );
+
+        if ( m_projectPolygon() == nullptr )
+        {
+            auto polygonCollection = RimTools::polygonCollection();
+            auto polygons          = polygonCollection->allPolygons();
+            if ( !polygons.empty() ) m_projectPolygon = polygons.front();
+        }
+    }
     else if ( fieldNeedingOptions == &m_branchIndex )
     {
         updateSimulationWellCenterline();
@@ -775,8 +810,6 @@ std::vector<std::vector<cvf::Vec3d>> RimExtrudedCurveIntersection::polyLines( cv
     {
         if ( m_simulationWell() )
         {
-            updateSimulationWellCenterline();
-
             int branchIndexToUse = branchIndex();
 
             if ( 0 <= branchIndexToUse && branchIndexToUse < static_cast<int>( m_simulationWellBranchCenterlines.size() ) )
@@ -794,6 +827,13 @@ std::vector<std::vector<cvf::Vec3d>> RimExtrudedCurveIntersection::polyLines( cv
     {
         lines.push_back( m_userPolylineXyz );
     }
+    else if ( type() == CrossSectionEnum::CS_POLYGON )
+    {
+        if ( m_projectPolygon )
+        {
+            lines = m_projectPolygon->polyLinesData()->completePolyLines();
+        }
+    }
     else if ( type() == CrossSectionEnum::CS_AZIMUTHLINE )
     {
         lines.push_back( m_twoAzimuthPoints );
@@ -863,7 +903,7 @@ std::vector<cvf::Vec3d> RimExtrudedCurveIntersection::polyLinesForExtrusionDirec
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimExtrudedCurveIntersection::updateSimulationWellCenterline() const
+void RimExtrudedCurveIntersection::updateSimulationWellCenterline()
 {
     if ( m_isActive() && type() == CrossSectionEnum::CS_SIMULATION_WELL && m_simulationWell() )
     {
@@ -954,6 +994,10 @@ void RimExtrudedCurveIntersection::updateName()
     {
         m_name = m_wellPath()->name();
     }
+    else if ( m_type() == CrossSectionEnum::CS_POLYGON && m_projectPolygon() )
+    {
+        m_name = m_projectPolygon->name();
+    }
 
     Rim2dIntersectionView* iView = correspondingIntersectionView();
     if ( iView )
@@ -1081,6 +1125,14 @@ void RimExtrudedCurveIntersection::defineEditorAttribute( const caf::PdmFieldHan
     {
         setBaseColor( m_inputExtrusionPointsFromViewerEnabled, dynamic_cast<caf::PdmUiListEditorAttribute*>( attribute ) );
     }
+
+    if ( field == &m_editPolygonButton )
+    {
+        if ( auto attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )
+        {
+            attrib->m_buttonText = "Edit";
+        }
+    }
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h

@@ -24,9 +24,10 @@
 #include "RimIntersectionEnums.h"
 
 #include "cafPdmChildField.h"
+#include "cafPdmFieldCvfVec3d.h"
 #include "cafPdmProxyValueField.h"
 
-#include <QString>
+#include "cvfVector3.h"
 
 class RimWellPath;
 class RivExtrudedCurveIntersectionPartMgr;
@@ -40,6 +41,7 @@ class RimSurfaceCollection;
 class RimSurfaceIntersectionCollection;
 class RimSurfaceIntersectionCurve;
 class RimSurfaceIntersectionBand;
+class RimPolygon;
 
 namespace caf
 {
@@ -62,7 +64,8 @@ public:
         CS_WELL_PATH,
         CS_SIMULATION_WELL,
         CS_POLYLINE,
-        CS_AZIMUTHLINE
+        CS_AZIMUTHLINE,
+        CS_POLYGON,
     };
 
     enum class CrossSectionDirEnum
@@ -102,6 +105,7 @@ public:
     void configureForSimulationWell( RimSimWellInView* simWell );
     void configureForWellPath( RimWellPath* wellPath );
     void configureForPolyLine();
+    void configureForProjectPolyLine( RimPolygon* polygon );
     void configureForAzimuthLine();
 
     std::vector<std::vector<cvf::Vec3d>> polyLines( cvf::Vec3d* flattenedPolylineStartPoint = nullptr ) const;
@@ -134,7 +138,7 @@ public:
     int  branchIndex() const;
     void rebuildGeometryAndScheduleCreateDisplayModel();
 
-protected:
+private:
     caf::PdmFieldHandle* userDescriptionField() final;
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
@@ -143,13 +147,12 @@ protected:
 
     void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
 
-private:
     static void setPushButtonText( bool buttonEnable, caf::PdmUiPushButtonEditorAttribute* attribute );
     static void setBaseColor( bool enable, caf::PdmUiListEditorAttribute* attribute );
 
     RimSimWellInViewCollection* simulationWellCollection() const;
     void                        updateAzimuthLine();
-    void                        updateSimulationWellCenterline() const;
+    void                        updateSimulationWellCenterline();
     void                        addExtents( std::vector<cvf::Vec3d>& polyLine ) const;
     void                        updateName();
     static double               azimuthInRadians( cvf::Vec3d vec );
@@ -181,6 +184,9 @@ private:
     caf::PdmPtrField<RimWellPath*>      m_wellPath;
     caf::PdmPtrField<RimSimWellInView*> m_simulationWell;
 
+    caf::PdmPtrField<RimPolygon*> m_projectPolygon;
+    caf::PdmField<bool>           m_editPolygonButton;
+
     caf::PdmField<bool> m_inputPolylineFromViewerEnabled;
     caf::PdmField<bool> m_inputExtrusionPointsFromViewerEnabled;
     caf::PdmField<bool> m_inputTwoAzimuthPointsFromViewerEnabled;
@@ -202,11 +208,11 @@ private:
 
     cvf::ref<RivExtrudedCurveIntersectionPartMgr> m_crossSectionPartMgr;
 
-    mutable std::vector<std::vector<cvf::Vec3d>> m_simulationWellBranchCenterlines;
+    std::vector<std::vector<cvf::Vec3d>> m_simulationWellBranchCenterlines;
 
     caf::PdmField<bool>    m_enableKFilter;
     caf::PdmField<QString> m_kFilterText;
 
     caf::PdmField<bool>    m_kFilterCollectionOverride;
     caf::PdmField<QString> m_kFilterCollectionText;
-};
+};

ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp

@@ -19,7 +19,6 @@
 #include "RimIntersection.h"
 
 #include "RigEclipseCaseData.h"
-#include "RigFemPartCollection.h"
 #include "RigGeoMechCaseData.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseResultDefinition.h"

ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include "cafPdmField.h"
-#include "cafPdmFieldCvfVec3d.h"
 #include "cafPdmObject.h"
 #include "cafPdmPtrField.h"