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

#7727 Well Path : Do not show context menu for tree nodes

Browse Source
This commit is contained in:
Magne Sjaastad 2021-05-26 15:47:07 +02:00
parent ec9713212e
commit f9ffd248f1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -169,6 +169,7 @@
#include "cafPdmUiItem.h" #include "cafPdmUiItem.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include "cafTreeNode.h"
#include "cvfAssert.h" #include "cvfAssert.h"
#include <QDir> #include <QDir>
@ -184,9 +185,6 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{ {
// QStringList commandIds;
caf::CmdFeatureMenuBuilder menuBuilder;
std::vector<caf::PdmUiItem*> uiItems; std::vector<caf::PdmUiItem*> uiItems;
caf::SelectionManager::instance()->selectedItems( uiItems ); caf::SelectionManager::instance()->selectedItems( uiItems );
@ -198,6 +196,10 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
} }
} }
if ( dynamic_cast<cafTreeNode*>( firstUiItem ) ) return {};
caf::CmdFeatureMenuBuilder menuBuilder;
if ( uiItems.size() == 1 ) if ( uiItems.size() == 1 )
{ {
if ( dynamic_cast<RimEclipseCaseCollection*>( firstUiItem ) ) if ( dynamic_cast<RimEclipseCaseCollection*>( firstUiItem ) )

2
ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp
View File

@ -76,8 +76,6 @@ void cafTreeNode::allReferencedObjectsRecursively( const cafTreeNode* node, std:
if ( auto obj = node->referencedObject() ) if ( auto obj = node->referencedObject() )
{ {
objects.push_back( obj ); objects.push_back( obj );
return;
} }
for ( auto c : node->childNodes() ) for ( auto c : node->childNodes() )