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

caf: Rename of SelectionRole to SelectionLevel and

Browse Source 
CURRENT to FIRST_LEVEL
Replace use of SelectionLevel enum as argument with int
This commit is contained in:
Jacob Støren 2018-08-21 15:49:44 +02:00
parent 0e92c1d594
commit 296854d749
18 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/FractureCommands/RicDeleteOptionItemFeature.cpp
View File

@ -33,7 +33,7 @@ CAF_CMD_SOURCE_INIT(RicDeleteOptionItemFeature, "RicDeleteOptionItemFeature");
void RicDeleteOptionItemFeature::onActionTriggered(bool isChecked)
{
std::vector<RicCreateMultipleFracturesOptionItemUi*> optionItems;
caf::SelectionManager::instance()->objectsByType(&optionItems, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&optionItems, caf::SelectionManager::FIRST_LEVEL);
if (!optionItems.empty())
{
@ -64,7 +64,7 @@ void RicDeleteOptionItemFeature::setupActionLook(QAction* actionToSetup)
bool RicDeleteOptionItemFeature::isCommandEnabled()
{
std::vector<RicCreateMultipleFracturesOptionItemUi*> optionItems;
caf::SelectionManager::instance()->objectsByType(&optionItems, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&optionItems, caf::SelectionManager::FIRST_LEVEL);
return !optionItems.empty();
}

4
ApplicationCode/Commands/FractureCommands/RicNewOptionItemFeature.cpp
View File

@ -55,7 +55,7 @@ void RicNewOptionItemFeature::onActionTriggered(bool isChecked)
{
std::vector<RicCreateMultipleFracturesOptionItemUi*> optionItems;
caf::SelectionManager::instance()->objectsByType(&optionItems, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&optionItems, caf::SelectionManager::FIRST_LEVEL);
if (!optionItems.empty())
{
selectedOptionItem = optionItems.front();
@ -64,7 +64,7 @@ void RicNewOptionItemFeature::onActionTriggered(bool isChecked)
}
std::vector<RiuCreateMultipleFractionsUi*> multipleFractions;
caf::SelectionManager::instance()->objectsByType(&multipleFractions, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&multipleFractions, caf::SelectionManager::FIRST_LEVEL);
if (!multipleFractions.empty())
{
multipleFractionUi = multipleFractions[0];

4
ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp
View File

@ -32,7 +32,7 @@ bool RicDeleteWellPathAttributeFeature::isCommandEnabled()
{
{
std::vector<RimWellPathAttribute*> objects;
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::FIRST_LEVEL);
if ( objects.size() > 0 )
{
@ -49,7 +49,7 @@ bool RicDeleteWellPathAttributeFeature::isCommandEnabled()
void RicDeleteWellPathAttributeFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPathAttribute*> attributes;
caf::SelectionManager::instance()->objectsByType(&attributes, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&attributes, caf::SelectionManager::FIRST_LEVEL);
if (attributes.size() > 0)
{
RimWellPathAttributeCollection* wellPathAttributeCollection = nullptr;

4
ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathTargetFeature.cpp
View File

@ -31,7 +31,7 @@ CAF_CMD_SOURCE_INIT(RicDeleteWellPathTargetFeature, "RicDeleteWellPathTargetFeat
bool RicDeleteWellPathTargetFeature::isCommandEnabled()
{
std::vector<RimWellPathTarget*> objects;
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::FIRST_LEVEL);
if ( objects.size() > 0 )
{
@ -47,7 +47,7 @@ bool RicDeleteWellPathTargetFeature::isCommandEnabled()
void RicDeleteWellPathTargetFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPathTarget*> targets;
caf::SelectionManager::instance()->objectsByType(&targets, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&targets, caf::SelectionManager::FIRST_LEVEL);
if (targets.size() > 0)
{

4
ApplicationCode/Commands/WellPathCommands/RicNewWellPathAttributeFeature.cpp
View File

@ -41,7 +41,7 @@ bool RicNewWellPathAttributeFeature::isCommandEnabled()
}
{
std::vector<RimWellPathAttribute*> objects;
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::FIRST_LEVEL);
if ( objects.size() > 0 )
{
@ -58,7 +58,7 @@ bool RicNewWellPathAttributeFeature::isCommandEnabled()
void RicNewWellPathAttributeFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPathAttribute*> attributes;
caf::SelectionManager::instance()->objectsByType(&attributes, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&attributes, caf::SelectionManager::FIRST_LEVEL);
if (attributes.size() > 0)
{
RimWellPathAttributeCollection* attributeCollection = nullptr;

4
ApplicationCode/Commands/WellPathCommands/RicNewWellPathListTargetFeature.cpp
View File

@ -41,7 +41,7 @@ bool RicNewWellPathListTargetFeature::isCommandEnabled()
}
{
std::vector<RimWellPathTarget*> objects;
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&objects, caf::SelectionManager::FIRST_LEVEL);
if ( objects.size() > 0 )
{
@ -58,7 +58,7 @@ bool RicNewWellPathListTargetFeature::isCommandEnabled()
void RicNewWellPathListTargetFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPathTarget*> targets;
caf::SelectionManager::instance()->objectsByType(&targets, caf::SelectionManager::CURRENT);
caf::SelectionManager::instance()->objectsByType(&targets, caf::SelectionManager::FIRST_LEVEL);
if (targets.size() > 0)
{
auto firstTarget = targets.front();

4
Fwk/AppFwk/cafCommand/cafCmdSelectionChangeExec.cpp
View File

@ -57,7 +57,7 @@ QString CmdSelectionChangeExec::name()
//--------------------------------------------------------------------------------------------------
void CmdSelectionChangeExec::redo()
{
SelectionManager::instance()->setSelectionFromReferences(m_commandData->m_newSelection.v(), m_commandData->m_selectionRole.v());
SelectionManager::instance()->setSelectionFromReferences(m_commandData->m_newSelection.v(), m_commandData->m_selectionLevel.v());
}
//--------------------------------------------------------------------------------------------------
@ -65,7 +65,7 @@ void CmdSelectionChangeExec::redo()
//--------------------------------------------------------------------------------------------------
void CmdSelectionChangeExec::undo()
{
SelectionManager::instance()->setSelectionFromReferences(m_commandData->m_previousSelection.v(), m_commandData->m_selectionRole.v());
SelectionManager::instance()->setSelectionFromReferences(m_commandData->m_previousSelection.v(), m_commandData->m_selectionLevel.v());
}
//--------------------------------------------------------------------------------------------------

4
Fwk/AppFwk/cafCommand/cafCmdSelectionChangeExec.h
View File

@ -61,12 +61,12 @@ public:
{
CAF_PDM_InitObject("CmdSelectionChangeExecData uiName", "", "CmdSelectionChangeExecData tooltip", "CmdSelectionChangeExecData whatsthis");
CAF_PDM_InitFieldNoDefault(&m_selectionRole, "selectionRole", "selectionRole", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_selectionLevel, "selectionLevel", "selectionLevel", "", "", "");
CAF_PDM_InitField(&m_previousSelection, "previousSelection", std::vector<QString>(), "previousSelection", "", "", "");
CAF_PDM_InitField(&m_newSelection, "newSelection", std::vector<QString>(), "newSelection", "", "", "");
}
PdmField< int > m_selectionRole;
PdmField< int > m_selectionLevel;
PdmField< std::vector<QString> > m_previousSelection;
PdmField< std::vector<QString> > m_newSelection;
};

12
Fwk/AppFwk/cafCommand/cafCmdSelectionHelper.cpp
View File

@ -40,6 +40,8 @@
#include "cafCmdExecCommandManager.h"
#include "cafCmdSelectionChangeExec.h"
#include "cafSelectionManager.h"
namespace caf
{
@ -47,9 +49,9 @@ namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CmdSelectionHelper::executeSelectionCommand(const std::vector<PdmObjectHandle*>& selection, SelectionManager::SelectionRole role)
void CmdSelectionHelper::executeSelectionCommand(const std::vector<PdmObjectHandle*>& selection, int selectionLevel)
{
CmdSelectionChangeExec* selectionChangeExec = createSelectionCommand(selection, role);
CmdSelectionChangeExec* selectionChangeExec = createSelectionCommand(selection, selectionLevel);
CmdExecCommandManager::instance()->processExecuteCommand(selectionChangeExec);
}
@ -57,11 +59,11 @@ void CmdSelectionHelper::executeSelectionCommand(const std::vector<PdmObjectHand
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
CmdSelectionChangeExec* CmdSelectionHelper::createSelectionCommand(const std::vector<PdmObjectHandle*>& selection, SelectionManager::SelectionRole role)
CmdSelectionChangeExec* CmdSelectionHelper::createSelectionCommand(const std::vector<PdmObjectHandle*>& selection, int selectionLevel)
{
CmdSelectionChangeExec* selectionChangeExec = new CmdSelectionChangeExec(SelectionManager::instance()->notificationCenter());
selectionChangeExec->commandData()->m_selectionRole.v() = role;
SelectionManager::instance()->selectionAsReferences(selectionChangeExec->commandData()->m_previousSelection.v(), role);
selectionChangeExec->commandData()->m_selectionLevel.v() = selectionLevel;
SelectionManager::instance()->selectionAsReferences(selectionChangeExec->commandData()->m_previousSelection.v(), selectionLevel);
for (size_t i = 0; i < selection.size(); i++)
{

8
Fwk/AppFwk/cafCommand/cafCmdSelectionHelper.h
View File

@ -37,20 +37,18 @@
#pragma once
#include "cafSelectionManager.h"
#include <vector>
namespace caf
{
class CmdSelectionChangeExec;
class PdmObjectHandle;
class CmdSelectionHelper
{
public:
static void executeSelectionCommand(const std::vector<PdmObjectHandle*>& selection, SelectionManager::SelectionRole role);
static CmdSelectionChangeExec* createSelectionCommand(const std::vector<PdmObjectHandle*>& selection, SelectionManager::SelectionRole role);
static void executeSelectionCommand(const std::vector<PdmObjectHandle*>& selection, int selectionLevel);
static CmdSelectionChangeExec* createSelectionCommand(const std::vector<PdmObjectHandle*>& selection, int selectionLevel);
};

4
Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdDeleteItemFeature.cpp
View File

@ -58,7 +58,7 @@ namespace caf
CmdExecuteCommand* CmdDeleteItemFeature::createExecuteCommand()
{
std::vector<PdmUiItem*> items;
SelectionManager::instance()->selectedItems(items, SelectionManager::CURRENT);
SelectionManager::instance()->selectedItems(items, SelectionManager::FIRST_LEVEL);
caf::PdmChildArrayFieldHandle* childArrayFieldHandle = caf::SelectionManager::instance()->activeChildArrayFieldHandle();
if (!childArrayFieldHandle) return nullptr;
@ -106,7 +106,7 @@ CmdExecuteCommand* CmdDeleteItemFeature::createExecuteCommand()
//--------------------------------------------------------------------------------------------------
bool CmdDeleteItemFeature::isCommandEnabled()
{
caf::PdmObject* currentPdmObject = dynamic_cast<caf::PdmObject*>(caf::SelectionManager::instance()->selectedItem(caf::SelectionManager::CURRENT));
caf::PdmObject* currentPdmObject = dynamic_cast<caf::PdmObject*>(caf::SelectionManager::instance()->selectedItem(caf::SelectionManager::FIRST_LEVEL));
if (!currentPdmObject) return false;
caf::PdmChildArrayFieldHandle* childArrayFieldHandle = caf::SelectionManager::instance()->activeChildArrayFieldHandle();

12
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.h
View File

@ -57,12 +57,12 @@ class PdmChildArrayFieldHandle;
class SelectionManager
{
public:
enum SelectionRole
{ // Suggested renaming:
BASE_LEVEL, // BASE_LEVEL = 0,
CURRENT, // FIRST_LEVEL = 1,
// SECOND_LEVEL = 2,
UNDEFINED = -1
enum SelectionLevel
{
UNDEFINED = -1,
BASE_LEVEL = 0,
FIRST_LEVEL = 1,
SECOND_LEVEL = 2
};
public:

2
Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
View File

@ -298,7 +298,7 @@ bool PdmUiLineEditor::isMultipleFieldsWithSameKeywordSelected(PdmFieldHandle* ed
// For current selection, find all fields with same keyword
std::vector<PdmUiItem*> items;
SelectionManager::instance()->selectedItems(items, SelectionManager::CURRENT);
SelectionManager::instance()->selectedItems(items, SelectionManager::FIRST_LEVEL);
for (size_t i = 0; i < items.size(); i++)
{

5
Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp
View File

@ -40,6 +40,7 @@
#include "cafPdmChildArrayField.h"
#include "cafPdmObject.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafSelectionManager.h"
#include <QVBoxLayout>
#include "cafPdmUiCommandSystemProxy.h"
@ -152,9 +153,9 @@ void PdmUiTableView::enableHeaderText(bool enable)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiTableView::setSelectionRole(SelectionManager::SelectionRole role)
void PdmUiTableView::setSelectionLevel(int selectionLevel)
{
m_listViewEditor->setSelectionRole(role);
m_listViewEditor->setSelectionLevel(selectionLevel);
}
//--------------------------------------------------------------------------------------------------

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h
View File

@ -39,7 +39,7 @@
#include "cafNotificationCenter.h"
#include "cafPdmUiFieldEditorHandle.h"
#include "cafSelectionManager.h"
//#include "cafSelectionManager.h"
#include <QModelIndex>
#include <QString>
@ -69,7 +69,7 @@ public:
void setChildArrayField(PdmChildArrayFieldHandle* childArrayField);
void setUiConfigurationName(QString uiConfigName);
void enableHeaderText(bool enable);
void setSelectionRole(SelectionManager::SelectionRole role);
void setSelectionLevel(int selectionLevel);
PdmObjectHandle* pdmObjectFromModelIndex(const QModelIndex& mi);

17
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
View File

@ -42,6 +42,7 @@
#include "cafPdmUiEditorHandle.h"
#include "cafPdmUiTableViewDelegate.h"
#include "cafPdmUiTableViewQModel.h"
#include "cafSelectionManager.h"
#include <QApplication>
#include <QEvent>
@ -72,7 +73,7 @@ PdmUiTableViewEditor::PdmUiTableViewEditor()
m_checkboxDelegate = new PdmUiCheckBoxDelegate(this);
m_selectionRole = SelectionManager::CURRENT;
m_selectionLevel = SelectionManager::FIRST_LEVEL;
m_isBlockingSelectionManagerChanged = false;
}
@ -142,7 +143,7 @@ void PdmUiTableViewEditor::configureAndUpdateUi(const QString& uiConfigName)
{
PdmUiTableViewEditorAttribute editorAttrib;
childArrayFH->ownerObject()->uiCapability()->editorAttribute(childArrayFH, uiConfigName, &editorAttrib);
this->setSelectionRole(editorAttrib.selectionRole);
this->setSelectionLevel(editorAttrib.selectionLevel);
this->enableHeaderText(editorAttrib.enableHeaderText);
}
@ -230,9 +231,9 @@ void PdmUiTableViewEditor::enableHeaderText(bool enable)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiTableViewEditor::setSelectionRole(SelectionManager::SelectionRole role)
void PdmUiTableViewEditor::setSelectionLevel(int selectionLevel)
{
m_selectionRole = role;
m_selectionLevel = selectionLevel;
}
//--------------------------------------------------------------------------------------------------
@ -242,10 +243,10 @@ void PdmUiTableViewEditor::onSelectionManagerSelectionChanged(int selectionLevel
{
if (m_isBlockingSelectionManagerChanged) return;
if (isSelectionRoleDefined() && (m_selectionRole == selectionLevel))
if (isSelectionRoleDefined() && (m_selectionLevel == selectionLevel))
{
std::vector<PdmUiItem*> items;
SelectionManager::instance()->selectedItems(items, m_selectionRole);
SelectionManager::instance()->selectedItems(items, m_selectionLevel);
QItemSelection totalSelection;
for (auto item: items)
@ -274,7 +275,7 @@ void PdmUiTableViewEditor::slotSelectionChanged(const QItemSelection & selected,
//--------------------------------------------------------------------------------------------------
bool PdmUiTableViewEditor::isSelectionRoleDefined() const
{
return m_selectionRole != SelectionManager::UNDEFINED;
return m_selectionLevel != SelectionManager::UNDEFINED;
}
//--------------------------------------------------------------------------------------------------
@ -320,7 +321,7 @@ void PdmUiTableViewEditor::updateSelectionManagerFromTableSelection()
}
m_isBlockingSelectionManagerChanged = true;
SelectionManager::instance()->setSelectedItems(items, m_selectionRole);
SelectionManager::instance()->setSelectedItems(items, m_selectionLevel);
m_isBlockingSelectionManagerChanged = false;
}
}

14
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
View File

@ -40,7 +40,8 @@
#include "cafPdmDocument.h"
#include "cafPdmUiFieldEditorHandle.h"
#include "cafPdmUiObjectEditorHandle.h"
#include "cafSelectionManager.h"
#include "cafSelectionChangedReceiver.h"
//#include "cafSelectionManager.h"
#include <QAbstractItemModel>
#include <QPointer>
@ -58,6 +59,7 @@ class PdmUiFieldEditorHandle;
class PdmUiItem;
class PdmUiTableViewDelegate;
class PdmUiTableViewQModel;
class PdmChildArrayFieldHandle;
//--------------------------------------------------------------------------------------------------
///
@ -81,13 +83,13 @@ class PdmUiTableViewEditorAttribute : public PdmUiEditorAttribute
{
public:
PdmUiTableViewEditorAttribute()
: selectionRole(SelectionManager::CURRENT)
: selectionLevel(1)
, enableHeaderText(true)
{
}
SelectionManager::SelectionRole selectionRole;
bool enableHeaderText;
int selectionLevel;
bool enableHeaderText;
};
@ -105,7 +107,7 @@ public:
~PdmUiTableViewEditor();
void enableHeaderText(bool enable);
void setSelectionRole(SelectionManager::SelectionRole role);
void setSelectionLevel(int selectionLevel);
PdmObjectHandle* pdmObjectFromModelIndex(const QModelIndex& mi);
QTableView* tableView();
@ -140,7 +142,7 @@ private:
PdmUiCheckBoxDelegate* m_checkboxDelegate;
bool m_useDefaultContextMenu;
SelectionManager::SelectionRole m_selectionRole;
int m_selectionLevel;
bool m_isBlockingSelectionManagerChanged;
caf::PdmChildArrayFieldHandle* m_previousFieldHandle;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
View File

@ -279,7 +279,7 @@ void PdmUiTreeViewEditor::customMenuRequested(QPoint pos)
//--------------------------------------------------------------------------------------------------
PdmChildArrayFieldHandle* PdmUiTreeViewEditor::currentChildArrayFieldHandle()
{
PdmUiItem* currentSelectedItem = SelectionManager::instance()->selectedItem(SelectionManager::CURRENT);
PdmUiItem* currentSelectedItem = SelectionManager::instance()->selectedItem(SelectionManager::FIRST_LEVEL);
PdmUiFieldHandle* uiFieldHandle = dynamic_cast<PdmUiFieldHandle*>(currentSelectedItem);
if (uiFieldHandle)