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

4
ApplicationCode/ProjectDataModel/RimCommandObject.cpp
View File

@@ -224,10 +224,10 @@ void RimCommandIssueFieldChanged::redo()
if (pdmObject)
{
caf::PdmFieldHandle* fieldHandle = findFieldByKeyword(pdmObject, this->fieldName);
caf::PdmUiFieldHandle* uiFieldHandle = uiField(fieldHandle);
if (uiFieldHandle)
if (fieldHandle && fieldHandle->uiCapability())
{
caf::PdmUiFieldHandle* uiFieldHandle = fieldHandle->uiCapability();
QVariant variantValue(this->fieldValueToApply);
uiFieldHandle->setValueFromUi(variantValue);
}

2
ApplicationCode/ProjectDataModel/RimMockModelSettings.cpp
View File

@@ -59,7 +59,7 @@ void RimMockModelSettings::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
{
totalCellCount = cellCountX * cellCountY * cellCountZ;
caf::PdmUiFieldHandle* uiFieldHandle = uiField(&totalCellCount);
caf::PdmUiFieldHandle* uiFieldHandle = totalCellCount.uiCapability();
if (uiFieldHandle)
{
uiFieldHandle->updateConnectedEditors();

4
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@@ -1116,7 +1116,7 @@ void RimUiTreeModelPdm::setObjectToggleStateForSelection(QModelIndexList selecte
{
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>* >(uiObjectHandle->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle)
{
if (state == RimUiTreeView::TOGGLE_ON) uiFieldHandle->setValueFromUi(true);
@@ -1142,7 +1142,7 @@ void RimUiTreeModelPdm::setObjectToggleStateForSelection(QModelIndexList selecte
{
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>* >(uiObjectHandleChild->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle)
{
if (state == RimUiTreeView::TOGGLE_ON) uiFieldHandle->setValueFromUi(true);

36
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@@ -270,14 +270,14 @@ void RimView::setMeshOnlyDrawstyle()
{
if (isGridVisualizationMode())
{
uiField(&meshMode)->setValueFromUi(FULL_MESH);
meshMode.uiCapability()->setValueFromUi(FULL_MESH);
}
else
{
uiField(&meshMode)->setValueFromUi(FAULTS_MESH);
meshMode.uiCapability()->setValueFromUi(FAULTS_MESH);
}
uiField(&surfaceMode)->setValueFromUi(NO_SURFACE);
surfaceMode.uiCapability()->setValueFromUi(NO_SURFACE);
}
//--------------------------------------------------------------------------------------------------
@@ -287,13 +287,13 @@ void RimView::setMeshSurfDrawstyle()
{
if (isGridVisualizationMode())
{
uiField(&surfaceMode)->setValueFromUi(SURFACE);
uiField(&meshMode)->setValueFromUi(FULL_MESH);
surfaceMode.uiCapability()->setValueFromUi(SURFACE);
meshMode.uiCapability()->setValueFromUi(FULL_MESH);
}
else
{
uiField(&surfaceMode)->setValueFromUi(FAULTS);
uiField(&meshMode)->setValueFromUi(FAULTS_MESH);
surfaceMode.uiCapability()->setValueFromUi(FAULTS);
meshMode.uiCapability()->setValueFromUi(FAULTS_MESH);
}
}
@@ -309,14 +309,14 @@ void RimView::setFaultMeshSurfDrawstyle()
// Mesh SF SF SF
if (this->isGridVisualizationMode())
{
uiField(&surfaceMode)->setValueFromUi(SURFACE);
surfaceMode.uiCapability()->setValueFromUi(SURFACE);
}
else
{
uiField(&surfaceMode)->setValueFromUi(FAULTS);
surfaceMode.uiCapability()->setValueFromUi(FAULTS);
}
uiField(&meshMode)->setValueFromUi(FAULTS_MESH);
meshMode.uiCapability()->setValueFromUi(FAULTS_MESH);
}
//--------------------------------------------------------------------------------------------------
@@ -326,14 +326,14 @@ void RimView::setSurfOnlyDrawstyle()
{
if (isGridVisualizationMode())
{
uiField(&surfaceMode)->setValueFromUi(SURFACE);
surfaceMode.uiCapability()->setValueFromUi(SURFACE);
}
else
{
uiField(&surfaceMode)->setValueFromUi(FAULTS);
surfaceMode.uiCapability()->setValueFromUi(FAULTS);
}
uiField(&meshMode)->setValueFromUi(NO_MESH);
meshMode.uiCapability()->setValueFromUi(NO_MESH);
}
//--------------------------------------------------------------------------------------------------
@@ -344,13 +344,13 @@ void RimView::setShowFaultsOnly(bool showFaults)
if (showFaults)
{
m_previousGridModeMeshLinesWasFaults = meshMode() == FAULTS_MESH;
if (surfaceMode() != NO_SURFACE) uiField(&surfaceMode)->setValueFromUi(FAULTS);
if (meshMode() != NO_MESH) uiField(&meshMode)->setValueFromUi(FAULTS_MESH);
if (surfaceMode() != NO_SURFACE) surfaceMode.uiCapability()->setValueFromUi(FAULTS);
if (meshMode() != NO_MESH) meshMode.uiCapability()->setValueFromUi(FAULTS_MESH);
}
else
{
if (surfaceMode() != NO_SURFACE) uiField(&surfaceMode)->setValueFromUi(SURFACE);
if (meshMode() != NO_MESH) uiField(&meshMode)->setValueFromUi(m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH: FULL_MESH);
if (surfaceMode() != NO_SURFACE) surfaceMode.uiCapability()->setValueFromUi(SURFACE);
if (meshMode() != NO_MESH) meshMode.uiCapability()->setValueFromUi(m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH : FULL_MESH);
}
}
@@ -359,7 +359,7 @@ void RimView::setShowFaultsOnly(bool showFaults)
//--------------------------------------------------------------------------------------------------
void RimView::setSurfaceDrawstyle()
{
if (surfaceMode() != NO_SURFACE) uiField(&surfaceMode)->setValueFromUi(SURFACE);
if (surfaceMode() != NO_SURFACE) surfaceMode.uiCapability()->setValueFromUi(SURFACE);
}
//--------------------------------------------------------------------------------------------------