From 7b0d1fbd2f10e75d5818b960b6992fcd7dc8d482 Mon Sep 17 00:00:00 2001 From: astridkbjorke Date: Wed, 4 Jan 2017 10:17:54 +0100 Subject: [PATCH] pre-proto - Changed naming of fracture definitions to fracture templates and Fracture collection to fractures in gui --- .../Commands/RicFractureDefinitionsDeleteAllFeature.cpp | 2 +- .../Commands/RicNewFractureDefinitionFeature.cpp | 5 ++++- ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp | 6 +++--- .../ProjectDataModel/RimFractureDefinitionCollection.cpp | 2 +- .../ProjectDataModel/RimSimWellFractureCollection.cpp | 2 +- .../ProjectDataModel/RimWellPathFractureCollection.cpp | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/Commands/RicFractureDefinitionsDeleteAllFeature.cpp b/ApplicationCode/Commands/RicFractureDefinitionsDeleteAllFeature.cpp index 10c78df425..e858e585ad 100644 --- a/ApplicationCode/Commands/RicFractureDefinitionsDeleteAllFeature.cpp +++ b/ApplicationCode/Commands/RicFractureDefinitionsDeleteAllFeature.cpp @@ -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")); } diff --git a/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp b/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp index e98913b408..fca0f83a40 100644 --- a/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp +++ b/ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp @@ -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"); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp b/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp index 7ab7f7fb93..ff50f563f5 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp @@ -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); diff --git a/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp index f1b4ec4479..44c1c668cc 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp @@ -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", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp b/ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp index 40f0818604..93b890d405 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp @@ -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", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp index 974f190423..91e4ec81e4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp @@ -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", "", "", "");