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

Replaced uiField() and xmlField() with uiCapability() and xmlCapability()

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-05 12:34:07 +02:00
parent a88b3cac83
commit 57e363896f
28 changed files with 129 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ QVariant caf::UiListViewModelPdm::data(const QModelIndex &index, int role /*= Qt
fieldIndex = index.column();
}
PdmUiFieldHandle* uiFieldHandle = uiField(fields[fieldIndex]);
PdmUiFieldHandle* uiFieldHandle = fields[fieldIndex]->uiCapability();
if (uiFieldHandle)
{
return uiFieldHandle->uiValue();

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

@@ -174,11 +174,11 @@ void PdmUiTableViewEditor::configureAndUpdateUi(const QString& uiConfigName)
}
}
if (m_pdmListField && uiField(m_pdmListField))
if (m_pdmListField && m_pdmListField->uiCapability())
{
QString text = "";
m_tableHeadingIcon->setPixmap(uiField(m_pdmListField)->uiIcon(uiConfigName).pixmap(16, 16));
m_tableHeading->setText(uiField(m_pdmListField)->uiName(uiConfigName));
m_tableHeadingIcon->setPixmap(m_pdmListField->uiCapability()->uiIcon(uiConfigName).pixmap(16, 16));
m_tableHeading->setText(m_pdmListField->uiCapability()->uiName(uiConfigName));
}
else
{
@@ -194,8 +194,12 @@ void PdmUiTableViewEditor::configureAndUpdateUi(const QString& uiConfigName)
void PdmUiTableViewEditor::setListField(PdmChildArrayFieldHandle* pdmListField)
{
m_pdmListField = pdmListField;
caf::PdmUiFieldHandle* uifield = uiField(m_pdmListField);
caf::PdmUiFieldHandle* uifield = NULL;
if (m_pdmListField)
{
uifield = m_pdmListField->uiCapability();
}
this->bindToPdmItem(uifield);
if (!m_pdmListField)
@@ -398,10 +402,10 @@ void PdmUiTableViewEditor::updateSelectionManagerFromTableSelection()
{
QModelIndex mi = modelIndexList[i];
PdmFieldHandle* pdmFieldHandle = m_tableModelPdm->getField(mi);
PdmUiFieldHandle* uiFieldHandle = uiField(pdmFieldHandle);
if (uiFieldHandle)
{
items.push_back(uiFieldHandle);
if (pdmFieldHandle && pdmFieldHandle->uiCapability())
{
items.push_back(pdmFieldHandle->uiCapability());
}
}

20
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewModel.cpp
View File

@@ -112,7 +112,7 @@ QVariant PdmUiTableViewModel::headerData(int section, Qt::Orientation orientatio
{
if (orientation == Qt::Horizontal)
{
PdmUiFieldHandle* uiFieldHandle = uiField(getField(createIndex(0, section)));
PdmUiFieldHandle* uiFieldHandle = getField(createIndex(0, section))->uiCapability();
if (uiFieldHandle)
{
return uiFieldHandle->uiName(m_currentConfigName);
@@ -143,7 +143,7 @@ Qt::ItemFlags PdmUiTableViewModel::flags(const QModelIndex &index) const
}
PdmFieldHandle* field = getField(index);
PdmUiFieldHandle* uiFieldHandle = uiField(field);
PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle)
{
if (uiFieldHandle->isUiReadOnly(m_currentConfigName))
@@ -169,7 +169,7 @@ bool PdmUiTableViewModel::setData(const QModelIndex &index, const QVariant &valu
bool toggleOn = (value == Qt::Checked);
PdmFieldHandle* field = getField(index);
PdmUiFieldHandle* uiFieldHandle = uiField(field);
PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
PdmUiCommandSystemProxy::instance()->setUiValueToField(uiFieldHandle, toggleOn);
return true;
@@ -187,7 +187,7 @@ QVariant PdmUiTableViewModel::data(const QModelIndex &index, int role /*= Qt::Di
if (role == Qt::DisplayRole || role == Qt::EditRole)
{
PdmFieldHandle* fieldHandle = getField(index);
PdmUiFieldHandle* uiFieldHandle = uiField(fieldHandle);
PdmUiFieldHandle* uiFieldHandle = fieldHandle->uiCapability();
if (uiFieldHandle)
{
bool fromMenuOnly = false;
@@ -243,7 +243,7 @@ QVariant PdmUiTableViewModel::data(const QModelIndex &index, int role /*= Qt::Di
{
if (isRepresentingBoolean(index))
{
PdmUiFieldHandle* uiFieldHandle = uiField(getField(index));
PdmUiFieldHandle* uiFieldHandle = getField(index)->uiCapability();
if (uiFieldHandle)
{
QVariant val = uiFieldHandle->uiValue();
@@ -456,10 +456,9 @@ PdmUiFieldEditorHandle* PdmUiTableViewModel::getEditor(const QModelIndex &index)
editor = it->second;
if (editor)
{
PdmUiFieldHandle* uiFieldHandle = uiField(field);
if (uiFieldHandle)
if (field)
{
editor->setField(uiFieldHandle);
editor->setField(field->uiCapability());
}
}
}
@@ -544,10 +543,9 @@ PdmObjectHandle* PdmUiTableViewModel::pdmObjectForRow(int row) const
//--------------------------------------------------------------------------------------------------
bool PdmUiTableViewModel::isRepresentingBoolean(const QModelIndex &index) const
{
PdmUiFieldHandle* uiFieldHandle = uiField(getField(index));
if (uiFieldHandle)
if (getField(index))
{
QVariant val = uiFieldHandle->uiValue();
QVariant val = getField(index)->uiCapability()->uiValue();
if (val.type() == QVariant::Bool)
{
return true;

6
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp
View File

@@ -144,7 +144,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
}
*/
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
QString editorTypeName;
if (uiFieldHandle && uiFieldHandle->uiValue().type() == QVariant::Bool)
@@ -181,7 +181,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
// See Qt doc for QToolBar::insertWidget
QAction* action = m_actions[i];
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle)
{
action->setEnabled(!uiFieldHandle->isUiReadOnly(uiConfigName));
@@ -201,7 +201,7 @@ void PdmUiToolBarEditor::setFields(std::vector<caf::PdmFieldHandle*>& fields)
for (size_t i = 0; i < fields.size(); i++)
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(fields[i]);
caf::PdmUiFieldHandle* uiFieldHandle = fields[i]->uiCapability();
// Supports only bool fields
assert(uiFieldHandle->uiValue().type() == QVariant::Bool);

12
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
View File

@@ -484,7 +484,7 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
bool isDisplayOnly = uitreeOrdering->isDisplayItemOnly();
// MODTODO
//assert (uitreeOrdering->isValid()); // Tree generation has some error.
//assert (uitreeOrdering->isValid()); // Tree generation has some error.
if (role == Qt::DisplayRole || role == Qt::EditRole)
{
@@ -495,7 +495,7 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
{
if (pdmUiObject->userDescriptionField())
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(pdmUiObject->userDescriptionField());
caf::PdmUiFieldHandle* uiFieldHandle = pdmUiObject->userDescriptionField()->uiCapability();
if (uiFieldHandle)
{
return uiFieldHandle->uiValue();
@@ -559,7 +559,7 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
PdmUiObjectHandle* pdmUiObj = uiObj(uitreeOrdering->object());
if (pdmUiObj && pdmUiObj->objectToggleField())
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(pdmUiObj->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = pdmUiObj->objectToggleField()->uiCapability();
if (uiFieldHandle)
{
bool isToggledOn = uiFieldHandle->uiValue().toBool();
@@ -603,7 +603,7 @@ bool PdmUiTreeViewModel::setData(const QModelIndex &index, const QVariant &value
{
if (role == Qt::EditRole && uiObject->userDescriptionField())
{
PdmUiFieldHandle* userDescriptionUiField = uiField(uiObject->userDescriptionField());
PdmUiFieldHandle* userDescriptionUiField = uiObject->userDescriptionField()->uiCapability();
if (userDescriptionUiField)
{
userDescriptionUiField->setValueFromUi(value);
@@ -615,7 +615,7 @@ bool PdmUiTreeViewModel::setData(const QModelIndex &index, const QVariant &value
{
bool toggleOn = (value == Qt::Checked);
PdmUiFieldHandle* toggleUiField = uiField(uiObject->objectToggleField());
PdmUiFieldHandle* toggleUiField = uiObject->objectToggleField()->uiCapability();
if (toggleUiField)
{
toggleUiField->setValueFromUi(value);
@@ -649,7 +649,7 @@ Qt::ItemFlags PdmUiTreeViewModel::flags(const QModelIndex &index) const
PdmUiObjectHandle* pdmUiObject = uiObj(treeItem->object());
if (pdmUiObject)
{
if (pdmUiObject->userDescriptionField() && !uiField(pdmUiObject->userDescriptionField())->isUiReadOnly())
if (pdmUiObject->userDescriptionField() && !pdmUiObject->userDescriptionField()->uiCapability()->isUiReadOnly())
{
flagMask = flagMask | Qt::ItemIsEditable;
}

16
Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp
View File

@@ -203,7 +203,7 @@ QVariant UiTreeModelPdm::data(const QModelIndex &index, int role /*= Qt::Display
{
if (children[cIdx] == obj)
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(fields[i]);
caf::PdmUiFieldHandle* uiFieldHandle = fields[i]->uiCapability();
if (uiFieldHandle)
{
parentField = uiFieldHandle;
@@ -225,7 +225,7 @@ QVariant UiTreeModelPdm::data(const QModelIndex &index, int role /*= Qt::Display
{
if (uiObject->userDescriptionField())
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(uiObject->userDescriptionField());
caf::PdmUiFieldHandle* uiFieldHandle = uiObject->userDescriptionField()->uiCapability();
if (uiFieldHandle)
{
return uiFieldHandle->uiValue();
@@ -279,7 +279,7 @@ QVariant UiTreeModelPdm::data(const QModelIndex &index, int role /*= Qt::Display
{
if (uiObject && uiObject->objectToggleField())
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(uiObject->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = uiObject->objectToggleField()->uiCapability();
if (uiFieldHandle)
{
bool isToggledOn = uiFieldHandle->uiValue().toBool();
@@ -332,7 +332,7 @@ bool UiTreeModelPdm::setData(const QModelIndex &index, const QVariant &value, in
{
if (role == Qt::EditRole && uiObject->userDescriptionField())
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(uiObject->userDescriptionField());
caf::PdmUiFieldHandle* uiFieldHandle = uiObject->userDescriptionField()->uiCapability();
if (uiFieldHandle)
{
uiFieldHandle->setValueFromUi(value);
@@ -346,7 +346,7 @@ bool UiTreeModelPdm::setData(const QModelIndex &index, const QVariant &value, in
{
bool toggleOn = (value == Qt::Checked);
caf::PdmUiFieldHandle* uiFieldHandle = uiField(uiObject->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = uiObject->objectToggleField()->uiCapability();
if (uiFieldHandle)
{
uiFieldHandle->setValueFromUi(toggleOn);
@@ -378,7 +378,7 @@ Qt::ItemFlags UiTreeModelPdm::flags(const QModelIndex &index) const
PdmUiObjectHandle* uiObject = uiObj(treeItem->dataObject());
if (uiObject)
{
if (uiObject->userDescriptionField() && !uiField(uiObject->userDescriptionField())->isUiReadOnly())
if (uiObject->userDescriptionField() && !uiObject->userDescriptionField()->uiCapability()->isUiReadOnly())
{
flagMask = flagMask | Qt::ItemIsEditable;
}
@@ -647,7 +647,7 @@ PdmUiTreeItem* UiTreeItemBuilderPdm::buildViewItems(PdmUiTreeItem* parentTreeIte
// a more general ui tree building method is in place.
caf::PdmFieldHandle* parentField = object->parentField();
if (parentField && uiField(parentField) && uiField(parentField)->isUiHidden())
if (parentField && parentField->uiCapability() && parentField->uiCapability()->isUiHidden())
{
objectTreeItem = parentTreeItem;
}
@@ -667,7 +667,7 @@ PdmUiTreeItem* UiTreeItemBuilderPdm::buildViewItems(PdmUiTreeItem* parentTreeIte
// Fix for hidden legend definitions. There is only one visible legend definition, the others reside in a hidden container
// Todo: This is a Hack. Must be rewritten when a more general ui tree building method is in place.
// See comment at top of this method.
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle && uiFieldHandle->isUiChildrenHidden())
{
continue;