Use project polygons from polygon cell filter

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"

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"

ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.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

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
 )
 

ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp

@@ -21,6 +21,7 @@
 #include "RicPointTangentManipulator.h"
 
 #include "Rim3dView.h"
+#include "RimPolylinePickerInterface.h"
 #include "RimPolylineTarget.h"
 
 #include "RiuViewer.h"
@@ -96,8 +97,13 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam
 
     cvf::ref<caf::DisplayCoordTransform> dispXf = view->displayCoordTransform();
 
-    const double handleScalingFactor = 0.7;
-    const double handleSize          = handleScalingFactor * view->characteristicCellSize();
+    double scalingFactor = 0.7;
+    if ( auto pickerInterface = target->firstAncestorOrThisOfType<RimPolylinePickerInterface>() )
+    {
+        scalingFactor *= pickerInterface->scalingFactorForTarget();
+    }
+
+    const double handleSize = scalingFactor * view->characteristicCellSize();
 
     m_manipulator->setOrigin( dispXf->transformToDisplayCoord( target->targetPointXYZ() ) );
     m_manipulator->setHandleSize( handleSize );

ApplicationLibCode/ModelVisualization/CMakeLists_files.cmake

@@ -54,7 +54,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivWellDiskPartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivElementVectorResultPartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivPolylinePartMgr.h
-    ${CMAKE_CURRENT_LIST_DIR}/RivCellFilterPartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.h
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxGeometryGenerator.h
     ${CMAKE_CURRENT_LIST_DIR}/RivAnnotationTools.h
@@ -112,7 +111,6 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivWellDiskPartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivElementVectorResultPartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivPolylinePartMgr.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RivCellFilterPartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxGeometryGenerator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivAnnotationTools.cpp

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;
@@ -485,3 +486,21 @@ void RimCellFilterCollection::updateCellVisibilityByIndex( cvf::UByteArray* incl
         }
     }
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::vector<RimPolygonInView*> RimCellFilterCollection::cellFilterPolygons() const
+{
+    std::vector<RimPolygonInView*> polyInView;
+
+    for ( const auto& filter : m_cellFilters )
+    {
+        if ( auto polygonFilter = dynamic_cast<RimPolygonFilter*>( filter.p() ) )
+        {
+            polyInView.push_back( polygonFilter->polygonInView() );
+        }
+    }
+
+    return polyInView;
+}

ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.h

@@ -32,6 +32,7 @@ class RimPolygonFilter;
 class RimUserDefinedFilter;
 class RimUserDefinedIndexFilter;
 class RimCase;
+class RimPolygonInView;
 
 namespace cvf
 {
@@ -69,7 +70,8 @@ class RimCellFilterCollection : public caf::PdmObject
     void compoundCellRangeFilter( cvf::CellRangeFilter* cellRangeFilter, size_t gridIndex ) const;
     void updateCellVisibilityByIndex( cvf::UByteArray* cellsIncluded, cvf::UByteArray* cellsExcluded, size_t gridIndex ) const;
 
-    std::vector<RimCellFilter*> filters() const;
+    std::vector<RimPolygonInView*> cellFilterPolygons() const;
+    std::vector<RimCellFilter*>    filters() const;
 
     bool hasActiveFilters() const;
     bool hasActiveIncludeIndexFilters() const;