Add support for using project polygons as basis for cell filtering

- use local polygon and polygon editor - allow selection of project polygons
OPM · Feb 9, 2024 · 533e2ec · 533e2ec
1 parent ca415fd
commit 533e2ec
Show file tree

Hide file tree

Showing 14 changed files with 204 additions and 498 deletions.
diff --git a/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp b/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp
@@ -18,6 +18,8 @@
 
 #include "RicNewPolygonFilter3dviewFeature.h"
 
+#include "Polygons/RimPolygonInView.h"
+
 #include "RiaApplication.h"
 #include "RimCase.h"
 #include "RimCellFilterCollection.h"
@@ -49,7 +51,7 @@ void RicNewPolygonFilter3dviewFeature::onActionTriggered( bool isChecked )
     RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
     if ( lastCreatedOrUpdated )
     {
-        Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
+        Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated->polygonEditor() );
     }
 }
 

diff --git a/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilterFeature.cpp b/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilterFeature.cpp
@@ -18,9 +18,12 @@
 
 #include "RicNewPolygonFilterFeature.h"
 
+#include "Polygons/RimPolygonInView.h"
+
 #include "RimCase.h"
 #include "RimCellFilterCollection.h"
 #include "RimPolygonFilter.h"
+
 #include "Riu3DMainWindowTools.h"
 
 #include "cafSelectionManagerTools.h"
@@ -46,7 +49,7 @@ void RicNewPolygonFilterFeature::onActionTriggered( bool isChecked )
     RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
     if ( lastCreatedOrUpdated )
     {
-        Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
+        Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated->polygonEditor() );
     }
 }
 

diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2022     Equinor ASA
+//  Copyright (C) 2024     Equinor ASA
 //
 //  ResInsight is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.h b/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2022     Equinor ASA
+//  Copyright (C) 2024     Equinor ASA
 //
 //  ResInsight is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2022     Equinor ASA
+//  Copyright (C) 2024     Equinor ASA
 //
 //  ResInsight is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.h b/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2022     Equinor ASA
+//  Copyright (C) 2024     Equinor ASA
 //
 //  ResInsight is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

diff --git a/ApplicationLibCode/Commands/WellPathCommands/CMakeLists_files.cmake b/ApplicationLibCode/Commands/WellPathCommands/CMakeLists_files.cmake
@@ -30,7 +30,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPointTangentManipulatorPartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolyline3dEditor.h
     ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolylineTarget3dEditor.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicAppendPointsToPolygonFilterFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicDuplicateWellPathFeature.h
 )
 
@@ -66,7 +65,6 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolyline3dEditor.cpp
     ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolylineTarget3dEditor.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicAppendPointsToPolygonFilterFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicDuplicateWellPathFeature.cpp
 )
 

diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.cpp
diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.h b/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.h
diff --git a/ApplicationLibCode/ModelVisualization/RivCellFilterPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivCellFilterPartMgr.cpp
@@ -22,8 +22,6 @@
 #include "RimCellFilterCollection.h"
 #include "RimPolygonFilter.h"
 
-#include "RivPolylinePartMgr.h"
-
 #include "cafPdmObject.h"
 
 //--------------------------------------------------------------------------------------------------
@@ -34,55 +32,23 @@ RivCellFilterPartMgr::RivCellFilterPartMgr( Rim3dView* view )
 {
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RivCellFilterPartMgr::~RivCellFilterPartMgr()
-{
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RivCellFilterPartMgr::appendGeometryPartsToModel( cvf::ModelBasicList*              model,
                                                        const caf::DisplayCoordTransform* displayCoordTransform,
                                                        const cvf::BoundingBox&           boundingBox )
-{
-    createCellFilterPartManagers();
-
-    for ( auto& partMgr : m_cellFilterPartMgrs )
-    {
-        partMgr->appendDynamicGeometryPartsToModel( model, displayCoordTransform, boundingBox );
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RivCellFilterPartMgr::createCellFilterPartManagers()
 {
     std::vector<RimCellFilterCollection*> colls = m_rimView->descendantsIncludingThisOfType<RimCellFilterCollection>();
 
     if ( colls.empty() ) return;
     auto coll = colls.front();
 
-    clearGeometryCache();
-
     for ( auto filter : coll->filters() )
     {
-        RimPolygonFilter* polyFilter = dynamic_cast<RimPolygonFilter*>( filter );
-        if ( polyFilter )
+        if ( auto polyFilter = dynamic_cast<RimPolygonFilter*>( filter ) )
         {
-            RivPolylinePartMgr* ppm = new RivPolylinePartMgr( m_rimView, polyFilter, coll );
-            m_cellFilterPartMgrs.push_back( ppm );
+            polyFilter->appendPartsToModel( model, displayCoordTransform, boundingBox );
         }
     }
 }
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RivCellFilterPartMgr::clearGeometryCache()
-{
-    m_cellFilterPartMgrs.clear();
-}
diff --git a/ApplicationLibCode/ModelVisualization/RivCellFilterPartMgr.h b/ApplicationLibCode/ModelVisualization/RivCellFilterPartMgr.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include "cafPdmPointer.h"
-#include "cvfAssert.h"
-#include "cvfCollection.h"
 #include "cvfObject.h"
 
 namespace cvf
@@ -37,24 +35,16 @@ class DisplayCoordTransform;
 }
 
 class Rim3dView;
-class RivPolylinePartMgr;
 
 class RivCellFilterPartMgr : public cvf::Object
 {
 public:
     RivCellFilterPartMgr( Rim3dView* view );
-    ~RivCellFilterPartMgr() override;
 
     void appendGeometryPartsToModel( cvf::ModelBasicList*              model,
                                      const caf::DisplayCoordTransform* displayCoordTransform,
                                      const cvf::BoundingBox&           boundingBox );
 
-    void clearGeometryCache();
-
-private:
-    void createCellFilterPartManagers();
-
 private:
-    caf::PdmPointer<Rim3dView>          m_rimView;
-    cvf::Collection<RivPolylinePartMgr> m_cellFilterPartMgrs;
+    caf::PdmPointer<Rim3dView> m_rimView;
 };
diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
@@ -260,6 +260,7 @@ RimPolygonFilter* RimCellFilterCollection::addNewPolygonFilter( RimCase* srcCase
     RimPolygonFilter* pFilter = new RimPolygonFilter();
     pFilter->setCase( srcCase );
     addFilter( pFilter );
+    pFilter->configurePolygonEditor();
     pFilter->enablePicking( true );
     onFilterUpdated( pFilter );
     return pFilter;