Add polygon and polygon in view

ApplicationLibCode/Application/RiaApplication.cpp

@@ -40,6 +40,8 @@
 #include "RicfCommandObject.h"
 
 #include "PlotTemplates/RimPlotTemplateFolderItem.h"
+#include "Polygons/RimPolygonCollection.h"
+
 #include "Rim2dIntersectionViewCollection.h"
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
@@ -544,6 +546,8 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
         {
             seismicData->ensureFileReaderIsInitialized();
         }
+
+        oilField->polygonCollection()->loadData();
     }
 
     {

ApplicationLibCode/Application/RiaDefines.h

@@ -243,8 +243,17 @@ enum class View3dContent
     ALL               = 0b00011111
 };
 
+enum class ItemIn3dView
+{
+    NONE    = 0b00000000,
+    SURFACE = 0b00000001,
+    POLYGON = 0b00000010,
+    ALL     = 0b00000011
+};
+
 }; // namespace RiaDefines
 
 // Activate bit mask operators at global scope
 ENABLE_BITMASK_OPERATORS( RiaDefines::MultiPlotPageUpdateType )
 ENABLE_BITMASK_OPERATORS( RiaDefines::View3dContent )
+ENABLE_BITMASK_OPERATORS( RiaDefines::ItemIn3dView )

ApplicationLibCode/CMakeLists.txt

@@ -123,6 +123,7 @@ list(
   ProjectDataModel/Intersections/CMakeLists_files.cmake
   ProjectDataModel/CellFilters/CMakeLists_files.cmake
   ProjectDataModel/ProcessControl/CMakeLists_files.cmake
+  ProjectDataModel/Polygons/CMakeLists_files.cmake
   ProjectDataModel/WellLog/CMakeLists_files.cmake
   ProjectDataModel/WellMeasurement/CMakeLists_files.cmake
   ProjectDataModel/WellPath/CMakeLists_files.cmake

ApplicationLibCode/Commands/CMakeLists.txt

@@ -41,6 +41,7 @@ set(COMMAND_REFERENCED_CMAKE_FILES
     PlotTemplateCommands/CMakeLists_files.cmake
     FractureCommands/CMakeLists_files.cmake
     PlotBuilderCommands/CMakeLists_files.cmake
+    PolygonCommands/CMakeLists_files.cmake
 )
 
 # Include source file lists from *.cmake files

ApplicationLibCode/Commands/PolygonCommands/CMakeLists_files.cmake

@@ -0,0 +1,19 @@
+set(SOURCE_GROUP_HEADER_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFeature.h
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFileFeature.h
+)
+
+set(SOURCE_GROUP_SOURCE_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFeature.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFileFeature.cpp
+)
+
+list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
+
+list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
+
+source_group(
+  "CommandFeature\\Polygons"
+  FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.cpp

@@ -0,0 +1,54 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicNewPolygonFeature.h"
+
+#include "Polygons/RimPolygon.h"
+#include "Polygons/RimPolygonCollection.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+
+#include "RiuPlotMainWindowTools.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT( RicNewPolygonFeature, "RicNewPolygonFeature" );
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPolygonFeature::onActionTriggered( bool isChecked )
+{
+    auto proj              = RimProject::current();
+    auto polygonCollection = proj->activeOilField()->polygonCollection();
+
+    auto newPolygon = polygonCollection->appendUserDefinedPolygon();
+    polygonCollection->uiCapability()->updateAllRequiredEditors();
+
+    RiuPlotMainWindowTools::setExpanded( newPolygon );
+    RiuPlotMainWindowTools::selectAsCurrentItem( newPolygon );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPolygonFeature::setupActionLook( QAction* actionToSetup )
+{
+    actionToSetup->setText( "New Polygon" );
+    actionToSetup->setIcon( QIcon( ":/PolylinesFromFile16x16.png" ) );
+}

ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.h

@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+//==================================================================================================
+///
+//==================================================================================================
+class RicNewPolygonFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    void onActionTriggered( bool isChecked ) override;
+    void setupActionLook( QAction* actionToSetup ) override;
+};

ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.cpp

@@ -0,0 +1,57 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2022     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 "RicNewPolygonFileFeature.h"
+
+#include "Polygons/RimPolygon.h"
+#include "Polygons/RimPolygonCollection.h"
+#include "Polygons/RimPolygonFile.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+
+#include "RiuPlotMainWindowTools.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT( RicNewPolygonFileFeature, "RicNewPolygonFileFeature" );
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPolygonFileFeature::onActionTriggered( bool isChecked )
+{
+    auto proj              = RimProject::current();
+    auto polygonCollection = proj->activeOilField()->polygonCollection();
+
+    auto newPolygonFile = new RimPolygonFile();
+    newPolygonFile->setName( "File Polygon " + QString::number( polygonCollection->polygonFiles().size() + 1 ) );
+    polygonCollection->addPolygonFile( newPolygonFile );
+    polygonCollection->uiCapability()->updateAllRequiredEditors();
+
+    RiuPlotMainWindowTools::setExpanded( newPolygonFile );
+    RiuPlotMainWindowTools::selectAsCurrentItem( newPolygonFile );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPolygonFileFeature::setupActionLook( QAction* actionToSetup )
+{
+    actionToSetup->setText( "New File Polygon" );
+    actionToSetup->setIcon( QIcon( ":/PolylinesFromFile16x16.png" ) );
+}

ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.h

@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+//==================================================================================================
+///
+//==================================================================================================
+class RicNewPolygonFileFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    void onActionTriggered( bool isChecked ) override;
+    void setupActionLook( QAction* actionToSetup ) override;
+};

ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp

@@ -21,10 +21,7 @@
 #include "RicPointTangentManipulator.h"
 
 #include "Rim3dView.h"
-#include "RimAnnotationCollectionBase.h"
-#include "RimCase.h"
 #include "RimPolylineTarget.h"
-#include "RimUserDefinedPolylinesAnnotation.h"
 
 #include "RiuViewer.h"
 
@@ -57,7 +54,7 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor()
         ownerRiuViewer->removeStaticModel( m_cvfModel.p() );
     }
 
-    RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
+    auto* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
     if ( oldTarget )
     {
         oldTarget->targetPointUiCapability()->removeFieldEditor( this );
@@ -71,11 +68,11 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor()
 //--------------------------------------------------------------------------------------------------
 void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName )
 {
-    RimPolylineTarget* target         = dynamic_cast<RimPolylineTarget*>( pdmObject() );
-    RiuViewer*         ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
-    Rim3dView*         view           = mainOrComparisonView();
+    auto*      target         = dynamic_cast<RimPolylineTarget*>( pdmObject() );
+    RiuViewer* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
+    Rim3dView* view           = mainOrComparisonView();
 
-    if ( !target || !target->isEnabled() || !view )
+    if ( !target || !view )
     {
         if ( m_cvfModel.notNull() ) m_cvfModel->removeAllParts();
 
@@ -97,11 +94,12 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam
         ownerRiuViewer->addStaticModelOnce( m_cvfModel.p(), isInComparisonView() );
     }
 
-    cvf::ref<caf::DisplayCoordTransform> dispXf     = view->displayCoordTransform();
-    double                               handleSize = 0.7 * view->characteristicCellSize();
+    cvf::ref<caf::DisplayCoordTransform> dispXf = view->displayCoordTransform();
+
+    const double handleScalingFactor = 0.7;
+    const double handleSize          = handleScalingFactor * view->characteristicCellSize();
 
     m_manipulator->setOrigin( dispXf->transformToDisplayCoord( target->targetPointXYZ() ) );
-    // m_manipulator->setTangent(target->tangent());
     m_manipulator->setHandleSize( handleSize );
     m_cvfModel->removeAllParts();
     m_manipulator->appendPartsToModel( m_cvfModel.p() );
@@ -114,7 +112,7 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam
 //--------------------------------------------------------------------------------------------------
 void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject()
 {
-    RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
+    auto* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
     if ( oldTarget )
     {
         oldTarget->targetPointUiCapability()->removeFieldEditor( this );
@@ -126,8 +124,8 @@ void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject()
 //--------------------------------------------------------------------------------------------------
 void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf::Vec3d& tangent )
 {
-    RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
-    Rim3dView*         view   = mainOrComparisonView();
+    auto*      target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
+    Rim3dView* view   = mainOrComparisonView();
 
     if ( !target || !view )
     {
@@ -140,17 +138,15 @@ void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf
     domainOrigin.z()        = -domainOrigin.z();
     QVariant originVariant  = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( domainOrigin );
 
-    target->enableFullUpdate( false );
     caf::PdmUiCommandSystemProxy::instance()->setUiValueToField( target->targetPointUiCapability(), originVariant );
-    target->enableFullUpdate( true );
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RicPolylineTarget3dEditor::slotSelectedIn3D()
 {
-    RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
+    auto* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
     if ( !target )
     {
         return;
@@ -164,7 +160,7 @@ void RicPolylineTarget3dEditor::slotSelectedIn3D()
 //--------------------------------------------------------------------------------------------------
 void RicPolylineTarget3dEditor::slotDragFinished()
 {
-    RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
+    auto* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
     if ( target )
     {
         target->triggerVisualizationUpdate();

ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.h

@@ -25,13 +25,14 @@ class RicPointTangentManipulator;
 #include "cvfObject.h"
 #include "cvfVector3.h"
 
+#include <QPointer>
+
 namespace cvf
 {
 class ModelBasicList;
 }
 
 class QString;
-#include <QPointer>
 
 class RicPolylineTarget3dEditor : public Ric3dObjectEditorHandle
 {