OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 23:23:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

NNC: Added preliminary Gui control

Browse Source
This commit is contained in:
Jacob Støren 2013-12-16 11:29:48 +01:00
parent 440499fbfd
commit 56616097d3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -119,10 +119,15 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
rivFaultPart->appendLabelPartsToModel(&parts);
}
if (m_faultCollection->showFaultFaces() || m_faultCollection->showOppositeFaultFaces())
if (m_faultCollection->showFaultFaces() || m_faultCollection->showOppositeFaultFaces() || m_faultCollection->showNNCs() )
{
rivFaultPart->appendMeshLinePartsToModel(&parts);
}
if (m_faultCollection->showNNCs())
{
rivFaultPart->appendNNCFacesToModel(&parts);
}
}
}

2
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@ -56,6 +56,7 @@ RimFaultCollection::RimFaultCollection()
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(&limitFaultsToFilter, "LimitFaultsToFilter", true, "Hide fault outside filters", "", "", "");
CAF_PDM_InitField(&showFaultLabel, "ShowFaultLabel", true, "Show fault labels", "", "", "");
@ -95,6 +96,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
if (&showGeometryDetectedFaults == changedField ||
&showFaultFaces == changedField ||
&showOppositeFaultFaces == changedField ||
&showNNCs == changedField ||
&showFaultCollection == changedField ||
&showFaultLabel == changedField ||
&limitFaultsToFilter == changedField ||

4
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@ -47,11 +47,13 @@ public:
void setReservoirView(RimReservoirView* ownerReservoirView);
void syncronizeFaults();
caf::PdmField<bool> showGeometryDetectedFaults;
caf::PdmField<bool> showGeometryDetectedFaults; // Obsolete, to be removed
caf::PdmField<bool> showFaultFaces;
caf::PdmField<bool> showOppositeFaultFaces;
caf::PdmField<bool> limitFaultsToFilter;
caf::PdmField<bool> showNNCs;
caf::PdmField<bool> showFaultLabel;
caf::PdmField<cvf::Color3f> faultLabelColor;