From 8d62a706f55d19405eb9b4753efc163a0b45d831 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 12 Feb 2024 10:19:52 +0100 Subject: [PATCH] Rename --- .../Commands/PolygonCommands/CMakeLists_files.cmake | 8 ++++---- ...ndPolygonFeature.cpp => RicNewPolygonFeature.cpp} | 12 ++++++------ ...AppendPolygonFeature.h => RicNewPolygonFeature.h} | 4 ++-- ...nFileFeature.cpp => RicNewPolygonFileFeature.cpp} | 10 +++++----- ...lygonFileFeature.h => RicNewPolygonFileFeature.h} | 4 ++-- .../Polygons/RimPolygonAppearance.cpp | 2 -- .../Polygons/RimPolygonCollection.cpp | 2 +- .../ProjectDataModel/Polygons/RimPolygonInView.cpp | 1 - .../ProjectDataModel/Polygons/RimPolygonInView.h | 2 ++ .../Polygons/RimPolygonInViewCollection.cpp | 2 +- .../ProjectDataModel/RimContextCommandBuilder.cpp | 4 ++-- 11 files changed, 25 insertions(+), 26 deletions(-) rename ApplicationLibCode/Commands/PolygonCommands/{RicAppendPolygonFeature.cpp => RicNewPolygonFeature.cpp} (84%) rename ApplicationLibCode/Commands/PolygonCommands/{RicAppendPolygonFeature.h => RicNewPolygonFeature.h} (92%) rename ApplicationLibCode/Commands/PolygonCommands/{RicAppendPolygonFileFeature.cpp => RicNewPolygonFileFeature.cpp} (86%) rename ApplicationLibCode/Commands/PolygonCommands/{RicAppendPolygonFileFeature.h => RicNewPolygonFileFeature.h} (92%) diff --git a/ApplicationLibCode/Commands/PolygonCommands/CMakeLists_files.cmake b/ApplicationLibCode/Commands/PolygonCommands/CMakeLists_files.cmake index 8cd3631c227..83926520048 100644 --- a/ApplicationLibCode/Commands/PolygonCommands/CMakeLists_files.cmake +++ b/ApplicationLibCode/Commands/PolygonCommands/CMakeLists_files.cmake @@ -1,11 +1,11 @@ set(SOURCE_GROUP_HEADER_FILES - ${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFeature.h - ${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFileFeature.h + ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFeature.h + ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFileFeature.h ) set(SOURCE_GROUP_SOURCE_FILES - ${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFeature.cpp - ${CMAKE_CURRENT_LIST_DIR}/RicAppendPolygonFileFeature.cpp + ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFeature.cpp + ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFileFeature.cpp ) list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES}) diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.cpp similarity index 84% rename from ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.cpp rename to ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.cpp index 5c4bc3dfbcb..7ff2d4aded5 100644 --- a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.cpp +++ b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.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 @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicAppendPolygonFeature.h" +#include "RicNewPolygonFeature.h" #include "Polygons/RimPolygon.h" #include "Polygons/RimPolygonCollection.h" @@ -27,12 +27,12 @@ #include -CAF_CMD_SOURCE_INIT( RicAppendPolygonFeature, "RicAppendPolygonFeature" ); +CAF_CMD_SOURCE_INIT( RicNewPolygonFeature, "RicNewPolygonFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendPolygonFeature::onActionTriggered( bool isChecked ) +void RicNewPolygonFeature::onActionTriggered( bool isChecked ) { auto proj = RimProject::current(); auto polygonCollection = proj->activeOilField()->polygonCollection(); @@ -47,8 +47,8 @@ void RicAppendPolygonFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendPolygonFeature::setupActionLook( QAction* actionToSetup ) +void RicNewPolygonFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "Append Polygon" ); + actionToSetup->setText( "New Polygon" ); actionToSetup->setIcon( QIcon( ":/PolylinesFromFile16x16.png" ) ); } diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.h b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.h similarity index 92% rename from ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.h rename to ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.h index 6773df5e446..ebb92b9b2c5 100644 --- a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFeature.h +++ b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFeature.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 @@ -23,7 +23,7 @@ //================================================================================================== /// //================================================================================================== -class RicAppendPolygonFeature : public caf::CmdFeature +class RicNewPolygonFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.cpp similarity index 86% rename from ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.cpp rename to ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.cpp index f459516c08d..5a5a681fbe4 100644 --- a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.cpp +++ b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicAppendPolygonFileFeature.h" +#include "RicNewPolygonFileFeature.h" #include "Polygons/RimPolygon.h" #include "Polygons/RimPolygonCollection.h" @@ -28,12 +28,12 @@ #include -CAF_CMD_SOURCE_INIT( RicAppendPolygonFileFeature, "RicAppendPolygonFileFeature" ); +CAF_CMD_SOURCE_INIT( RicNewPolygonFileFeature, "RicNewPolygonFileFeature" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendPolygonFileFeature::onActionTriggered( bool isChecked ) +void RicNewPolygonFileFeature::onActionTriggered( bool isChecked ) { auto proj = RimProject::current(); auto polygonCollection = proj->activeOilField()->polygonCollection(); @@ -50,8 +50,8 @@ void RicAppendPolygonFileFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendPolygonFileFeature::setupActionLook( QAction* actionToSetup ) +void RicNewPolygonFileFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "Append File Polygon" ); + actionToSetup->setText( "New File Polygon" ); actionToSetup->setIcon( QIcon( ":/PolylinesFromFile16x16.png" ) ); } diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.h b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.h similarity index 92% rename from ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.h rename to ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.h index 2a5333cb76f..8c3ff090efe 100644 --- a/ApplicationLibCode/Commands/PolygonCommands/RicAppendPolygonFileFeature.h +++ b/ApplicationLibCode/Commands/PolygonCommands/RicNewPolygonFileFeature.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 @@ -23,7 +23,7 @@ //================================================================================================== /// //================================================================================================== -class RicAppendPolygonFileFeature : public caf::CmdFeature +class RicNewPolygonFileFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonAppearance.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonAppearance.cpp index 22c4191bade..038ee5e7f06 100644 --- a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonAppearance.cpp +++ b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonAppearance.cpp @@ -31,8 +31,6 @@ #include "cvfBoundingBox.h" -#include - CAF_PDM_SOURCE_INIT( RimPolygonAppearance, "RimPolygonAppearance" ); //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonCollection.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonCollection.cpp index 7ddf2325995..ea085b65225 100644 --- a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonCollection.cpp @@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimPolygonCollection, "RimPolygonCollection" ); //-------------------------------------------------------------------------------------------------- RimPolygonCollection::RimPolygonCollection() { - CAF_PDM_InitObject( "Polygons", ":/PolylinesFromFile16x16.png" ); + CAF_PDM_InitObject( "Polygons (Under construction)", ":/PolylinesFromFile16x16.png" ); CAF_PDM_InitFieldNoDefault( &m_polygons, "Polygons", "Polygons" ); CAF_PDM_InitFieldNoDefault( &m_polygonFiles, "PolygonFiles", "Polygon Files" ); diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp index 80270ec83ae..60371b247d7 100644 --- a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp @@ -60,7 +60,6 @@ RimPolygonInView::RimPolygonInView() CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" ); m_targets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); - // m_targets.uiCapability()->setUiTreeHidden(true); m_targets.uiCapability()->setUiTreeChildrenHidden( true ); m_targets.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_targets.uiCapability()->setCustomContextMenuEnabled( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h index 5a2a56d8263..3e8a6864cd6 100644 --- a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h +++ b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h @@ -21,6 +21,8 @@ #include "RimPolylinePickerInterface.h" #include "RimPolylinesDataInterface.h" +#include "RivPolylinePartMgr.h" + #include "cafPdmChildArrayField.h" #include "cafPdmPtrField.h" diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInViewCollection.cpp index 9b3ed927d0f..fadd762d442 100644 --- a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInViewCollection.cpp @@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimPolygonInViewCollection, "RimPolygonInViewCollection" ); //-------------------------------------------------------------------------------------------------- RimPolygonInViewCollection::RimPolygonInViewCollection() { - CAF_PDM_InitObject( "Polygons", ":/PolylinesFromFile16x16.png" ); + CAF_PDM_InitObject( "Polygons (Under construction)", ":/PolylinesFromFile16x16.png" ); CAF_PDM_InitFieldNoDefault( &m_polygons, "Polygons", "Polygons" ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp index 870316d8ce2..6c6b6583588 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -1141,8 +1141,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() } else if ( dynamic_cast( firstUiItem ) ) { - menuBuilder << "RicAppendPolygonFeature"; - menuBuilder << "RicAppendPolygonFileFeature"; + menuBuilder << "RicNewPolygonFeature"; + menuBuilder << "RicNewPolygonFileFeature"; } if ( dynamic_cast( firstUiItem ) )