Add project polygon as source for an intersection

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"
@@ -46,7 +48,7 @@ void RicNewPolygonFilter3dviewFeature::onActionTriggered( bool isChecked )
     // and the case to use
     RimCase* sourceCase = viewOrComparisonView->ownerCase();
 
-    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
+    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase, nullptr );
     if ( lastCreatedOrUpdated )
     {
         Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );

ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilterFeature.cpp

@@ -18,9 +18,14 @@
 
 #include "RicNewPolygonFilterFeature.h"
 
+#include "Polygons/RimPolygon.h"
+#include "Polygons/RimPolygonInView.h"
+
 #include "RimCase.h"
 #include "RimCellFilterCollection.h"
+#include "RimGridView.h"
 #include "RimPolygonFilter.h"
+
 #include "Riu3DMainWindowTools.h"
 
 #include "cafSelectionManagerTools.h"
@@ -35,16 +40,31 @@ CAF_CMD_SOURCE_INIT( RicNewPolygonFilterFeature, "RicNewPolygonFilterFeature" );
 //--------------------------------------------------------------------------------------------------
 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];
+    auto cellFilterCollection = caf::SelectionManager::instance()->selectedItemOfType<RimCellFilterCollection>();
+
+    if ( !cellFilterCollection )
+    {
+        RimGridView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
+        if ( activeView )
+        {
+            cellFilterCollection = activeView->cellFilterCollection();
+        }
+    }
+
+    if ( !cellFilterCollection ) return;
+
+    auto polygon = caf::SelectionManager::instance()->selectedItemOfType<RimPolygon>();
+    if ( !polygon )
+    {
+        if ( auto polygonInView = caf::SelectionManager::instance()->selectedItemOfType<RimPolygonInView>() )
+        {
+            polygon = polygonInView->polygon();
+        }
+    }
 
-    // and the case to use
-    RimCase* sourceCase = filtColl->firstAncestorOrThisOfTypeAsserted<RimCase>();
+    auto sourceCase = cellFilterCollection->firstAncestorOrThisOfTypeAsserted<RimCase>();
 
-    RimPolygonFilter* lastCreatedOrUpdated = filtColl->addNewPolygonFilter( sourceCase );
-    if ( lastCreatedOrUpdated )
+    if ( auto lastCreatedOrUpdated = cellFilterCollection->addNewPolygonFilter( sourceCase, polygon ) )
     {
         Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
     }

ApplicationLibCode/Commands/CrossSectionCommands/CMakeLists_files.cmake

@@ -6,6 +6,7 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineIntersectionFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.h
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonIntersectionFeature.h
 )
 
 set(SOURCE_GROUP_SOURCE_FILES
@@ -16,6 +17,7 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineIntersectionFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonIntersectionFeature.cpp
 )
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})

ApplicationLibCode/Commands/CrossSectionCommands/RicNewPolygonIntersectionFeature.cpp

@@ -0,0 +1,68 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicNewPolygonIntersectionFeature.h"
+
+#include "RiaApplication.h"
+
+#include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
+#include "RimIntersectionCollection.h"
+
+#include "Polygons/RimPolygon.h"
+#include "Polygons/RimPolygonInView.h"
+
+#include "cafSelectionManager.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT( RicNewPolygonIntersectionFeature, "RicNewPolygonIntersectionFeature" );
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPolygonIntersectionFeature::onActionTriggered( bool isChecked )
+{
+    RimGridView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
+    if ( !activeView ) return;
+
+    auto collection = activeView->intersectionCollection();
+    if ( !collection ) return;
+
+    auto polygon = caf::SelectionManager::instance()->selectedItemOfType<RimPolygon>();
+    if ( !polygon )
+    {
+        if ( auto polygonInView = caf::SelectionManager::instance()->selectedItemOfType<RimPolygonInView>() )
+        {
+            polygon = polygonInView->polygon();
+        }
+    }
+
+    auto intersection = new RimExtrudedCurveIntersection();
+    intersection->configureForProjectPolyLine( polygon );
+    collection->appendIntersectionAndUpdate( intersection );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPolygonIntersectionFeature::setupActionLook( QAction* actionToSetup )
+{
+    actionToSetup->setIcon( QIcon( ":/CrossSection16x16.png" ) );
+    actionToSetup->setText( "Create Polygon Intersection" );
+}

ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.h → ApplicationLibCode/Commands/CrossSectionCommands/RicNewPolygonIntersectionFeature.h

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2021-     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
@@ -23,12 +23,11 @@
 //==================================================================================================
 ///
 //==================================================================================================
-class RicAppendPointsToPolygonFilterFeature : public caf::CmdFeature
+class RicNewPolygonIntersectionFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 
 protected:
-    bool isCommandEnabled() const override;
     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/SeismicCommands/RicSeismicSectionFromIntersectionFeature.cpp

@@ -47,6 +47,7 @@ bool RicSeismicSectionFromIntersectionFeature::isCommandEnabled() const
     if ( intersection != nullptr )
     {
         return ( ( intersection->type() == RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYLINE ) ||
+                 ( intersection->type() == RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYGON ) ||
                  ( intersection->type() == RimExtrudedCurveIntersection::CrossSectionEnum::CS_WELL_PATH ) );
     }
 
@@ -70,7 +71,8 @@ void RicSeismicSectionFromIntersectionFeature::onActionTriggered( bool isChecked
     RimSeismicSection*           newSection = seisColl->addNewSection();
     if ( !newSection ) return;
 
-    if ( intersection->type() == RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYLINE )
+    if ( ( intersection->type() == RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYLINE ) ||
+         ( intersection->type() == RimExtrudedCurveIntersection::CrossSectionEnum::CS_POLYGON ) )
     {
         newSection->setSectionType( RiaDefines::SeismicSectionType::SS_POLYLINE );
         newSection->setUserDescription( intersection->name() );

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 );