OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1038 - pre-proto - Renaming feature for creating new well path fracture

Browse Source
This commit is contained in:
astridkbjorke 2017-01-02 14:01:31 +01:00
parent db3f7d6650
commit a45ed4bc19
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@ -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

11
ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.cpp → ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp
View File

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

2
ApplicationCode/Commands/RicNewWellPathCollFractureAtPosFeature.h → ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.h
View File

@ -26,7 +26,7 @@
//==================================================================================================
///
//==================================================================================================
class RicNewWellPathCollFractureAtPosFeature : public caf::CmdFeature
class RicNewWellPathFractureAtPosFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:

10
ApplicationCode/Commands/RicNewWellPathCollFractureFeature.cpp → ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicNewWellPathCollFractureFeature.h"
#include "RicNewWellPathFractureFeature.h"
#include "RiaApplication.h"
@ -33,12 +33,12 @@
#include <QAction>
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;

2
ApplicationCode/Commands/RicNewWellPathCollFractureFeature.h → ApplicationCode/Commands/RicNewWellPathFractureFeature.h
View File

@ -26,7 +26,7 @@
//==================================================================================================
///
//==================================================================================================
class RicNewWellPathCollFractureFeature : public caf::CmdFeature
class RicNewWellPathFractureFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -359,7 +359,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
else if (dynamic_cast<RimWellPathFractureCollection*>(uiItem) ||
dynamic_cast<RimWellPathFracture*>(uiItem) )
{
commandIds << "RicNewWellPathCollFractureFeature";
commandIds << "RicNewWellPathFractureFeature";
commandIds << "RicWellPathFracturesDeleteAllFeature";
}
else if (dynamic_cast<RimSimWellFractureCollection*>(uiItem) ||

2
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -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