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

#4892 Avoid comparison view accidentally added when linking views

Browse Source
This commit is contained in:
Jacob Støren
2019-10-28 12:57:40 +01:00
parent 26a5b4fbae
commit 3710b4ba58
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -490,7 +490,7 @@ void RimViewLinker::updateCursorPosition( const RimGridView* sourceView, const c
//--------------------------------------------------------------------------------------------------
void RimViewLinker::notifyManagedViewChange( RimGridView* oldManagedView, RimGridView* newManagedView )
{
if ( oldManagedView == m_comparisonView )
if ( oldManagedView && ( oldManagedView == m_comparisonView ) )
{
m_comparisonView = newManagedView;
m_comparisonView.uiCapability()->updateConnectedEditors();
@@ -530,7 +530,7 @@ QList<caf::PdmOptionItemInfo> RimViewLinker::calculateValueOptions( const caf::P
}
}
if ( !isActiveCompViewInList )
if ( !isActiveCompViewInList && actualComparisonView != nullptr )
{
// Add the actually used comparison view to the option list, even though it is not one of the linked views
options.push_front( caf::PdmOptionItemInfo( actualComparisonView->autoName(),
@@ -604,10 +604,13 @@ void RimViewLinker::addDependentView( RimGridView* view )
{
CVF_ASSERT( view && view != m_masterView );
RimViewController* viewContr = new RimViewController;
this->m_viewControllers.push_back( viewContr );
if ( !view->viewController() )
{
RimViewController* viewContr = new RimViewController;
this->m_viewControllers.push_back( viewContr );
viewContr->setManagedView( view );
viewContr->setManagedView( view );
}
}
//--------------------------------------------------------------------------------------------------