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

#4857 Fix context menus for linked views in co-vizualisation.

Browse Source
This commit is contained in:
Kristian Bendiksen 2019-10-24 09:55:55 +02:00
parent c02dc40780
commit 6c3847a2ac
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/ViewLink/RicLinkViewFeature.cpp
View File

@ -58,7 +58,7 @@ bool RicLinkViewFeature::isCommandEnabled()
else
{
// Link only the active view to an existing view link collection.
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( !activeView ) return false;
RimProject* proj = RiaApplication::instance()->project();
@ -97,7 +97,7 @@ void RicLinkViewFeature::onActionTriggered( bool isChecked )
}
else
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
RimGridView* gridView = dynamic_cast<RimGridView*>( activeView );
if ( gridView )
{

4
ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
View File

@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT( RicSetMasterViewFeature, "RicSetMasterViewFeature" );
//--------------------------------------------------------------------------------------------------
bool RicSetMasterViewFeature::isCommandEnabled()
{
RimGridView* activeView = RiaApplication::instance()->activeGridView();
RimGridView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( !activeView ) return false;
RimProject* proj = RiaApplication::instance()->project();
@ -68,7 +68,7 @@ bool RicSetMasterViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicSetMasterViewFeature::onActionTriggered( bool isChecked )
{
RimGridView* activeView = RiaApplication::instance()->activeGridView();
RimGridView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( !activeView ) return;
RimProject* proj = RiaApplication::instance()->project();

5
ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp
View File

@ -21,6 +21,7 @@
#include "RiaApplication.h"
#include "Rim3dView.h"
#include "RimGridView.h"
#include "RimProject.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
@ -37,7 +38,7 @@ CAF_CMD_SOURCE_INIT( RicShowLinkOptionsFeature, "RicShowLinkOptionsFeature" );
//--------------------------------------------------------------------------------------------------
bool RicShowLinkOptionsFeature::isCommandEnabled()
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( !activeView ) return false;
RimViewController* viewController = activeView->viewController();
@ -55,7 +56,7 @@ bool RicShowLinkOptionsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicShowLinkOptionsFeature::onActionTriggered( bool isChecked )
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( !activeView ) return;
RimViewController* viewController = activeView->viewController();

7
ApplicationCode/Commands/ViewLink/RicUnLinkViewFeature.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "Rim3dView.h"
#include "RimGridView.h"
#include "RimProject.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
@ -38,7 +39,8 @@ CAF_CMD_SOURCE_INIT( RicUnLinkViewFeature, "RicUnLinkViewFeature" );
//--------------------------------------------------------------------------------------------------
bool RicUnLinkViewFeature::isCommandEnabled()
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
;
if ( !activeView ) return false;
RimViewController* viewController = activeView->viewController();
@ -56,7 +58,8 @@ bool RicUnLinkViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicUnLinkViewFeature::onActionTriggered( bool isChecked )
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
Rim3dView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
;
if ( !activeView ) return;
RimViewController* viewController = activeView->viewController();