#4316 Fix context menu with multiple selected well paths

ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp

@@ -95,9 +95,13 @@ void RicNewFishbonesSubsFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 RimFishbonesCollection* RicNewFishbonesSubsFeature::selectedFishbonesCollection()
 {
+    std::vector<caf::PdmUiItem*> allSelectedItems;
+    caf::SelectionManager::instance()->selectedItems(allSelectedItems);
+    if (allSelectedItems.size() != 1u) return false;
+
     RimFishbonesCollection* objToFind = nullptr;
     
-    caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem();
+    caf::PdmUiItem* pdmUiItem = allSelectedItems.front();
 
     caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(pdmUiItem);
     if (objHandle)

ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp

@@ -83,31 +83,29 @@ void RicNewPerforationIntervalFeature::setupActionLook(QAction* actionToSetup)
 /// 
 //--------------------------------------------------------------------------------------------------
 RimPerforationCollection* RicNewPerforationIntervalFeature::selectedPerforationCollection()
-{
+{    
-    RimPerforationCollection* objToFind = nullptr;
+    std::vector<caf::PdmUiItem*> selectedItems;
-    
+    caf::SelectionManager::instance()->selectedItems(selectedItems);
-    caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem();
+    if (selectedItems.size() != 1u) return nullptr;
 
+    caf::PdmUiItem* pdmUiItem = selectedItems.front();
+
+    RimPerforationCollection* perforationCollection = nullptr;
     caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(pdmUiItem);
     if (objHandle)
     {
-        objHandle->firstAncestorOrThisOfType(objToFind);
+        objHandle->firstAncestorOrThisOfType(perforationCollection);
-    }
+
+        if (perforationCollection)
+            return perforationCollection;
+        
+        RimWellPath* wellPath = dynamic_cast<RimWellPath*>(objHandle);
+        if (wellPath)
+            return wellPath->perforationIntervalCollection();
 
-    if (objToFind == nullptr)
-    {
-        std::vector<RimWellPath*> wellPaths;
-        caf::SelectionManager::instance()->objectsByType(&wellPaths);
-        if (!wellPaths.empty())
-        {
-            return wellPaths[0]->perforationIntervalCollection();
-        }
         RimWellPathCompletions* completions = caf::SelectionManager::instance()->selectedItemOfType<RimWellPathCompletions>();
         if (completions)
-        {
             return completions->perforationCollection();
-        }
     }
-
+    return nullptr;
-    return objToFind;
 }

ApplicationCode/Commands/CompletionCommands/RicNewValveFeature.cpp

@@ -18,7 +18,11 @@ CAF_CMD_SOURCE_INIT(RicNewValveFeature, "RicNewValveFeature");
 //--------------------------------------------------------------------------------------------------
 bool RicNewValveFeature::isCommandEnabled()
 {
-    const RimPerforationInterval* perfInterval = caf::SelectionManager::instance()->selectedItemOfType<RimPerforationInterval>();
+    std::vector<caf::PdmUiItem*> allSelectedItems;
+    caf::SelectionManager::instance()->selectedItems(allSelectedItems);
+    if (allSelectedItems.size() != 1u) return false;
+
+    const RimPerforationInterval* perfInterval = dynamic_cast<RimPerforationInterval*>(allSelectedItems.front());
     return perfInterval != nullptr;
 }
 

ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp

@@ -149,9 +149,13 @@ bool RicNewWellPathFractureFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 RimWellPathFractureCollection* RicNewWellPathFractureFeature::selectedWellPathFractureCollection()
 {
+    std::vector<caf::PdmUiItem*> allSelectedItems;
+    caf::SelectionManager::instance()->selectedItems(allSelectedItems);
+    if (allSelectedItems.size() != 1u) return false;
+    
     RimWellPathFractureCollection* objToFind = nullptr;
 
-    caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem();
+    caf::PdmUiItem* pdmUiItem = allSelectedItems.front();
 
     caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(pdmUiItem);
     if (objHandle)

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -119,6 +119,7 @@
 #include "RiuMainWindow.h"
 
 #include "ToggleCommands/RicToggleItemsFeatureImpl.h"
+#include "OctaveScriptCommands/RicExecuteScriptForCasesFeature.h"
 
 #include "cafCmdFeature.h"
 #include "cafCmdFeatureManager.h"
@@ -128,10 +129,13 @@
 #include "cafSelectionManagerTools.h"
 #include "cvfAssert.h"
 
-#include <vector>
+#include <QIcon>
 #include <QMenu>
+#include <QString>
+#include <QStringList>
 #include <QDir>
-#include "OctaveScriptCommands/RicExecuteScriptForCasesFeature.h"
+
+#include <vector>
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -310,39 +314,15 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
         {
             menuBuilder << "RicNewEditableWellPathFeature";
             menuBuilder << "RicNewWellPathIntersectionFeature";
-            menuBuilder.subMenuStart("Create Completions", QIcon(":/CompletionsSymbol16x16.png"));
+            appendCreateCompletions(menuBuilder);
-            menuBuilder << "RicNewPerforationIntervalFeature";
-            menuBuilder << "RicEditPerforationCollectionFeature";
-            menuBuilder << "RicNewValveFeature";
-            menuBuilder << "RicNewFishbonesSubsFeature";
-            menuBuilder << "RicNewWellPathFractureFeature";
             menuBuilder.addSeparator();
-            menuBuilder << "RicCreateMultipleFracturesFeature";
+            appendImportMenu(menuBuilder);
             menuBuilder.addSeparator();
-            menuBuilder << "RicNewWellPathAttributeFeature";
-            menuBuilder.subMenuEnd();
-            menuBuilder << "RicCreateTemporaryLgrFeature";
-            menuBuilder.addSeparator();
-
-            menuBuilder.subMenuStart("Import");
-            menuBuilder << "RicWellPathsImportFileFeature";
-            menuBuilder << "RicWellPathFormationsImportFileFeature";
-            menuBuilder << "RicWellLogsImportFileFeature";
-            menuBuilder << "RicReloadWellPathFormationNamesFeature";
-            menuBuilder.addSeparator();
-            menuBuilder << "RicWellPathImportCompletionsFileFeature";
-            menuBuilder.subMenuEnd();
-
-            menuBuilder.addSeparator();
-            menuBuilder.subMenuStart("Export Well Paths", QIcon(":/Save.png"));
-            menuBuilder << "RicExportSelectedWellPathsFeature";
-            menuBuilder << "RicExportVisibleWellPathsFeature";
-            menuBuilder.subMenuEnd();
-
             appendExportCompletions(menuBuilder);
-
             menuBuilder.addSeparator();
-        
+            appendExportWellPaths(menuBuilder);
+            menuBuilder.addSeparator();
+
             menuBuilder.subMenuStart("Well Plots", QIcon(":/WellLogTrack16x16.png"));
             menuBuilder << "RicNewRftPlotFeature";
             menuBuilder << "RicNewPltPlotFeature";
@@ -854,6 +834,15 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
         menuBuilder << "RicCloseObservedDataFeature";
 
         // Work in progress -- End
+        appendCreateCompletions(menuBuilder, menuBuilder.itemCount() > 0u);
+        appendImportMenu(menuBuilder, menuBuilder.itemCount() > 0u);
+        bool addedExportWellPaths   = appendExportWellPaths(menuBuilder, menuBuilder.itemCount() > 0u) > 0;
+        appendExportCompletions(menuBuilder, menuBuilder.itemCount() > 0u && !addedExportWellPaths);
+
+        if (menuBuilder.itemCount() > 0u)
+        {
+            menuBuilder.addSeparator();
+        }
 
         caf::PdmUiItem* uiItem = uiItems[0];
         if (dynamic_cast<RimWellLogFileChannel*>(uiItem))
@@ -1059,36 +1048,111 @@ void RimContextCommandBuilder::appendScriptItems(caf::CmdFeatureMenuBuilder& men
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContextCommandBuilder::appendExportCompletions(caf::CmdFeatureMenuBuilder& menuBuilder)
+int RimContextCommandBuilder::appendImportMenu(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu)
 {
     QStringList candidates;
+    candidates << "RicWellPathsImportFileFeature";
+    candidates << "RicWellPathFormationsImportFileFeature";
+    candidates << "RicWellLogsImportFileFeature";
+    candidates << "RicReloadWellPathFormationNamesFeature";
+    candidates << "Separator";
+    candidates << "RicWellPathImportCompletionsFileFeature";
 
-    if (!menuBuilder.isCmdFeatureAdded("RicExportCompletionsForVisibleWellPathsFeature"))
+    return appendSubMenuWithCommands(menuBuilder, candidates, "Import", QIcon(), addSeparatorBeforeMenu);
-    {
+}
-        candidates << "RicExportCompletionsForVisibleWellPathsFeature";
-    }
-    if (!menuBuilder.isCmdFeatureAdded("RicWellPathExportCompletionDataFeature"))
-    {
-        candidates << "RicWellPathExportCompletionDataFeature";
-    }
-    if (!menuBuilder.isCmdFeatureAdded("RicExportFishbonesLateralsFeature"))
-    {
-        candidates << "RicExportFishbonesLateralsFeature";
-    }
-    if (!menuBuilder.isCmdFeatureAdded("RicExportCompletionsWellSegmentsFeature"))
-    {
-        candidates << "RicExportCompletionsWellSegmentsFeature";
-    }
 
-    if (!candidates.isEmpty())
+//--------------------------------------------------------------------------------------------------
-    {
+///
-        menuBuilder.subMenuStart("Export Completions", QIcon(":/ExportCompletionsSymbol16x16.png"));
+//--------------------------------------------------------------------------------------------------
+int RimContextCommandBuilder::appendCreateCompletions(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu)
+{
+    QStringList candidates;
+    candidates << "RicNewPerforationIntervalFeature";
+    candidates << "RicEditPerforationCollectionFeature";
+    candidates << "RicNewValveFeature";
+    candidates << "RicNewFishbonesSubsFeature";
+    candidates << "RicNewWellPathFractureFeature";
+    candidates << "Separator";
+    candidates << "RicCreateMultipleFracturesFeature";
+    candidates << "RicNewWellPathAttributeFeature";
+    candidates << "Separator";
+    candidates << "RicCreateTemporaryLgrFeature";
 
-        for (const auto& text : candidates)
+    return appendSubMenuWithCommands(menuBuilder, candidates, "Create Completions", QIcon(":/CompletionsSymbol16x16.png"), addSeparatorBeforeMenu);
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+int RimContextCommandBuilder::appendExportCompletions(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu)
+{
+    QStringList candidates;
+    candidates << "RicExportCompletionsForVisibleWellPathsFeature";
+    candidates << "RicWellPathExportCompletionDataFeature";
+    candidates << "RicExportFishbonesLateralsFeature";
+    candidates << "RicExportCompletionsWellSegmentsFeature";
+
+    return appendSubMenuWithCommands(menuBuilder, candidates, "Export Completions", QIcon(":/ExportCompletionsSymbol16x16.png"), addSeparatorBeforeMenu);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+int RimContextCommandBuilder::appendExportWellPaths(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu)
+{
+    QStringList candidates;
+    candidates << "RicExportSelectedWellPathsFeature";
+    candidates << "RicExportVisibleWellPathsFeature";
+
+    return appendSubMenuWithCommands(menuBuilder, candidates, "Export Well Paths", QIcon(":/Save.png"), addSeparatorBeforeMenu);
+}
+
+//-------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+int RimContextCommandBuilder::appendSubMenuWithCommands(caf::CmdFeatureMenuBuilder& menuBuilder,
+                                                        const QStringList&          commandCandidates,
+                                                        const QString&              menuLabel,
+                                                        const QIcon&                menuIcon /*= QIcon()*/,
+                                                        bool                        addSeparatorBeforeMenu /*=false*/)
+{
+    int actualCommandsAdded = 0;
+    QStringList validCommands;
+    for (QString candidate : commandCandidates)
+    {
+        if (candidate == "Separator")
         {
-            menuBuilder << text;
+            validCommands << candidate;
+        }
+        else
+        {
+            if (!menuBuilder.isCmdFeatureAdded(candidate))
+            {
+                validCommands << candidate;
+                actualCommandsAdded++;
+            }
+        }
+    }
+
+    if (actualCommandsAdded > 0)
+    {
+        if (addSeparatorBeforeMenu)
+        {
+            menuBuilder << "Separator";
+        }
+        menuBuilder.subMenuStart(menuLabel, menuIcon);
+
+        for (int i = 0; i < validCommands.size(); ++i)
+        {
+            bool firstOrLast = i == 0 || i == validCommands.size() - 1;
+            if (!firstOrLast || validCommands[i] != "Separator")
+            {
+                menuBuilder << validCommands[i];
+            }
         }
 
         menuBuilder.subMenuEnd();
     }
-}
+    return actualCommandsAdded;
+}

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.h

@@ -19,11 +19,15 @@
 
 #pragma once
 
+#include <QIcon>
 #include <vector>
 
 namespace caf {
     class CmdFeatureMenuBuilder;
 }
+
+class QString;
+class QStringList;
 class QMenu;
 class RimWellPath;
 class RimScriptCollection;
@@ -42,5 +46,13 @@ private:
     static void createExecuteScriptForCasesFeatureMenu(caf::CmdFeatureMenuBuilder& menuBuilder);
     static void appendScriptItems(caf::CmdFeatureMenuBuilder& menuBuilder, RimScriptCollection* scriptCollection);
 
-    static void appendExportCompletions(caf::CmdFeatureMenuBuilder& menuBuilder);
+    static int appendImportMenu(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu = false);
+    static int appendCreateCompletions(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu = false);
+    static int appendExportCompletions(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu = false);
+    static int appendExportWellPaths(caf::CmdFeatureMenuBuilder& menuBuilder, bool addSeparatorBeforeMenu = false);
+    static int appendSubMenuWithCommands(caf::CmdFeatureMenuBuilder& menuBuilder,
+                                         const QStringList&          commandCandidates,
+                                         const QString&              menuLabel,
+                                         const QIcon&                menuIcon               = QIcon(),
+                                         bool                        addSeparatorBeforeMenu = false);
 };

Fwk/AppFwk/cafCommand/cafCmdFeatureMenuBuilder.cpp

@@ -236,4 +236,12 @@ bool CmdFeatureMenuBuilder::isCmdFeatureAdded(const QString &commandId)
     return false;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+size_t CmdFeatureMenuBuilder::itemCount() const
+{
+    return m_items.size();
+}
+
 } // end namespace caf

Fwk/AppFwk/cafCommand/cafCmdFeatureMenuBuilder.h

@@ -70,7 +70,7 @@ public:
     void                   appendToMenu(QMenu* menu);
 
     bool                   isCmdFeatureAdded(const QString &commandId);
-
+    size_t                 itemCount() const;
 private:
     struct MenuItem
     {