Propagate existing polygon targets to polygon

ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilterFeature.cpp

@@ -18,6 +18,7 @@
 
 #include "RicNewPolygonFilterFeature.h"
 
+#include "Polygons/RimPolygon.h"
 #include "Polygons/RimPolygonInView.h"
 #include "Polygons/RimPolygonTools.h"
 
@@ -48,6 +49,7 @@ RimPolygonFilter* RicNewPolygonFilterFeature::appendNewPolygonFilter( RimCase* s
     if ( polygonFilter )
     {
         auto polygon = RimPolygonTools::createNewPolygon();
+        polygon->setIsClosed( true );
         polygonFilter->setPolygon( polygon );
 
         RimPolygonTools::selectPolygonInView( polygon, polygonFilter );

ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp

@@ -32,6 +32,7 @@
 
 #include "RimEclipseCase.h"
 #include "RimGeoMechCase.h"
+#include "RimPolylineTarget.h"
 #include "RimTools.h"
 
 #include "Riu3DMainWindowTools.h"
@@ -87,6 +88,16 @@ RimPolygonFilter::RimPolygonFilter()
     m_editPolygonButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
     m_editPolygonButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
 
+    CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" );
+    m_targets.uiCapability()->setUiTreeChildrenHidden( true );
+    m_targets.uiCapability()->setUiTreeHidden( true );
+    m_targets.uiCapability()->setUiHidden( true );
+    m_targets.xmlCapability()->setIOWritable( false );
+
+    CAF_PDM_InitFieldNoDefault( &m_closePolygon, "ClosePolygon", "Closed Polygon" );
+    m_closePolygon.registerGetMethod( this, &RimPolygonFilter::isPolygonClosed );
+    m_closePolygon.registerSetMethod( this, &RimPolygonFilter::setIsPolygonClosed );
+
     m_propagateToSubGrids = false;
 
     updateIconState();
@@ -149,6 +160,29 @@ QString RimPolygonFilter::fullName() const
 void RimPolygonFilter::initAfterRead()
 {
     RimCellFilter::initAfterRead();
+
+    // Move existing polygons to global polygon
+    if ( !m_targets.empty() )
+    {
+        std::vector<cvf::Vec3d> points;
+        for ( const auto& target : m_targets )
+        {
+            points.push_back( target->targetPointXYZ() );
+        }
+
+        auto polygon = RimPolygonTools::createNewPolygon();
+        polygon->setPointsInDomainCoords( points );
+
+        polygon->setIsClosed( true );
+
+        setPolygonAndConnectSignals( polygon );
+
+        auto polygonInView = RimPolygonTools::findPolygonInView( polygon, this );
+        if ( polygonInView )
+        {
+            polygonInView->setPolygon( polygon );
+        }
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -177,6 +211,7 @@ void RimPolygonFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
     group->add( &m_editPolygonButton, { .newRow = false } );
     group->add( &m_filterMode );
     group->add( &m_enableFiltering );
+    group->add( &m_closePolygon );
 
     auto group1 = uiOrdering.addNewGroup( "Polygon Selection" );
     group1->add( &m_polyFilterMode );
@@ -707,6 +742,17 @@ bool RimPolygonFilter::isPolygonClosed() const
     return false;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimPolygonFilter::setIsPolygonClosed( const bool& isClosed )
+{
+    if ( m_cellFilterPolygon() )
+    {
+        m_cellFilterPolygon->setIsClosed( isClosed );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.h

@@ -29,6 +29,7 @@ class RimPolygon;
 class RigGridBase;
 class RigFemPartGrid;
 class RigEclipseCaseData;
+class RimPolylineTarget;
 
 namespace cvf
 {
@@ -101,6 +102,7 @@ class RimPolygonFilter : public RimCellFilter
     void initializeCellList();
 
     bool isPolygonClosed() const;
+    void setIsPolygonClosed( const bool& isClosed );
 
     void setPolygonAndConnectSignals( RimPolygon* polygon );
     void onObjectChanged( const caf::SignalEmitter* emitter );
@@ -118,4 +120,7 @@ class RimPolygonFilter : public RimCellFilter
     std::vector<std::vector<size_t>> m_cells;
 
     RimCellFilterIntervalTool m_intervalTool;
+
+    caf::PdmChildArrayField<RimPolylineTarget*> m_targets;
+    caf::PdmProxyValueField<bool>               m_closePolygon;
 };

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygon.cpp

@@ -71,6 +71,15 @@ std::vector<cvf::Vec3d> RimPolygon::pointsInDomainCoords() const
     return m_pointsInDomainCoords();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimPolygon::setIsClosed( bool isClosed )
+{
+    m_appearance->setIsClosed( isClosed );
+    objectChanged.send();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygon.h

@@ -40,7 +40,9 @@ class RimPolygon : public RimNamedObject, public RimPolylinesDataInterface
 
     void                    setPointsInDomainCoords( const std::vector<cvf::Vec3d>& points );
     std::vector<cvf::Vec3d> pointsInDomainCoords() const;
-    bool                    isClosed() const;
+
+    void setIsClosed( bool isClosed );
+    bool isClosed() const;
 
     cvf::ref<RigPolyLinesData> polyLinesData() const override;
 

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonAppearance.cpp

@@ -106,6 +106,15 @@ void RimPolygonAppearance::applyAppearanceSettings( RigPolyLinesData* polyLinesD
     polyLinesData->setVisibility( m_showLines, m_showSpheres );
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimPolygonAppearance::setIsClosed( bool isClosed )
+{
+    m_isClosed = isClosed;
+    objectChanged.send();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonAppearance.h

@@ -34,6 +34,7 @@ class RimPolygonAppearance : public caf::PdmObject
 
     void applyAppearanceSettings( RigPolyLinesData* polyLinesData );
 
+    void setIsClosed( bool isClosed );
     bool isClosed() const;
 
 public:

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonTools.cpp

@@ -33,20 +33,11 @@
 //--------------------------------------------------------------------------------------------------
 void RimPolygonTools::selectPolygonInView( RimPolygon* polygon, caf::PdmObject* sourceObject )
 {
-    if ( auto gridView = sourceObject->firstAncestorOfType<RimGridView>() )
+    auto polygonInView = findPolygonInView( polygon, sourceObject );
+    if ( polygonInView )
     {
-        auto polyCollection = gridView->polygonInViewCollection();
-
-        for ( auto polygonInView : polyCollection->polygonsInView() )
-        {
-            if ( polygonInView && polygonInView->polygon() == polygon )
-            {
-                polygonInView->enablePicking( true );
-                Riu3DMainWindowTools::selectAsCurrentItem( polygonInView );
-
-                return;
-            }
-        }
+        polygonInView->enablePicking( true );
+        Riu3DMainWindowTools::selectAsCurrentItem( polygonInView );
     }
 }
 
@@ -63,3 +54,24 @@ RimPolygon* RimPolygonTools::createNewPolygon()
 
     return newPolygon;
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimPolygonInView* RimPolygonTools::findPolygonInView( RimPolygon* polygon, caf::PdmObject* sourceObject )
+{
+    if ( auto gridView = sourceObject->firstAncestorOfType<RimGridView>() )
+    {
+        auto polyCollection = gridView->polygonInViewCollection();
+
+        for ( auto polygonInView : polyCollection->polygonsInView() )
+        {
+            if ( polygonInView && polygonInView->polygon() == polygon )
+            {
+                return polygonInView;
+            }
+        }
+    }
+
+    return nullptr;
+}

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonTools.h

@@ -19,6 +19,7 @@
 #pragma once
 
 class RimPolygon;
+class RimPolygonInView;
 
 namespace caf
 {
@@ -28,6 +29,7 @@ class PdmObject;
 class RimPolygonTools
 {
 public:
-    static void        selectPolygonInView( RimPolygon* polygon, caf::PdmObject* sourceObject );
-    static RimPolygon* createNewPolygon();
+    static void              selectPolygonInView( RimPolygon* polygon, caf::PdmObject* sourceObject );
+    static RimPolygon*       createNewPolygon();
+    static RimPolygonInView* findPolygonInView( RimPolygon* polygon, caf::PdmObject* sourceObject );
 };