Refactor cell filter to use global polygons

ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp

@@ -18,7 +18,11 @@
 
 #include "RicNewPolygonFilter3dviewFeature.h"
 
+#include "Polygons/RimPolygonInView.h"
+
 #include "RiaApplication.h"
+#include "RicNewPolygonFilterFeature.h"
+
 #include "RimCase.h"
 #include "RimCellFilterCollection.h"
 #include "RimGridView.h"
@@ -37,20 +41,13 @@ CAF_CMD_SOURCE_INIT( RicNewPolygonFilter3dviewFeature, "RicNewPolygonFilter3dvie
 //--------------------------------------------------------------------------------------------------
 void RicNewPolygonFilter3dviewFeature::onActionTriggered( bool isChecked )
 {
-    // Get the selected Cell Filter Collection
     RimGridView* viewOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
     if ( !viewOrComparisonView ) return;
 
-    RimCellFilterCollection* filtColl = viewOrComparisonView->cellFilterCollection();
-
-    // and the case to use
-    RimCase* sourceCase = viewOrComparisonView->ownerCase();
+    RimCellFilterCollection* filtColl   = viewOrComparisonView->cellFilterCollection();
+    RimCase*                 sourceCase = viewOrComparisonView->ownerCase();
 
-    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
-    if ( lastCreatedOrUpdated )
-    {
-        Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
-    }
+    RicNewPolygonFilterFeature::appendNewPolygonFilter( sourceCase, filtColl );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilterFeature.cpp

@@ -18,9 +18,14 @@
 
 #include "RicNewPolygonFilterFeature.h"
 
+#include "Polygons/RimPolygon.h"
+#include "Polygons/RimPolygonInView.h"
+#include "Polygons/RimPolygonTools.h"
+
 #include "RimCase.h"
 #include "RimCellFilterCollection.h"
 #include "RimPolygonFilter.h"
+
 #include "Riu3DMainWindowTools.h"
 
 #include "cafSelectionManagerTools.h"
@@ -30,24 +35,42 @@
 
 CAF_CMD_SOURCE_INIT( RicNewPolygonFilterFeature, "RicNewPolygonFilterFeature" );
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimPolygonFilter* RicNewPolygonFilterFeature::appendNewPolygonFilter( RimCase* sourceCase, RimCellFilterCollection* cellFilterCollection )
+{
+    if ( !sourceCase || !cellFilterCollection )
+    {
+        return nullptr;
+    }
+
+    RimPolygonFilter* polygonFilter = cellFilterCollection->addNewPolygonFilter( sourceCase );
+    if ( polygonFilter )
+    {
+        auto polygon = RimPolygonTools::createNewPolygon();
+        polygon->setIsClosed( true );
+        polygonFilter->setPolygon( polygon );
+
+        RimPolygonTools::selectPolygonInView( polygon, polygonFilter );
+        return polygonFilter;
+    }
+
+    return nullptr;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RicNewPolygonFilterFeature::onActionTriggered( bool isChecked )
 {
-    // Find the selected Cell Filter Collection
     std::vector<RimCellFilterCollection*> colls = caf::selectedObjectsByTypeStrict<RimCellFilterCollection*>();
     if ( colls.empty() ) return;
     RimCellFilterCollection* filtColl = colls[0];
 
-    // and the case to use
     RimCase* sourceCase = filtColl->firstAncestorOrThisOfTypeAsserted<RimCase>();
 
-    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
-    if ( lastCreatedOrUpdated )
-    {
-        Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
-    }
+    appendNewPolygonFilter( sourceCase, filtColl );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilterFeature.h

@@ -20,13 +20,20 @@
 
 #include "cafCmdFeature.h"
 
+class RimCellFilterCollection;
+class RimCase;
+class RimPolygonFilter;
+
 //==================================================================================================
 ///
 //==================================================================================================
 class RicNewPolygonFilterFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 
+public:
+    static RimPolygonFilter* appendNewPolygonFilter( RimCase* sourceCase, RimCellFilterCollection* cellFilterCollection );
+
 protected:
     void onActionTriggered( bool isChecked ) override;
     void setupActionLook( QAction* actionToSetup ) override;

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->handleScalingFactor();
+    }
+
+    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