From b2376b4a77180966962c531c7fae344f55313a03 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 2 Jan 2014 15:15:50 +0100 Subject: [PATCH] Renamed to Show faults outside filters --- .../ProjectDataModel/RimFaultCollection.cpp | 4 ++-- .../ProjectDataModel/RimFaultCollection.h | 2 +- .../ProjectDataModel/RimReservoirView.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index 4b8f448454..b9d7002b86 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -73,7 +73,7 @@ RimFaultCollection::RimFaultCollection() CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite fault faces", "", "", ""); CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", ""); CAF_PDM_InitField(&forceFaultColor, "ForceFaultColor", false, "Ignore results on faults", "", "", ""); - CAF_PDM_InitField(&limitFaultsToFilter, "LimitFaultsToFilter", true, "Hide fault outside filters", "", "", ""); + CAF_PDM_InitField(&showFaultsOutsideFilters,"ShowFaultsOutsideFilters", false, "Show faults outside filters", "", "", ""); CAF_PDM_InitField(&faultFaceCulling, "FaultFaceCulling", caf::AppEnum(RimFaultCollection::FAULT_FRONT_FACE_CULLING), "Face culling", "", "", ""); @@ -116,7 +116,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel &showNNCs == changedField || &showFaultCollection == changedField || &showFaultLabel == changedField || - &limitFaultsToFilter == changedField || + &showFaultsOutsideFilters == changedField || &faultLabelColor == changedField || &faultFaceCulling == changedField || &forceFaultColor == changedField diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.h b/ApplicationCode/ProjectDataModel/RimFaultCollection.h index 6d9f7968f7..caf802dc76 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.h +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.h @@ -60,7 +60,7 @@ public: caf::PdmField showFaultFaces; caf::PdmField showOppositeFaultFaces; - caf::PdmField limitFaultsToFilter; + caf::PdmField showFaultsOutsideFilters; caf::PdmField showNNCs; caf::PdmField forceFaultColor; diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 117c132d4c..422380dab5 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -630,10 +630,10 @@ void RimReservoirView::createDisplayModel() } if (!this->propertyFilterCollection()->hasActiveFilters() || - !faultCollection()->limitFaultsToFilter) + faultCollection()->showFaultsOutsideFilters) { std::vector faultGeometryTypesToAdd; - if (faultCollection()->limitFaultsToFilter) + if (!faultCollection()->showFaultsOutsideFilters) { faultGeometryTypesToAdd = m_visibleGridParts; } @@ -733,7 +733,7 @@ void RimReservoirView::updateCurrentTimeStep() geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED); m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED, m_currentTimeStep, gridIndices); - if (faultCollection()->limitFaultsToFilter) + if (!faultCollection()->showFaultsOutsideFilters) { m_reservoirGridPartManager->appendFaultsDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED, m_currentTimeStep); m_reservoirGridPartManager->appendFaultLabelsDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED, m_currentTimeStep); @@ -741,7 +741,7 @@ void RimReservoirView::updateCurrentTimeStep() geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS); m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, gridIndices); - if (faultCollection()->limitFaultsToFilter) + if (!faultCollection()->showFaultsOutsideFilters) { m_reservoirGridPartManager->appendFaultsDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep); } @@ -760,7 +760,7 @@ void RimReservoirView::updateCurrentTimeStep() { m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE, gridIndices); - if (faultCollection()->limitFaultsToFilter) + if (!faultCollection()->showFaultsOutsideFilters) { m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE); } @@ -769,7 +769,7 @@ void RimReservoirView::updateCurrentTimeStep() { m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE, gridIndices); - if (faultCollection()->limitFaultsToFilter) + if (!faultCollection()->showFaultsOutsideFilters) { m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE); } @@ -828,7 +828,7 @@ void RimReservoirView::updateCurrentTimeStep() } } - if (faultCollection()->limitFaultsToFilter) + if (!faultCollection()->showFaultsOutsideFilters) { faultGeometriesToRecolor = geometriesToRecolor; }