diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index f0084cbf91..9f252f9b13 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -40,8 +40,8 @@ ${CEE_CURRENT_LIST_DIR}RicExportMultipleSnapshotsFeature.h ${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureFeature.h ${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureAtPosFeature.h ${CEE_CURRENT_LIST_DIR}RicNewFractureDefinitionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureAtPosFeature.h +${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureFeature.h +${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureAtPosFeature.h ${CEE_CURRENT_LIST_DIR}RicFractureDefinitionsDeleteAllFeature.h ${CEE_CURRENT_LIST_DIR}RicFracturesDeleteAllFeature.h ${CEE_CURRENT_LIST_DIR}RicWellPathFracturesDeleteAllFeature.h @@ -90,8 +90,8 @@ ${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureAtPosFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewFractureDefinitionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellPathCollFractureAtPosFeature.cpp +${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureFeature.cpp +${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureAtPosFeature.cpp ${CEE_CURRENT_LIST_DIR}RicFractureDefinitionsDeleteAllFeature.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathFracturesDeleteAllFeature.cpp ${CEE_CURRENT_LIST_DIR}RicSimWellFracturesDeleteAllFeature.cpp diff --git a/ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.cpp b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp similarity index 90% rename from ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.cpp rename to ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp index 7bfaa1f467..3aa28069cf 100644 --- a/ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.cpp +++ b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewWellPathCollFractureAtPosFeature.h" +#include "RicNewWellPathFractureAtPosFeature.h" #include "RiaApplication.h" @@ -41,12 +41,12 @@ -CAF_CMD_SOURCE_INIT(RicNewWellPathCollFractureAtPosFeature, "RicNewWellPathCollFractureAtPosFeature"); +CAF_CMD_SOURCE_INIT(RicNewWellPathFractureAtPosFeature, "RicNewWellPathFractureAtPosFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCollFractureAtPosFeature::onActionTriggered(bool isChecked) +void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked) { RimView* activeView = RiaApplication::instance()->activeReservoirView(); if (!activeView) return; @@ -76,7 +76,6 @@ void RicNewWellPathCollFractureAtPosFeature::onActionTriggered(bool isChecked) fractureCollection->fractures.push_back(fracture); fracture->name = "New Well Path Fracture"; - fracture->wellpath = wellPath; fracture->positionAtWellpath = wellPathItem->m_currentPickPositionInDomainCoords; double measuredDepth = wellpathSourceInfo->measuredDepth(wellPathItem->m_firstPartTriangleIndex, wellPathItem->m_currentPickPositionInDomainCoords); @@ -88,7 +87,7 @@ void RicNewWellPathCollFractureAtPosFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCollFractureAtPosFeature::setupActionLook(QAction* actionToSetup) +void RicNewWellPathFractureAtPosFeature::setupActionLook(QAction* actionToSetup) { // actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setText("New Fracture"); @@ -97,7 +96,7 @@ void RicNewWellPathCollFractureAtPosFeature::setupActionLook(QAction* actionToSe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewWellPathCollFractureAtPosFeature::isCommandEnabled() +bool RicNewWellPathFractureAtPosFeature::isCommandEnabled() { caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem(); if (!pdmUiItem) return false; diff --git a/ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.h b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.h similarity index 94% rename from ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.h rename to ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.h index 029804fadd..ab8c8a6454 100644 --- a/ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.h +++ b/ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.h @@ -26,7 +26,7 @@ //================================================================================================== /// //================================================================================================== -class RicNewWellPathCollFractureAtPosFeature : public caf::CmdFeature +class RicNewWellPathFractureAtPosFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; protected: diff --git a/ApplicationCode/Commands/RicNewWellPathCollFractureFeature.cpp b/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp similarity index 89% rename from ApplicationCode/Commands/RicNewWellPathCollFractureFeature.cpp rename to ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp index 10bb2b2200..4a43281b00 100644 --- a/ApplicationCode/Commands/RicNewWellPathCollFractureFeature.cpp +++ b/ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewWellPathCollFractureFeature.h" +#include "RicNewWellPathFractureFeature.h" #include "RiaApplication.h" @@ -33,12 +33,12 @@ #include -CAF_CMD_SOURCE_INIT(RicNewWellPathCollFractureFeature, "RicNewWellPathCollFractureFeature"); +CAF_CMD_SOURCE_INIT(RicNewWellPathFractureFeature, "RicNewWellPathFractureFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCollFractureFeature::onActionTriggered(bool isChecked) +void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked) { caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem(); if (!pdmUiItem) return; @@ -65,7 +65,7 @@ void RicNewWellPathCollFractureFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCollFractureFeature::setupActionLook(QAction* actionToSetup) +void RicNewWellPathFractureFeature::setupActionLook(QAction* actionToSetup) { // actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setText("New Fracture"); @@ -74,7 +74,7 @@ void RicNewWellPathCollFractureFeature::setupActionLook(QAction* actionToSetup) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewWellPathCollFractureFeature::isCommandEnabled() +bool RicNewWellPathFractureFeature::isCommandEnabled() { caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem(); if (!pdmUiItem) return false; diff --git a/ApplicationCode/Commands/RicNewWellPathCollFractureFeature.h b/ApplicationCode/Commands/RicNewWellPathFractureFeature.h similarity index 95% rename from ApplicationCode/Commands/RicNewWellPathCollFractureFeature.h rename to ApplicationCode/Commands/RicNewWellPathFractureFeature.h index 1da770161a..a10fca40e4 100644 --- a/ApplicationCode/Commands/RicNewWellPathCollFractureFeature.h +++ b/ApplicationCode/Commands/RicNewWellPathFractureFeature.h @@ -26,7 +26,7 @@ //================================================================================================== /// //================================================================================================== -class RicNewWellPathCollFractureFeature : public caf::CmdFeature +class RicNewWellPathFractureFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; protected: diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index 968caaa15c..1e4caada0e 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -359,7 +359,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection() else if (dynamic_cast(uiItem) || dynamic_cast(uiItem) ) { - commandIds << "RicNewWellPathCollFractureFeature"; + commandIds << "RicNewWellPathFractureFeature"; commandIds << "RicWellPathFracturesDeleteAllFeature"; } else if (dynamic_cast(uiItem) || diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 5788e3cfde..7415ce25c2 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -296,7 +296,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event) RiuSelectionItem* selItem = new RiuWellPathSelectionItem(wellPathSourceInfo, m_currentPickPositionInDomainCoords, firstPartTriangleIndex); RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY); - commandIds << "RicNewWellPathCollFractureAtPosFeature"; + commandIds << "RicNewWellPathFractureAtPosFeature"; //TODO: Update so these also use RiuWellPathSelectionItem