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

(#660) Use Intersection to be aligned with concept naming in other tools

Browse Source
This commit is contained in:
Magne Sjaastad 2015-11-23 09:07:35 +01:00
parent 4971304bf9
commit dc1a66d2cc
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp
View File

@ -59,7 +59,7 @@ void RicAppendCrossSectionFeature::onActionTriggered(bool isChecked)
void RicAppendCrossSectionFeature::setupActionLook(QAction* actionToSetup)
{
// actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
actionToSetup->setText("New Cross Section");
actionToSetup->setText("New Intersection");
}
//--------------------------------------------------------------------------------------------------
@ -83,7 +83,7 @@ RicAppendCrossSectionFeatureCmd::~RicAppendCrossSectionFeatureCmd()
//--------------------------------------------------------------------------------------------------
QString RicAppendCrossSectionFeatureCmd::name()
{
return "New Cross Section";
return "New Intersection";
}
//--------------------------------------------------------------------------------------------------
@ -94,7 +94,7 @@ void RicAppendCrossSectionFeatureCmd::redo()
CVF_ASSERT(m_crossSectionCollection);
RimCrossSection* crossSection = new RimCrossSection();
crossSection->name = QString("Cross Section");
crossSection->name = QString("Intersection");
m_crossSectionCollection->appendCrossSection(crossSection);
}

4
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellCrossSectionFeature.cpp
View File

@ -66,7 +66,7 @@ void RicNewSimWellCrossSectionFeature::onActionTriggered(bool isChecked)
void RicNewSimWellCrossSectionFeature::setupActionLook(QAction* actionToSetup)
{
// actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
actionToSetup->setText("New Cross Section");
actionToSetup->setText("New Intersection");
}
//--------------------------------------------------------------------------------------------------
@ -91,7 +91,7 @@ RicNewSimWellCrossSectionCmd::~RicNewSimWellCrossSectionCmd()
//--------------------------------------------------------------------------------------------------
QString RicNewSimWellCrossSectionCmd::name()
{
return "Create Cross Section From Well";
return "Create Intersection From Well";
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp
View File

@ -75,7 +75,7 @@ void RicNewWellPathCrossSectionFeature::onActionTriggered(bool isChecked)
void RicNewWellPathCrossSectionFeature::setupActionLook(QAction* actionToSetup)
{
// actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
actionToSetup->setText("New Cross Section");
actionToSetup->setText("New Intersection");
}
//--------------------------------------------------------------------------------------------------
@ -100,7 +100,7 @@ RicNewWellPathCrossSectionFeatureCmd::~RicNewWellPathCrossSectionFeatureCmd()
//--------------------------------------------------------------------------------------------------
QString RicNewWellPathCrossSectionFeatureCmd::name()
{
return "Create Cross Section From Well Path";
return "Create Intersection From Well Path";
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimCrossSection.cpp
View File

@ -60,9 +60,9 @@ CAF_PDM_SOURCE_INIT(RimCrossSection, "CrossSection");
//--------------------------------------------------------------------------------------------------
RimCrossSection::RimCrossSection()
{
CAF_PDM_InitObject("Cross Section", "", "", "");
CAF_PDM_InitObject("Intersection", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Cross Section Name"), "Name", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Intersection Name"), "Name", "", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
isActive.uiCapability()->setUiHidden(true);

4
ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp
View File

@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT(RimCrossSectionCollection, "CrossSectionCollection");
//--------------------------------------------------------------------------------------------------
RimCrossSectionCollection::RimCrossSectionCollection()
{
CAF_PDM_InitObject("Cross Sections", ":/undefined_image.png", "", "");
CAF_PDM_InitObject("Intersections", ":/undefined_image.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_crossSections, "CrossSections", "Cross Sections", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_crossSections, "CrossSections", "Intersections", "", "", "");
m_crossSections.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");

3
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -117,13 +117,12 @@ RimView::RimView(void)
m_overrideRangeFilterCollection.xmlCapability()->setIOWritable(false);
m_overrideRangeFilterCollection.xmlCapability()->setIOReadable(false);
CAF_PDM_InitFieldNoDefault(&crossSectionCollection, "CrossSections", "Cross Sections", "", "", "");
CAF_PDM_InitFieldNoDefault(&crossSectionCollection, "CrossSections", "Intersections", "", "", "");
crossSectionCollection.uiCapability()->setUiHidden(true);
crossSectionCollection = new RimCrossSectionCollection();
m_previousGridModeMeshLinesWasFaults = false;
m_crossSectionModel = new cvf::ModelBasicList;
m_crossSectionModel->setName("CrossSectionModel");