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

pre-proto - Changed naming of fracture definitions to fracture templates and Fracture collection to fractures in gui

Browse Source
This commit is contained in:
astridkbjorke 2017-01-04 10:17:54 +01:00
parent e480de9591
commit 7b0d1fbd2f
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicFractureDefinitionsDeleteAllFeature.cpp
View File

@ -71,7 +71,7 @@ void RicFractureDefinitionsDeleteAllFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
void RicFractureDefinitionsDeleteAllFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Delete All Fracture Definitions");
actionToSetup->setText("Delete All Fracture Templates");
actionToSetup->setIcon(QIcon(":/Erase.png"));
}

5
ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp
View File

@ -25,6 +25,8 @@
#include "RimFractureDefinitionCollection.h"
#include "RimProject.h"
#include "RiuMainWindow.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
@ -55,6 +57,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
fracDefColl->fractureDefinitions.push_back(fractureDef);
fracDefColl->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fractureDef);
}
@ -69,7 +72,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
void RicNewFractureDefinitionFeature::setupActionLook(QAction* actionToSetup)
{
// actionToSetup->setIcon(QIcon(":/CrossSection16x16.png"));
actionToSetup->setText("New Fracture Definition");
actionToSetup->setText("New Fracture Template");
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp
View File

@ -44,9 +44,9 @@ CAF_PDM_SOURCE_INIT(RimFractureDefinition, "FractureDefinition");
//--------------------------------------------------------------------------------------------------
RimFractureDefinition::RimFractureDefinition(void)
{
CAF_PDM_InitObject("Fracture definition", "", "", "");
CAF_PDM_InitObject("Fracture Template", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Definition Name"), "Name", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Template Name"), "Name", "", "", "");
CAF_PDM_InitField(&halfLength, "HalfLength", 650.0f, "Fracture Halflength X_f", "", "", "");
CAF_PDM_InitField(&height, "Height", 75.0f, "Fracture Height", "", "", "");
@ -79,7 +79,7 @@ void RimFractureDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
geometryGroup->add(&orientation);
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fracture definition");
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fracture template");
group->add(&permeability);
group->add(&skinFactor);

2
ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimFractureDefinitionCollection, "FractureDefinitionCollecti
//--------------------------------------------------------------------------------------------------
RimFractureDefinitionCollection::RimFractureDefinitionCollection(void)
{
CAF_PDM_InitObject("Fracture Definition Collection", "", "", "");
CAF_PDM_InitObject("Fracture Templates", "", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");

2
ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimSimWellFractureCollection, "SimWellFractureCollection");
//--------------------------------------------------------------------------------------------------
RimSimWellFractureCollection::RimSimWellFractureCollection(void)
{
CAF_PDM_InitObject("Fracture Collection", "", "", "");
CAF_PDM_InitObject("Fractures", "", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");

2
ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimWellPathFractureCollection, "WellPathFractureCollection")
//--------------------------------------------------------------------------------------------------
RimWellPathFractureCollection::RimWellPathFractureCollection(void)
{
CAF_PDM_InitObject("Fracture Collection", "", "", "");
CAF_PDM_InitObject("Fractures", "", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");