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

Remove "Separate" from result UI texts

Browse Source
This commit is contained in:
Magne Sjaastad
2021-10-05 15:28:38 +02:00
parent d8a2bfef54
commit 414b0601c1
6 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/CrossSectionCommands/RicAppendSeparateIntersectionResultFeature.cpp
View File

@@ -64,7 +64,7 @@ void RicAppendSeparateIntersectionResultFeature::onActionTriggered( bool isCheck
//--------------------------------------------------------------------------------------------------
void RicAppendSeparateIntersectionResultFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "New Separate Result" );
actionToSetup->setText( "New Result Definition" );
actionToSetup->setIcon( QIcon( ":/CellResult.png" ) );
}

2
ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp
View File

@@ -35,7 +35,7 @@ CAF_PDM_SOURCE_INIT( RimEclipseFaultColors, "RimFaultResultSlot" );
//--------------------------------------------------------------------------------------------------
RimEclipseFaultColors::RimEclipseFaultColors()
{
CAF_PDM_InitObject( "Separate Fault Result", ":/draw_style_faults_24x24.png", "", "" );
CAF_PDM_InitObject( "Fault Result", ":/draw_style_faults_24x24.png", "", "" );
CAF_PDM_InitField( &showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", "" );
showCustomFaultResult.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -159,7 +159,7 @@ RimEclipseView::RimEclipseView()
m_elementVectorResult = new RimElementVectorResult;
m_elementVectorResult.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_faultResultSettings, "FaultResultSettings", "Separate Fault Result", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_faultResultSettings, "FaultResultSettings", "Fault Result", "", "", "" );
m_faultResultSettings = new RimEclipseFaultColors();
m_faultResultSettings.uiCapability()->setUiHidden( true );

11
ApplicationLibCode/ProjectDataModel/RimGridView.cpp
View File

@@ -81,22 +81,17 @@ RimGridView::RimGridView()
CAF_PDM_InitFieldNoDefault( &m_intersectionResultDefCollection,
"IntersectionResultDefColl",
"Separate Intersection Results",
"Intersection Results",
"",
"",
"" );
m_intersectionResultDefCollection.uiCapability()->setUiTreeHidden( true );
m_intersectionResultDefCollection = new RimIntersectionResultsDefinitionCollection;
CAF_PDM_InitFieldNoDefault( &m_surfaceResultDefCollection,
"ReservoirSurfaceResultDefColl",
"Separate Surface Results",
"",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_surfaceResultDefCollection, "ReservoirSurfaceResultDefColl", "Surface Results", "", "", "" );
m_surfaceResultDefCollection.uiCapability()->setUiTreeHidden( true );
m_surfaceResultDefCollection = new RimIntersectionResultsDefinitionCollection;
m_surfaceResultDefCollection->uiCapability()->setUiName( "Separate Surface Results" );
m_surfaceResultDefCollection->uiCapability()->setUiName( "Surface Results" );
m_surfaceResultDefCollection->uiCapability()->setUiIcon( caf::IconProvider( ":/ReservoirSurface16x16.png" ) );
CAF_PDM_InitFieldNoDefault( &m_gridCollection, "GridCollection", "GridCollection", "", "", "" );

2
ApplicationLibCode/ProjectDataModel/RimIntersection.cpp
View File

@@ -148,7 +148,7 @@ void RimIntersection::defineSeparateDataSourceUi( QString uiConfigName, caf::Pdm
}
caf::PdmUiGroup* separateResultsGroup =
uiOrdering.addNewGroupWithKeyword( "Separate Result Reference" + inactiveText, "SeparateResultReference" );
uiOrdering.addNewGroupWithKeyword( "Result Reference" + inactiveText, "SeparateResultReference" );
separateResultsGroup->setCollapsedByDefault( true );
separateResultsGroup->add( &m_useSeparateDataSource );
separateResultsGroup->add( &m_separateDataSource );

2
ApplicationLibCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.cpp
View File

@@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimIntersectionResultsDefinitionCollection, "RimIntersectio
//--------------------------------------------------------------------------------------------------
RimIntersectionResultsDefinitionCollection::RimIntersectionResultsDefinitionCollection()
{
CAF_PDM_InitObject( "Separate Intersection Results", ":/CrossSections16x16.png", "", "" );
CAF_PDM_InitObject( "Intersection Results", ":/CrossSections16x16.png", "", "" );
CAF_PDM_InitField( &m_isActive, "isActive", false, "Active", "", "", "" );
m_isActive.uiCapability()->setUiHidden( true );