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

Renamed to Show faults outside filters

Browse Source
This commit is contained in:
Magne Sjaastad 2014-01-02 15:15:50 +01:00
parent 183203344b
commit b2376b4a77
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@ -73,7 +73,7 @@ RimFaultCollection::RimFaultCollection()
CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite fault faces", "", "", ""); CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite fault faces", "", "", "");
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", ""); CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
CAF_PDM_InitField(&forceFaultColor, "ForceFaultColor", false, "Ignore results on faults", "", "", ""); 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::FaultFaceCullingMode>(RimFaultCollection::FAULT_FRONT_FACE_CULLING), "Face culling", "", "", ""); CAF_PDM_InitField(&faultFaceCulling, "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_FRONT_FACE_CULLING), "Face culling", "", "", "");
@ -116,7 +116,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
&showNNCs == changedField || &showNNCs == changedField ||
&showFaultCollection == changedField || &showFaultCollection == changedField ||
&showFaultLabel == changedField || &showFaultLabel == changedField ||
&limitFaultsToFilter == changedField || &showFaultsOutsideFilters == changedField ||
&faultLabelColor == changedField || &faultLabelColor == changedField ||
&faultFaceCulling == changedField || &faultFaceCulling == changedField ||
&forceFaultColor == changedField &forceFaultColor == changedField

2
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@ -60,7 +60,7 @@ public:
caf::PdmField<bool> showFaultFaces; caf::PdmField<bool> showFaultFaces;
caf::PdmField<bool> showOppositeFaultFaces; caf::PdmField<bool> showOppositeFaultFaces;
caf::PdmField<bool> limitFaultsToFilter; caf::PdmField<bool> showFaultsOutsideFilters;
caf::PdmField<bool> showNNCs; caf::PdmField<bool> showNNCs;
caf::PdmField<bool> forceFaultColor; caf::PdmField<bool> forceFaultColor;

14
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -630,10 +630,10 @@ void RimReservoirView::createDisplayModel()
} }
if (!this->propertyFilterCollection()->hasActiveFilters() || if (!this->propertyFilterCollection()->hasActiveFilters() ||
!faultCollection()->limitFaultsToFilter) faultCollection()->showFaultsOutsideFilters)
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAdd; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAdd;
if (faultCollection()->limitFaultsToFilter) if (!faultCollection()->showFaultsOutsideFilters)
{ {
faultGeometryTypesToAdd = m_visibleGridParts; faultGeometryTypesToAdd = m_visibleGridParts;
} }
@ -733,7 +733,7 @@ void RimReservoirView::updateCurrentTimeStep()
geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED); geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED);
m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED, m_currentTimeStep, gridIndices); 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->appendFaultsDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED, m_currentTimeStep);
m_reservoirGridPartManager->appendFaultLabelsDynamicGeometryPartsToModel(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); geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS);
m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, gridIndices); 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); 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); 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); m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE);
} }
@ -769,7 +769,7 @@ void RimReservoirView::updateCurrentTimeStep()
{ {
m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE, gridIndices); m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE, gridIndices);
if (faultCollection()->limitFaultsToFilter) if (!faultCollection()->showFaultsOutsideFilters)
{ {
m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE); m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE);
} }
@ -828,7 +828,7 @@ void RimReservoirView::updateCurrentTimeStep()
} }
} }
if (faultCollection()->limitFaultsToFilter) if (!faultCollection()->showFaultsOutsideFilters)
{ {
faultGeometriesToRecolor = geometriesToRecolor; faultGeometriesToRecolor = geometriesToRecolor;
} }