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 RicCreateGridCrossPlotFeature picking.

Browse Source
This commit is contained in:
Kristian Bendiksen
2019-10-22 15:15:25 +02:00
parent 41b58b9099
commit 9c4696046c
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp
View File

@@ -28,7 +28,9 @@
#include "RimProject.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuViewer.h"
#include "cafCmdFeatureManager.h"
#include "cafSelectionManager.h"
#include <QAction>
@@ -48,22 +50,26 @@ bool RicCreateGridCrossPlotFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicCreateGridCrossPlotFeature::onActionTriggered( bool isChecked )
{
RimProject* project = RiaApplication::instance()->project();
bool launchedFromPlotCollection = true;
RimGridCrossPlotCollection* collection = caf::SelectionManager::instance()
RimProject* project = RiaApplication::instance()->project();
RimGridCrossPlotCollection* collection = caf::SelectionManager::instance()
->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
if ( !collection )
{
collection = project->mainPlotCollection()->gridCrossPlotCollection();
launchedFromPlotCollection = false;
collection = project->mainPlotCollection()->gridCrossPlotCollection();
}
RimGridCrossPlot* plot = collection->createGridCrossPlot();
RimGridCrossPlotDataSet* dataSet = plot->createDataSet();
if ( !launchedFromPlotCollection )
auto contextViewer = dynamic_cast<RiuViewer*>( caf::CmdFeatureManager::instance()->currentContextMenuTargetWidget() );
if ( contextViewer != nullptr )
{
dataSet->setCellFilterView( RiaApplication::instance()->activeGridView() );
// Command is triggered from viewer
dataSet->setCellFilterView( RiaApplication::instance()->activeMainOrComparisonGridView() );
}
else
{
// Triggered from context menu: get the selected view
// TODO: get the filter from somewhere
}
plot->loadDataAndUpdate();
@@ -80,15 +86,17 @@ void RicCreateGridCrossPlotFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
void RicCreateGridCrossPlotFeature::setupActionLook( QAction* actionToSetup )
{
RimGridCrossPlotCollection* collection = caf::SelectionManager::instance()
->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
if ( !collection )
auto contextViewer = dynamic_cast<RiuViewer*>( caf::CmdFeatureManager::instance()->currentContextMenuTargetWidget() );
if ( contextViewer != nullptr )
{
// Command is triggered from viewer
actionToSetup->setText( "Create Grid Cross Plot from 3d View" );
}
else
{
// Command triggered from project tree or file menu
actionToSetup->setText( "Create Grid Cross Plot" );
}
actionToSetup->setIcon( QIcon( ":/SummaryXPlotsLight16x16.png" ) );
}