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 control flag in setCollapsedByDefault

Browse Source 
* Remove control flag in setCollapsedByDefault
* Set regions/annotations collapsed by default
This commit is contained in:
Magne Sjaastad 2022-08-19 05:18:36 -07:00
parent 07f0362298
commit 9f9e29ff8c
30 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeatureSettings.cpp
View File

@ -101,7 +101,7 @@ void RicSaveMultiPlotTemplateFeatureSettings::defineUiOrdering( QString uiConfig
{
auto group = uiOrdering.addNewGroup( "Persist Object Names" );
group->setCollapsedByDefault( true );
group->setCollapsedByDefault();
group->add( &m_persistObjectNameForWells );
group->add( &m_persistObjectNameGroups );
group->add( &m_persistObjectNameRegions );

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@ -293,7 +293,7 @@ void RicSummaryPlotEditorUi::defineUiOrdering( QString uiConfigName, caf::PdmUiO
uiOrdering.addNewGroupWithKeyword( "Curve Appearance Assignment", RiuSummaryCurveDefinitionKeywords::appearance() );
caf::PdmUiGroup* appearanceSubGroup = appearanceGroup->addNewGroup( "Appearance Type Assignment" );
appearanceSubGroup->setCollapsedByDefault( true );
appearanceSubGroup->setCollapsedByDefault();
appearanceSubGroup->add( &m_useAutoAppearanceAssignment );
appearanceSubGroup->add( &m_caseAppearanceType );
@ -316,7 +316,7 @@ void RicSummaryPlotEditorUi::defineUiOrdering( QString uiConfigName, caf::PdmUiO
// Name config
caf::PdmUiGroup* autoNameGroup = uiOrdering.addNewGroupWithKeyword( "Plot and Curve Name Configuration",
RiuSummaryCurveDefinitionKeywords::nameConfig() );
autoNameGroup->setCollapsedByDefault( true );
autoNameGroup->setCollapsedByDefault();
autoNameGroup->add( &m_useAutoPlotTitleProxy );

4
ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp
View File

@ -405,12 +405,12 @@ void RimPolygonFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
}
group2->add( &m_lockPolygonToPlane );
if ( m_lockPolygonToPlane ) group2->add( &m_polygonPlaneDepth );
group2->setCollapsedByDefault( true );
group2->setCollapsedByDefault();
auto group3 = uiOrdering.addNewGroup( "Advanced Filter Settings" );
group3->add( &m_enableKFilter );
group3->add( &m_kFilterStr );
group3->setCollapsedByDefault( true );
group3->setCollapsedByDefault();
uiOrdering.skipRemainingFields( true );

1
ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp
View File

@ -64,7 +64,6 @@ void RimUserDefinedFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
RimCellFilter::defineUiOrdering( uiConfigName, uiOrdering );
auto group = uiOrdering.addNewGroup( QString( "Cell Indexes (I J K) to " ) + modeString() );
group->setCollapsedByDefault( false );
group->add( &m_individualCellIndices );
uiOrdering.skipRemainingFields( true );

2
ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@ -476,7 +476,7 @@ void RimEllipseFractureTemplate::defineUiOrdering( QString uiConfigName, caf::Pd
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Fracture Truncation" );
group->setCollapsedByDefault( true );
group->setCollapsedByDefault();
m_fractureContainment()->uiOrdering( uiConfigName, *group );
}

2
ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp
View File

@ -629,7 +629,7 @@ void RimFishbones::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& u
{
caf::PdmUiGroup* mswGroup = uiOrdering.addNewGroup( "Lateral Multi Segment Wells" );
mswGroup->setCollapsedByDefault( true );
mswGroup->setCollapsedByDefault();
mswGroup->add( &m_lateralTubingDiameter );
mswGroup->add( &m_lateralOpenHoleRoghnessFactor );
mswGroup->add( &m_lateralTubingRoghnessFactor );

4
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@ -366,7 +366,7 @@ void RimFractureTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
{
auto group = uiOrdering.addNewGroup( "Sensitivity Scale Factors" );
group->setCollapsedByDefault( true );
group->setCollapsedByDefault();
group->add( &m_heightScaleFactor );
group->add( &m_halfLengthScaleFactor );
group->add( &m_dFactorScaleFactor );
@ -414,7 +414,7 @@ void RimFractureTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
{
auto group = nonDarcyFlowGroup->addNewGroup( "D Factor Details" );
group->setCollapsedByDefault( true );
group->setCollapsedByDefault();
group->add( &m_dFactorSummaryText );
}
}

2
ApplicationLibCode/ProjectDataModel/Completions/RimMeshFractureTemplate.cpp
View File

@ -489,7 +489,7 @@ void RimMeshFractureTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUi
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Fracture Truncation" );
group->setCollapsedByDefault( true );
group->setCollapsedByDefault();
m_fractureContainment()->uiOrdering( uiConfigName, *group );
}

2
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp
View File

@ -181,7 +181,7 @@ void RimWellPathAicdParameters::defineUiOrdering( QString uiConfigName, caf::Pdm
additionalGroup->add( &m_aicdParameterFields[(AICDParameters)i] );
m_aicdParameterFields[(AICDParameters)i].uiCapability()->setUiReadOnly( readOnly );
}
additionalGroup->setCollapsedByDefault( true );
additionalGroup->setCollapsedByDefault();
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
View File

@ -296,14 +296,14 @@ void RimFaultInViewCollection::uiOrderingFaults( QString uiConfigName, caf::PdmU
showOppositeFaultFaces.uiCapability()->setUiReadOnly( isGridVizMode );
caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup( "Fault Face Visibility" );
ffviz->setCollapsedByDefault( true );
ffviz->setCollapsedByDefault();
ffviz->add( &showFaultFaces );
ffviz->add( &showOppositeFaultFaces );
ffviz->add( &faultResult );
ffviz->add( &m_onlyShowWithNeighbor );
caf::PdmUiGroup* nncViz = uiOrdering.addNewGroup( "NNC Visibility" );
nncViz->setCollapsedByDefault( true );
nncViz->setCollapsedByDefault();
nncViz->add( &showNNCs );
nncViz->add( &hideNncsWhenNoResultIsAvailable );
}

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@ -978,7 +978,7 @@ void RimWellPltPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
uiOrderingForDepthAxis( uiConfigName, *depthGroup );
caf::PdmUiGroup* plotLayoutGroup = uiOrdering.addNewGroup( "Plot Layout" );
plotLayoutGroup->setCollapsedByDefault( true );
plotLayoutGroup->setCollapsedByDefault();
RimWellLogPlot::uiOrderingForAutoName( uiConfigName, *plotLayoutGroup );
RimWellLogPlot::uiOrderingForPlotLayout( uiConfigName, *plotLayoutGroup );
}

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@ -975,7 +975,7 @@ void RimWellRftPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
uiOrderingForDepthAxis( uiConfigName, *depthGroup );
caf::PdmUiGroup* plotLayoutGroup = uiOrdering.addNewGroup( "Plot Layout" );
plotLayoutGroup->setCollapsedByDefault( true );
plotLayoutGroup->setCollapsedByDefault();
RimWellLogPlot::uiOrderingForAutoName( uiConfigName, *plotLayoutGroup );
RimWellLogPlot::uiOrderingForPlotLayout( uiConfigName, *plotLayoutGroup );
plotLayoutGroup->add( &m_depthOrientation );

2
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
View File

@ -1140,7 +1140,7 @@ void RimGeoMechCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
shearSlipIndicatorGroup->add( &m_waterDensityShearSlipIndicator );
caf::PdmUiGroup* timeStepFilterGroup = uiOrdering.addNewGroup( "Time Step Filter" );
timeStepFilterGroup->setCollapsedByDefault( true );
timeStepFilterGroup->setCollapsedByDefault();
m_timeStepFilter->uiOrdering( uiConfigName, *timeStepFilterGroup );
}

2
ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp
View File

@ -528,7 +528,7 @@ void RimExtrudedCurveIntersection::defineUiOrdering( QString uiConfigName, caf::
}
caf::PdmUiGroup* optionsGroup = uiOrdering.addNewGroup( "Options" );
optionsGroup->setCollapsedByDefault( true );
optionsGroup->setCollapsedByDefault();
if ( type() == CrossSectionEnum::CS_AZIMUTHLINE )
{

2
ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp
View File

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

2
ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@ -555,7 +555,7 @@ void RimEclipseContourMapProjection::defineUiOrdering( QString uiConfigName, caf
caf::PdmUiGroup* weightingGroup = uiOrdering.addNewGroup( "Mean Weighting Options" );
weightingGroup->add( &m_weightByParameter );
weightingGroup->setCollapsedByDefault( true );
weightingGroup->setCollapsedByDefault();
m_weightByParameter.uiCapability()->setUiReadOnly( !isMeanResult() );
if ( !isMeanResult() )

2
ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -605,7 +605,7 @@ void RimEclipseResultCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->maxTimeStepCount() > 0 )
{
auto group1 = uiOrdering.addNewGroup( "Time Step Filter" );
group1->setCollapsedByDefault( true );
group1->setCollapsedByDefault();
m_timeStepFilter->uiOrdering( uiConfigName, *group1 );
}
}

2
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@ -589,7 +589,7 @@ void RimGridTimeHistoryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUi
RimPlotCurve::appearanceUiOrdering( *appearanceGroup );
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
nameGroup->setCollapsedByDefault( true );
nameGroup->setCollapsedByDefault();
nameGroup->add( &m_showLegend );
RimPlotCurve::curveNameUiOrdering( *nameGroup );
}

4
ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@ -680,7 +680,7 @@ void RimSimWellInViewCollection::defineUiOrdering( QString uiConfigName, caf::Pd
sizeScalingGroup->add( &spheresScaleFactor );
caf::PdmUiGroup* colorGroup = uiOrdering.addNewGroup( "Colors" );
colorGroup->setCollapsedByDefault( true );
colorGroup->setCollapsedByDefault();
colorGroup->add( &showConnectionStatusColors );
colorGroup->add( &wellLabelColor );
colorGroup->add( &m_wellPipeColors );
@ -696,7 +696,7 @@ void RimSimWellInViewCollection::defineUiOrdering( QString uiConfigName, caf::Pd
if ( !isContourMap )
{
caf::PdmUiGroup* advancedGroup = uiOrdering.addNewGroup( "Advanced" );
advancedGroup->setCollapsedByDefault( true );
advancedGroup->setCollapsedByDefault();
advancedGroup->add( &wellCellTransparencyLevel );
advancedGroup->add( &wellHeadPosition );
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp
View File

@ -185,7 +185,7 @@ void RimAsciiDataCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderi
RimPlotCurve::appearanceUiOrdering( *appearanceGroup );
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
nameGroup->setCollapsedByDefault( true );
nameGroup->setCollapsedByDefault();
nameGroup->add( &m_showLegend );
RimPlotCurve::curveNameUiOrdering( *nameGroup );

2
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -856,7 +856,7 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
{
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
nameGroup->setCollapsedByDefault( true );
nameGroup->setCollapsedByDefault();
nameGroup->add( &m_isUsingAutoName );
if ( m_isUsingAutoName )
{

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -879,7 +879,7 @@ void RimSummaryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
RimPlotCurve::appearanceUiOrdering( *appearanceGroup );
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
nameGroup->setCollapsedByDefault( true );
nameGroup->setCollapsedByDefault();
nameGroup->add( &m_showLegend );
RimPlotCurve::curveNameUiOrdering( *nameGroup );

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@ -446,7 +446,7 @@ void RimSummaryCurveAutoName::defineUiOrdering( QString uiConfigName, caf::PdmUi
uiOrdering.add( &m_wellName );
caf::PdmUiGroup& advanced = *( uiOrdering.addNewGroup( "Advanced" ) );
advanced.setCollapsedByDefault( true );
advanced.setCollapsedByDefault();
advanced.add( &m_regionNumber );
advanced.add( &m_lgrName );
advanced.add( &m_completion );

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
View File

@ -402,27 +402,27 @@ void RimSummaryMultiPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
plotVisibilityFilterGroup->add( &m_hidePlotsWithValuesBelow );
auto dataSourceGroup = uiOrdering.addNewGroup( "Data Source" );
dataSourceGroup->setCollapsedByDefault( true );
dataSourceGroup->setCollapsedByDefault();
m_sourceStepping()->uiOrdering( uiConfigName, *dataSourceGroup );
if ( m_sourceStepping->stepDimension() == SourceSteppingDimension::WELL )
dataSourceGroup->add( &m_allow3DSelectionLink );
auto titlesGroup = uiOrdering.addNewGroup( "Main Plot Settings" );
titlesGroup->setCollapsedByDefault( true );
titlesGroup->setCollapsedByDefault();
titlesGroup->add( &m_autoPlotTitle );
titlesGroup->add( &m_showPlotWindowTitle );
titlesGroup->add( &m_plotWindowTitle );
titlesGroup->add( &m_titleFontSize );
auto subPlotSettingsGroup = uiOrdering.addNewGroup( "Sub Plot Settings" );
subPlotSettingsGroup->setCollapsedByDefault( true );
subPlotSettingsGroup->setCollapsedByDefault();
subPlotSettingsGroup->add( &m_autoSubPlotTitle );
subPlotSettingsGroup->add( &m_showIndividualPlotTitles );
subPlotSettingsGroup->add( &m_subTitleFontSize );
auto legendsGroup = uiOrdering.addNewGroup( "Legends" );
legendsGroup->setCollapsedByDefault( true );
legendsGroup->setCollapsedByDefault();
legendsGroup->add( &m_showPlotLegends );
legendsGroup->add( &m_plotLegendsHorizontal );
legendsGroup->add( &m_legendPosition );

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@ -623,7 +623,7 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf::
if ( m_timeMode() == DATE )
{
caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" );
advancedGroup->setCollapsedByDefault( true );
advancedGroup->setCollapsedByDefault();
if ( m_automaticDateComponents() || m_dateComponents() != RiaDefines::DateFormatComponents::DATE_FORMAT_NONE )
{
advancedGroup->add( &m_dateFormat );

2
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
View File

@ -484,7 +484,7 @@ void RimEnsembleWellLogCurveSet::defineUiOrdering( QString uiConfigName, caf::Pd
{
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
nameGroup->setCollapsedByDefault( true );
nameGroup->setCollapsedByDefault();
nameGroup->add( &m_isUsingAutoName );
if ( m_isUsingAutoName )
{

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp
View File

@ -807,7 +807,7 @@ void RimWellLogExtractionCurve::defineUiOrdering( QString uiConfigName, caf::Pdm
RimPlotCurve::appearanceUiOrdering( *appearanceGroup );
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
nameGroup->setCollapsedByDefault( true );
nameGroup->setCollapsedByDefault();
nameGroup->add( &m_showLegend );
RimPlotCurve::curveNameUiOrdering( *nameGroup );

3
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
View File

@ -1923,6 +1923,7 @@ void RimWellLogTrack::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
uiOrdering.add( &m_colSpan );
caf::PdmUiGroup* annotationGroup = uiOrdering.addNewGroup( "Regions/Annotations" );
annotationGroup->setCollapsedByDefault();
annotationGroup->add( &m_regionAnnotationType );
annotationGroup->add( &m_regionAnnotationDisplay );
@ -2373,7 +2374,7 @@ std::vector<RimWellLogCurve*> RimWellLogTrack::visibleCurves() const
void RimWellLogTrack::uiOrderingForRftPltFormations( caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup( "Zonation/Formation Names" );
formationGroup->setCollapsedByDefault( true );
formationGroup->setCollapsedByDefault();
formationGroup->add( &m_regionAnnotationType );
formationGroup->add( &m_regionAnnotationDisplay );
formationGroup->add( &m_formationSource );

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiGroup.cpp
View File

@ -82,9 +82,9 @@ bool PdmUiGroup::isUiGroup() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiGroup::setCollapsedByDefault( bool doCollapse )
void PdmUiGroup::setCollapsedByDefault()
{
m_isCollapsedByDefault = doCollapse;
m_isCollapsedByDefault = true;
}
//--------------------------------------------------------------------------------------------------

5
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiGroup.h
View File

@ -56,8 +56,9 @@ public:
bool isUiGroup() const override;
/// Set this group to be collapsed by default. When the user expands the group, the default no longer has any effect.
void setCollapsedByDefault( bool doCollapse );
/// Forcifully set the collapsed state of the group, overriding the previous user actions and the default
void setCollapsedByDefault();
/// Set the collapsed state of the group, overriding the previous user actions and the default
void setCollapsed( bool doCollapse );
void setEnableFrame( bool enableFrame );