Use a string list to represent commands for context menu

This commit is contained in:
Magne Sjaastad 2015-08-12 21:19:06 +02:00
parent bf5dae4887
commit ee78d3c148

View File

@ -534,7 +534,7 @@ void RimProject::computeUtmAreaOfInterest()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions) void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
{ {
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); QStringList commandIds;
std::vector<caf::PdmUiItem*> uiItems; std::vector<caf::PdmUiItem*> uiItems;
caf::SelectionManager::instance()->selectedItems(uiItems); caf::SelectionManager::instance()->selectedItems(uiItems);
@ -546,83 +546,82 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
if (dynamic_cast<RimEclipseCase*>(uiItem)) if (dynamic_cast<RimEclipseCase*>(uiItem))
{ {
actions.push_back(commandManager->action("RicEclipseCaseCopy")); commandIds << "RicEclipseCaseCopy";
actions.push_back(commandManager->action("RicEclipseCasePaste")); commandIds << "RicEclipseCasePaste";
actions.push_back(commandManager->action("RicEclipseCaseClose")); commandIds << "RicEclipseCaseClose";
actions.push_back(commandManager->action("RicEclipseCaseNewView")); commandIds << "RicEclipseCaseNewView";
actions.push_back(commandManager->action("RicEclipseCaseNewGroup")); commandIds << "RicEclipseCaseNewGroup";
actions.push_back(commandManager->action("RicEclipseCaseExecuteScript")); commandIds << "RicEclipseCaseExecuteScript";
} }
else if (dynamic_cast<RimEclipseView*>(uiItem)) else if (dynamic_cast<RimEclipseView*>(uiItem))
{ {
actions.push_back(commandManager->action("RicEclipseViewNew")); commandIds << "RicEclipseViewNew";
actions.push_back(commandManager->action("RicEclipseViewCopy")); commandIds << "RicEclipseViewCopy";
actions.push_back(commandManager->action("RicEclipseViewPaste")); commandIds << "RicEclipseViewPaste";
actions.push_back(commandManager->action("RicEclipseViewDelete")); commandIds << "RicEclipseViewDelete";
} }
else if (dynamic_cast<RimEclipseCellColors*>(uiItem)) else if (dynamic_cast<RimEclipseCellColors*>(uiItem))
{ {
actions.push_back(commandManager->action("RicSaveEclipseResultAsInputProperty")); commandIds << "RicSaveEclipseResultAsInputProperty";
} }
else if (dynamic_cast<RimCellRangeFilterCollection*>(uiItem)) else if (dynamic_cast<RimCellRangeFilterCollection*>(uiItem))
{ {
actions.push_back(commandManager->action("RicRangeFilterNew")); commandIds << "RicRangeFilterNew";
actions.push_back(commandManager->action("RicRangeFilterNewSliceI")); commandIds << "RicRangeFilterNewSliceI";
actions.push_back(commandManager->action("RicRangeFilterNewSliceJ")); commandIds << "RicRangeFilterNewSliceJ";
actions.push_back(commandManager->action("RicRangeFilterNewSliceK")); commandIds << "RicRangeFilterNewSliceK";
} }
else if (dynamic_cast<RimCellRangeFilter*>(uiItem)) else if (dynamic_cast<RimCellRangeFilter*>(uiItem))
{ {
actions.push_back(commandManager->action("RicRangeFilterInsert")); commandIds << "RicRangeFilterInsert";
actions.push_back(commandManager->action("RicRangeFilterNewSliceI")); commandIds << "RicRangeFilterNewSliceI";
actions.push_back(commandManager->action("RicRangeFilterNewSliceJ")); commandIds << "RicRangeFilterNewSliceJ";
actions.push_back(commandManager->action("RicRangeFilterNewSliceK")); commandIds << "RicRangeFilterNewSliceK";
actions.push_back(commandManager->action("RicDeleteItemFeature")); commandIds << "RicDeleteItemFeature";
} }
else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(uiItem)) else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(uiItem))
{ {
actions.push_back(commandManager->action("RicEclipsePropertyFilterNew")); commandIds << "RicEclipsePropertyFilterNew";
} }
else if (dynamic_cast<RimEclipsePropertyFilter*>(uiItem)) else if (dynamic_cast<RimEclipsePropertyFilter*>(uiItem))
{ {
actions.push_back(commandManager->action("RicEclipsePropertyFilterInsert")); commandIds << "RicEclipsePropertyFilterInsert";
actions.push_back(commandManager->action("RicDeleteItemFeature")); commandIds << "RicDeleteItemFeature";
} }
else if (dynamic_cast<RimGeoMechPropertyFilterCollection*>(uiItem)) else if (dynamic_cast<RimGeoMechPropertyFilterCollection*>(uiItem))
{ {
actions.push_back(commandManager->action("RicGeoMechPropertyFilterNew")); commandIds << "RicGeoMechPropertyFilterNew";
} }
else if (dynamic_cast<RimGeoMechPropertyFilter*>(uiItem)) else if (dynamic_cast<RimGeoMechPropertyFilter*>(uiItem))
{ {
actions.push_back(commandManager->action("RicGeoMechPropertyFilterInsert")); commandIds << "RicGeoMechPropertyFilterInsert";
actions.push_back(commandManager->action("RicDeleteItemFeature")); commandIds << "RicDeleteItemFeature";
} }
else if (dynamic_cast<RimWellPathCollection*>(uiItem)) else if (dynamic_cast<RimWellPathCollection*>(uiItem))
{ {
actions.push_back(commandManager->action("RicWellPathsImportSsihubFeature")); commandIds << "RicWellPathsImportSsihubFeature";
actions.push_back(commandManager->action("RicWellPathsImportFileFeature")); commandIds << "RicWellPathsImportFileFeature";
actions.push_back(commandManager->action("RicWellPathsDeleteAllFeature")); commandIds << "RicWellPathsDeleteAllFeature";
} }
else if (dynamic_cast<RimWellPath*>(uiItem)) else if (dynamic_cast<RimWellPath*>(uiItem))
{ {
actions.push_back(commandManager->action("RicDeleteItemFeature")); commandIds << "RicDeleteItemFeature";
} }
} }
/* caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
for (size_t i = 0; i < uiItems.size(); i++) for (int i = 0; i < commandIds.size(); i++)
{ {
if (dynamic_cast<RimCellRangeFilter*>(uiItems[i])) QAction* act = commandManager->action(commandIds[i]);
{ CVF_ASSERT(act);
actions.push_back(commandManager->action("NewRangeFilter"));
actions.push_back(act);
} }
} }
*/
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------