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

#4858 Remove unused time step link option from comparison view settings.

Browse Source
This commit is contained in:
Jacob Støren
2019-10-22 13:54:10 +02:00
parent 016f26725a
commit d802edc145
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@@ -131,13 +131,6 @@ Rim3dView::Rim3dView( void )
CAF_PDM_InitField( &m_isComparisonViewEnabled, "EnableComparisonView", false, "Enable", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_comparisonView, "ComparisonView", "Comparison View", "", "", "" );
CAF_PDM_InitField( &m_isComparisonViewLinkingTimestep,
"EnableComparisonViewTimestepLinking",
true,
"Link Timestep",
"",
"",
"" );
m_crossSectionVizModel = new cvf::ModelBasicList;
m_crossSectionVizModel->setName( "CrossSectionModel" );
@@ -339,7 +332,6 @@ void Rim3dView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOr
caf::PdmUiGroup* compViewGroup = uiOrdering.addNewGroup( "Comparison View" );
compViewGroup->add( &m_isComparisonViewEnabled );
compViewGroup->add( &m_comparisonView );
compViewGroup->add( &m_isComparisonViewLinkingTimestep );
uiOrdering.skipRemainingFields( true );
}
@@ -825,13 +817,7 @@ void Rim3dView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
createDisplayModelAndRedraw();
}
}
else if ( changedField == &m_isComparisonViewLinkingTimestep )
{
if ( m_isComparisonViewEnabled() && m_comparisonView() )
{
createDisplayModelAndRedraw();
}
}
}
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -321,5 +321,4 @@ private:
caf::PdmField<bool> m_showZScaleLabel;
caf::PdmField<bool> m_isComparisonViewEnabled;
caf::PdmPtrField<Rim3dView*> m_comparisonView;
caf::PdmField<bool> m_isComparisonViewLinkingTimestep;
};

4
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -317,9 +317,9 @@ void RiuViewer::slotSetCurrentFrame( int frameIndex )
{
std::set<Rim3dView*> containingViews = view->viewsUsingThisAsComparisonView();
for ( auto view : containingViews )
for ( auto contView : containingViews )
{
view->updateCurrentTimeStepAndRedraw();
contView->updateCurrentTimeStepAndRedraw();
}
}
}