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

#3550 Allow linking of selected views

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-10-24 13:45:46 +02:00
parent b316e1ee83
commit 8ad1748597
2 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include "RimProject.h"
#include "Rim3dView.h"
#include "RimGridView.h"
#include "RimViewLinkerCollection.h"
#include "RimViewLinker.h"
@ -39,31 +40,37 @@ CAF_CMD_SOURCE_INIT(RicLinkViewFeature, "RicLinkViewFeature");
//--------------------------------------------------------------------------------------------------
bool RicLinkViewFeature::isCommandEnabled()
{
std::vector<caf::PdmUiItem*> allSelectedItems;
std::vector<RimGridView*> selectedGridViews;
caf::SelectionManager::instance()->selectedItems(allSelectedItems);
caf::SelectionManager::instance()->objectsByType(&selectedGridViews);
if (selectedGridViews.size() > 1u && allSelectedItems.size() == selectedGridViews.size())
{
return true;
}
else
{
// Link only the active view to an existing view link collection.
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RimProject* proj = RiaApplication::instance()->project();
RimViewLinker* viewLinker = proj->viewLinkerCollection->viewLinker();
if(!viewLinker) return false;
if (!viewLinker) return false;
RimViewController* viewController = activeView->viewController();
if(viewController)
if (viewController)
{
return false;
}
else
{
if (!activeView->isMasterView())
else if (!activeView->isMasterView())
{
return true;
}
else
{
}
return false;
}
}
}
//--------------------------------------------------------------------------------------------------
@ -71,13 +78,25 @@ bool RicLinkViewFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicLinkViewFeature::onActionTriggered(bool isChecked)
{
RimGridView* activeView = RiaApplication::instance()->activeGridView();
if (!activeView) return;
std::vector<caf::PdmUiItem*> allSelectedItems;
std::vector<RimGridView*> selectedGridViews;
caf::SelectionManager::instance()->selectedItems(allSelectedItems);
caf::SelectionManager::instance()->objectsByType(&selectedGridViews);
if (selectedGridViews.size() > 1u && allSelectedItems.size() == selectedGridViews.size())
{
RicLinkVisibleViewsFeature::linkViews(selectedGridViews);
}
else
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
RimGridView* gridView = dynamic_cast<RimGridView*>(activeView);
if (gridView)
{
std::vector<RimGridView*> views;
views.push_back(activeView);
views.push_back(gridView);
RicLinkVisibleViewsFeature::linkViews(views);
}
}
}
//--------------------------------------------------------------------------------------------------
@ -85,7 +104,16 @@ void RicLinkViewFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
void RicLinkViewFeature::setupActionLook(QAction* actionToSetup)
{
std::vector<RimGridView*> selectedGridViews;
caf::SelectionManager::instance()->objectsByType(&selectedGridViews);
if (selectedGridViews.size() > 1u)
{
actionToSetup->setText("Link Selected Views");
}
else
{
actionToSetup->setText("Link View");
}
actionToSetup->setIcon(QIcon(":/chain.png"));
}

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -683,7 +683,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "Separator";
menuBuilder << "RicLinkVisibleViewsFeature";
menuBuilder << "RicLinkViewFeature";
menuBuilder << "RicShowLinkOptionsFeature";
menuBuilder << "RicSetMasterViewFeature";
menuBuilder << "RicUnLinkViewFeature";
@ -699,13 +698,14 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
// is aware of multiple selected items, move the command to this list
// without using dyncamic_cast.
menuBuilder << "RicPasteTimeHistoryCurveFeature";
menuBuilder << "RicPasteAsciiDataCurveFeature";
menuBuilder << "RicPasteSummaryCaseFeature";
menuBuilder.addSeparator();
menuBuilder << "RicCopyReferencesToClipboardFeature";
menuBuilder << "RicLinkViewFeature";
menuBuilder << "RicShowPlotDataFeature";
menuBuilder << "RicShowTotalAllocationDataFeature";