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 Fault results

Browse Source
This commit is contained in:
Magne Sjaastad
2014-01-02 15:24:07 +01:00
parent 088df79245
commit 34ed2d7e9f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -631,7 +631,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
bool isShowingGrid = m_rimFaultCollection->isGridVisualizationMode();
if (!isShowingGrid )
{
if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
if (m_rimFaultCollection->faultResult() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
{
if (m_grid->mainGrid()->faceNormalsIsOutwards())
{
@@ -642,7 +642,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
return caf::FC_FRONT;
}
}
else if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
else if (m_rimFaultCollection->faultResult() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
{
if (m_grid->mainGrid()->faceNormalsIsOutwards())
{

10
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@@ -44,9 +44,9 @@ namespace caf
template<>
void AppEnum< RimFaultCollection::FaultFaceCullingMode >::setUp()
{
addItem(RimFaultCollection::FAULT_BACK_FACE_CULLING, "FAULT_BACK_FACE_CULLING", "Show outside face only");
addItem(RimFaultCollection::FAULT_FRONT_FACE_CULLING, "FAULT_FRONT_FACE_CULLING", "Show inside face only");
addItem(RimFaultCollection::FAULT_NO_FACE_CULLING, "FAULT_NO_FACE_CULLING", "Show Both");
addItem(RimFaultCollection::FAULT_BACK_FACE_CULLING, "FAULT_BACK_FACE_CULLING", "Cell in front of fault");
addItem(RimFaultCollection::FAULT_FRONT_FACE_CULLING, "FAULT_FRONT_FACE_CULLING", "Cell behind fault");
addItem(RimFaultCollection::FAULT_NO_FACE_CULLING, "FAULT_NO_FACE_CULLING", "Show both face results");
setDefault(RimFaultCollection::FAULT_NO_FACE_CULLING);
}
}
@@ -75,7 +75,7 @@ RimFaultCollection::RimFaultCollection()
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", "", "", "");
CAF_PDM_InitField(&faultResult, "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_FRONT_FACE_CULLING), "Fault result", "", "", "");
CAF_PDM_InitField(&showFaultLabel, "ShowFaultLabel", false, "Show fault labels", "", "", "");
cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
@@ -118,7 +118,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
&showFaultLabel == changedField ||
&showFaultsOutsideFilters == changedField ||
&faultLabelColor == changedField ||
&faultFaceCulling == changedField ||
&faultResult == changedField ||
&showResultsOnFaults == changedField
)
{

2
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@@ -64,7 +64,7 @@ public:
caf::PdmField<bool> showNNCs;
caf::PdmField<bool> showResultsOnFaults;
caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultFaceCulling;
caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultResult;
caf::PdmField<bool> showFaultLabel;