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

Option: Renamed to Show result on faults

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

10
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -154,17 +154,17 @@ void RivReservoirFaultsPartMgr::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
{
if (m_faultCollection->forceFaultColor())
{
applySingleColorEffect();
}
else
if (m_faultCollection->showResultsOnFaults())
{
for (size_t i = 0; i < m_faultParts.size(); i++)
{
m_faultParts[i]->updateCellResultColor(timeStepIndex, cellResultSlot);
}
}
else
{
applySingleColorEffect();
}
}
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@ -69,10 +69,10 @@ RimFaultCollection::RimFaultCollection()
CAF_PDM_InitField(&showGeometryDetectedFaults, "ShowGeometryDetectedFaults", false, "Show geometry detected faults", "", "", "");
showGeometryDetectedFaults.setUiHidden(true);
CAF_PDM_InitField(&showFaultFaces, "ShowFaultFaces", true, "Show faults faces", "", "", "");
CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite fault faces", "", "", "");
CAF_PDM_InitField(&showFaultFaces, "ShowFaultFaces", true, "Show faults faces", "", "", "");
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(&showResultsOnFaults, "ShowResultsOnFaults", true, "Show results on faults", "", "", "");
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", "", "", "");
@ -119,7 +119,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
&showFaultsOutsideFilters == changedField ||
&faultLabelColor == changedField ||
&faultFaceCulling == changedField ||
&forceFaultColor == changedField
&showResultsOnFaults == changedField
)
{
if (m_reservoirView)

2
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@ -62,7 +62,7 @@ public:
caf::PdmField<bool> showOppositeFaultFaces;
caf::PdmField<bool> showFaultsOutsideFilters;
caf::PdmField<bool> showNNCs;
caf::PdmField<bool> forceFaultColor;
caf::PdmField<bool> showResultsOnFaults;
caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultFaceCulling;