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

AppFwk: Fix missing type guard in multi select field edit code. Added Assert in updateUI to prevent accidental recursive calling.

Browse Source
This commit is contained in:
Jacob Støren
2018-06-29 16:21:54 +02:00
parent 1c8d5bf942
commit 99565f62f2
5 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiCommandSystemProxy.cpp
View File

@@ -86,10 +86,15 @@ void PdmUiCommandSystemProxy::setUiValueToField(PdmUiFieldHandle* uiFieldHandle,
{
// Handle editing multiple objects when several objects are selected
PdmFieldHandle* editorField = uiFieldHandle->fieldHandle();
const std::type_info& fieldOwnerTypeId = typeid( *editorField->ownerObject());
std::vector<PdmFieldHandle*> fieldsToUpdate;
fieldsToUpdate.push_back(editorField);
// For current selection, find all fields with same keyword
// Todo: Should traverse the ui ordering and find all fields with same keyword and same ownerobject type.
// Until we do, fields embedded into the proerty panel fram a different object will not work with multiselection edit
// For now we only makes sure we have same ownerobject type
{
std::vector<PdmUiItem*> items;
SelectionManager::instance()->selectedItems(items, SelectionManager::CURRENT);
@@ -98,7 +103,7 @@ void PdmUiCommandSystemProxy::setUiValueToField(PdmUiFieldHandle* uiFieldHandle,
for (size_t i = 0; i < items.size(); i++)
{
PdmObjectHandle* objectHandle = dynamic_cast<PdmObjectHandle*>(items[i]);
if (objectHandle)
if (objectHandle && typeid( *objectHandle) == fieldOwnerTypeId)
{
// An object is selected, find field with same keyword as the current field being edited
PdmFieldHandle* fieldHandle = objectHandle->findField(editorField->keyword());

27
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.cpp
View File

@@ -43,7 +43,9 @@ namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
PdmUiEditorHandle::PdmUiEditorHandle() : m_pdmItem(nullptr)
PdmUiEditorHandle::PdmUiEditorHandle()
: m_pdmItem(nullptr)
, m_isConfiguringUi(false)
{
}
@@ -56,6 +58,29 @@ PdmUiEditorHandle::~PdmUiEditorHandle()
if (m_pdmItem) m_pdmItem->removeFieldEditor(this);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiEditorHandle::updateUi(const QString& uiConfigName)
{
CAF_ASSERT(!m_isConfiguringUi);
m_isConfiguringUi = true;
m_currentConfigName = uiConfigName;
this->configureAndUpdateUi(uiConfigName);
m_isConfiguringUi = false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiEditorHandle::updateUi()
{
CAF_ASSERT(!m_isConfiguringUi);
m_isConfiguringUi = true;
this->configureAndUpdateUi(m_currentConfigName);
m_isConfiguringUi = false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

23
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h
View File

@@ -57,22 +57,15 @@ public:
virtual ~PdmUiEditorHandle();
public:
void updateUi(const QString& uiConfigName);;
void updateUi();;
protected:
// Interface to override:
/// Virtual method to be overridden. Needs to set up the supplied widget
/// with all signals etc to make it communicate with this object
void updateUi(const QString& uiConfigName)
{
m_currentConfigName = uiConfigName;
this->configureAndUpdateUi(uiConfigName);
};
void updateUi()
{
this->configureAndUpdateUi(m_currentConfigName);
};
protected: // Interface to override:
/// Supposed to update all parts of the widgets, both visibility, sensitivity, decorations and field data
virtual void configureAndUpdateUi(const QString& uiConfigName) = 0;
@@ -86,6 +79,8 @@ private:
friend PdmUiItem::~PdmUiItem();
PdmUiItem* m_pdmItem;
QString m_currentConfigName;
bool m_isConfiguringUi;
};

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp
View File

@@ -24,6 +24,8 @@ PdmUiFieldHandle::PdmUiFieldHandle(PdmFieldHandle* owner, bool giveOwnership):
//--------------------------------------------------------------------------------------------------
void PdmUiFieldHandle::notifyFieldChanged(const QVariant& oldFieldValue, const QVariant& newFieldValue)
{
// Todo : Should use a virtual version of isElementEqual. The variant != operation will not work on user types
if (oldFieldValue != newFieldValue)
{
PdmFieldHandle* fieldHandle = this->fieldHandle();

7
Fwk/AppFwk/cafUserInterface/cafPdmUiWidgetBasedObjectEditor.cpp
View File

@@ -390,9 +390,12 @@ void caf::PdmUiWidgetBasedObjectEditor::configureAndUpdateUi(const QString& uiCo
}
//--------------------------------------------------------------------------------------------------
///
/// Unused. Should probably remove
//--------------------------------------------------------------------------------------------------
void caf::PdmUiWidgetBasedObjectEditor::recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems, const QString& uiConfigName, std::set<QString>* fieldKeywordNames, std::set<QString>* groupNames)
void caf::PdmUiWidgetBasedObjectEditor::recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems,
const QString& uiConfigName,
std::set<QString>* fieldKeywordNames,
std::set<QString>* groupNames)
{
for (size_t i = 0; i < uiItems.size(); ++i)
{