OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-13 17:05:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

#922 Use setValueWithFieldChanged instead of setValueFromUi

Browse Source
This commit is contained in:
Magne Sjaastad 2016-10-19 15:30:52 +02:00
parent 96e532696e
commit e732d5c373
5 changed files with 31 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/Commands/ToggleCommands/RicToggleItemsFeatureImpl.cpp
View File

@ -126,13 +126,9 @@ void RicToggleItemsFeatureImpl::setObjectToggleStateForSelection(SelectionToggle
{ {
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>*>(uiObjectHandleChild->objectToggleField()); caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>*>(uiObjectHandleChild->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability(); if (state == TOGGLE_ON) field->setValueWithFieldChanged(true);
if (uiFieldHandle) if (state == TOGGLE_OFF) field->setValueWithFieldChanged(false);
{ if (state == TOGGLE_SUBITEMS) field->setValueWithFieldChanged(!(field->v()));
if (state == TOGGLE_ON) uiFieldHandle->setValueFromUi(true);
if (state == TOGGLE_OFF) uiFieldHandle->setValueFromUi(false);
if (state == TOGGLE_SUBITEMS) uiFieldHandle->setValueFromUi(!(field->v()));
}
} }
} }
} }
@ -146,15 +142,11 @@ void RicToggleItemsFeatureImpl::setObjectToggleStateForSelection(SelectionToggle
{ {
caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>* >(uiObjectHandle->objectToggleField()); caf::PdmField<bool>* field = dynamic_cast<caf::PdmField<bool>* >(uiObjectHandle->objectToggleField());
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability(); if (state == TOGGLE_ON) field->setValueWithFieldChanged(true);
if (uiFieldHandle) if (state == TOGGLE_OFF) field->setValueWithFieldChanged(false);
if (state == TOGGLE_SUBITEMS || state == TOGGLE)
{ {
if (state == TOGGLE_ON) uiFieldHandle->setValueFromUi(true); field->setValueWithFieldChanged(!(field->v()));
if (state == TOGGLE_OFF) uiFieldHandle->setValueFromUi(false);
if (state == TOGGLE_SUBITEMS || state == TOGGLE)
{
uiFieldHandle->setValueFromUi(!(field->v()));
}
} }
} }
} }

2
ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
View File

@ -63,7 +63,7 @@ void RicShowAllLinkedViewsFeature::onActionTriggered(bool isChecked)
for (size_t j = 0; j < views.size(); j++) for (size_t j = 0; j < views.size(); j++)
{ {
views[j]->showWindow.uiCapability()->setValueFromUi(true); views[j]->showWindow.setValueWithFieldChanged(true);
views[j]->uiCapability()->updateUiIconFromToggleField(); views[j]->uiCapability()->updateUiIconFromToggleField();
} }
} }

36
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -394,14 +394,14 @@ void RimView::setMeshOnlyDrawstyle()
{ {
if (isGridVisualizationMode()) if (isGridVisualizationMode())
{ {
meshMode.uiCapability()->setValueFromUi(FULL_MESH); meshMode.setValueWithFieldChanged(FULL_MESH);
} }
else else
{ {
meshMode.uiCapability()->setValueFromUi(FAULTS_MESH); meshMode.setValueWithFieldChanged(FAULTS_MESH);
} }
surfaceMode.uiCapability()->setValueFromUi(NO_SURFACE); surfaceMode.setValueWithFieldChanged(NO_SURFACE);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -411,13 +411,13 @@ void RimView::setMeshSurfDrawstyle()
{ {
if (isGridVisualizationMode()) if (isGridVisualizationMode())
{ {
surfaceMode.uiCapability()->setValueFromUi(SURFACE); surfaceMode.setValueWithFieldChanged(SURFACE);
meshMode.uiCapability()->setValueFromUi(FULL_MESH); meshMode.setValueWithFieldChanged(FULL_MESH);
} }
else else
{ {
surfaceMode.uiCapability()->setValueFromUi(FAULTS); surfaceMode.setValueWithFieldChanged(FAULTS);
meshMode.uiCapability()->setValueFromUi(FAULTS_MESH); meshMode.setValueWithFieldChanged(FAULTS_MESH);
} }
} }
@ -433,14 +433,14 @@ void RimView::setFaultMeshSurfDrawstyle()
// Mesh SF SF SF // Mesh SF SF SF
if (this->isGridVisualizationMode()) if (this->isGridVisualizationMode())
{ {
surfaceMode.uiCapability()->setValueFromUi(SURFACE); surfaceMode.setValueWithFieldChanged(SURFACE);
} }
else else
{ {
surfaceMode.uiCapability()->setValueFromUi(FAULTS); surfaceMode.setValueWithFieldChanged(FAULTS);
} }
meshMode.uiCapability()->setValueFromUi(FAULTS_MESH); meshMode.setValueWithFieldChanged(FAULTS_MESH);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -450,14 +450,14 @@ void RimView::setSurfOnlyDrawstyle()
{ {
if (isGridVisualizationMode()) if (isGridVisualizationMode())
{ {
surfaceMode.uiCapability()->setValueFromUi(SURFACE); surfaceMode.setValueWithFieldChanged(SURFACE);
} }
else else
{ {
surfaceMode.uiCapability()->setValueFromUi(FAULTS); surfaceMode.setValueWithFieldChanged(FAULTS);
} }
meshMode.uiCapability()->setValueFromUi(NO_MESH); meshMode.setValueWithFieldChanged(NO_MESH);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -468,13 +468,13 @@ void RimView::showGridCells(bool enableGridCells)
if (!enableGridCells) if (!enableGridCells)
{ {
m_previousGridModeMeshLinesWasFaults = meshMode() == FAULTS_MESH; m_previousGridModeMeshLinesWasFaults = meshMode() == FAULTS_MESH;
if (surfaceMode() != NO_SURFACE) surfaceMode.uiCapability()->setValueFromUi(FAULTS); if (surfaceMode() != NO_SURFACE) surfaceMode.setValueWithFieldChanged(FAULTS);
if (meshMode() != NO_MESH) meshMode.uiCapability()->setValueFromUi(FAULTS_MESH); if (meshMode() != NO_MESH) meshMode.setValueWithFieldChanged(FAULTS_MESH);
} }
else else
{ {
if (surfaceMode() != NO_SURFACE) surfaceMode.uiCapability()->setValueFromUi(SURFACE); if (surfaceMode() != NO_SURFACE) surfaceMode.setValueWithFieldChanged(SURFACE);
if (meshMode() != NO_MESH) meshMode.uiCapability()->setValueFromUi(m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH : FULL_MESH); if (meshMode() != NO_MESH) meshMode.setValueWithFieldChanged(m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH : FULL_MESH);
} }
m_gridCollection->isActive = enableGridCells; m_gridCollection->isActive = enableGridCells;
@ -487,7 +487,7 @@ void RimView::showGridCells(bool enableGridCells)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimView::setSurfaceDrawstyle() void RimView::setSurfaceDrawstyle()
{ {
if (surfaceMode() != NO_SURFACE) surfaceMode.uiCapability()->setValueFromUi(SURFACE); if (surfaceMode() != NO_SURFACE) surfaceMode.setValueWithFieldChanged(SURFACE);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

15
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1129,8 +1129,7 @@ void RiuMainWindow::slotFramerateChanged(double frameRate)
{ {
if (RiaApplication::instance()->activeReservoirView() != NULL) if (RiaApplication::instance()->activeReservoirView() != NULL)
{ {
caf::PdmUiFieldHandle* uiFieldHandle = RiaApplication::instance()->activeReservoirView()->maximumFrameRate.uiCapability(); RiaApplication::instance()->activeReservoirView()->maximumFrameRate.setValueWithFieldChanged(frameRate);
uiFieldHandle->setValueFromUi(QVariant(frameRate));
} }
} }
@ -1385,8 +1384,7 @@ void RiuMainWindow::slotToggleFaultLabelsAction(bool showLabels)
RimEclipseView* activeRiv = dynamic_cast<RimEclipseView*>(RiaApplication::instance()->activeReservoirView()); RimEclipseView* activeRiv = dynamic_cast<RimEclipseView*>(RiaApplication::instance()->activeReservoirView());
if (!activeRiv) return; if (!activeRiv) return;
caf::PdmUiFieldHandle* uiFieldHandle = activeRiv->faultCollection->showFaultLabel.uiCapability(); activeRiv->faultCollection->showFaultLabel.setValueWithFieldChanged(showLabels);
uiFieldHandle->setValueFromUi(showLabels);
refreshDrawStyleActions(); refreshDrawStyleActions();
} }
@ -1488,8 +1486,7 @@ void RiuMainWindow::slotScaleChanged(int scaleValue)
{ {
if (RiaApplication::instance()->activeReservoirView()) if (RiaApplication::instance()->activeReservoirView())
{ {
caf::PdmUiFieldHandle* uiFieldHandle = RiaApplication::instance()->activeReservoirView()->scaleZ.uiCapability(); RiaApplication::instance()->activeReservoirView()->scaleZ.setValueWithFieldChanged(scaleValue);
uiFieldHandle->setValueFromUi(scaleValue);
} }
} }
@ -1629,11 +1626,7 @@ void RiuMainWindow::slotAddWellCellsToRangeFilterAction(bool doAdd)
caf::AppEnum<RimEclipseWellCollection::WellCellsRangeFilterType> rangeAddType; caf::AppEnum<RimEclipseWellCollection::WellCellsRangeFilterType> rangeAddType;
rangeAddType = doAdd ? RimEclipseWellCollection::RANGE_ADD_INDIVIDUAL : RimEclipseWellCollection::RANGE_ADD_NONE; rangeAddType = doAdd ? RimEclipseWellCollection::RANGE_ADD_INDIVIDUAL : RimEclipseWellCollection::RANGE_ADD_NONE;
caf::PdmUiFieldHandle* pdmUiFieldHandle = riv->wellCollection()->wellCellsToRangeFilterMode.uiCapability(); riv->wellCollection()->wellCellsToRangeFilterMode.setValueWithFieldChanged(rangeAddType);
if (pdmUiFieldHandle)
{
pdmUiFieldHandle->setValueFromUi(static_cast<unsigned int>(rangeAddType.index()));
}
} }
} }

6
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -404,11 +404,7 @@ void RiuViewerCommands::slotHideFault()
RimFault* rimFault = eclipseView->faultCollection()->findFaultByName(faultName); RimFault* rimFault = eclipseView->faultCollection()->findFaultByName(faultName);
if (rimFault) if (rimFault)
{ {
caf::PdmUiFieldHandle* uiFieldHandle = rimFault->showFault.uiCapability(); rimFault->showFault.setValueWithFieldChanged(!rimFault->showFault);
if (uiFieldHandle)
{
uiFieldHandle->setValueFromUi(!rimFault->showFault);
}
} }
} }
} }