mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Faults : Show NNCs moved from fault result to fault collection
This commit is contained in:
parent
f69413087a
commit
56b1f78f2f
@ -132,7 +132,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
|
||||
rivFaultPart->appendOppositeFaultFacesToModel(&parts);
|
||||
}
|
||||
|
||||
if (faultCollection->showFaultFaces() || faultCollection->showOppositeFaultFaces() || m_reservoirView->faultResultSettings()->showNNCs() || forceDisplayOfFault)
|
||||
if (faultCollection->showFaultFaces() || faultCollection->showOppositeFaultFaces() || faultCollection->showNNCs() || forceDisplayOfFault)
|
||||
{
|
||||
rivFaultPart->appendMeshLinePartsToModel(&parts);
|
||||
}
|
||||
@ -142,7 +142,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
|
||||
|
||||
if (rimFault->showFault() && faultCollection->showFaultCollection())
|
||||
{
|
||||
if (m_reservoirView->faultResultSettings()->showNNCs())
|
||||
if (faultCollection->showNNCs())
|
||||
{
|
||||
rivFaultPart->appendNNCFacesToModel(&parts);
|
||||
}
|
||||
|
@ -68,6 +68,8 @@ RimFaultCollection::RimFaultCollection()
|
||||
CAF_PDM_InitField(&showFaultLabel, "ShowFaultLabel", false, "Show labels", "", "", "");
|
||||
cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
|
||||
CAF_PDM_InitField(&faultLabelColor, "FaultLabelColor", defWellLabelColor, "Label color", "", "", "");
|
||||
|
||||
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&faults, "Faults", "Faults", "", "", "");
|
||||
|
||||
@ -106,7 +108,8 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
|
||||
&showFaultLabel == changedField ||
|
||||
&m_showFaultsOutsideFilters == changedField ||
|
||||
&faultLabelColor == changedField ||
|
||||
&faultResult == changedField
|
||||
&faultResult == changedField ||
|
||||
&showNNCs == changedField
|
||||
)
|
||||
{
|
||||
if (m_reservoirView)
|
||||
|
@ -74,6 +74,7 @@ public:
|
||||
caf::PdmField<cvf::Color3f> faultLabelColor;
|
||||
|
||||
caf::PdmField<bool> showFaultCollection;
|
||||
caf::PdmField<bool> showNNCs;
|
||||
|
||||
caf::PdmPointersField<RimFault*> faults;
|
||||
RimFault* findFaultByName(QString name);
|
||||
|
@ -37,8 +37,6 @@ RimFaultResultSlot::RimFaultResultSlot()
|
||||
CAF_PDM_InitField(&showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", "");
|
||||
showCustomFaultResult.setUiHidden(true);
|
||||
|
||||
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
|
||||
m_customFaultResult = new RimResultSlot();
|
||||
m_customFaultResult.setOwnerObject(this);
|
||||
@ -125,8 +123,6 @@ caf::PdmFieldHandle* RimFaultResultSlot::objectToggleField()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimFaultResultSlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
|
||||
{
|
||||
uiOrdering.add(&showNNCs);
|
||||
|
||||
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
|
||||
group1->add(&(m_customFaultResult->m_resultTypeUiField));
|
||||
group1->add(&(m_customFaultResult->m_porosityModelUiField));
|
||||
|
@ -39,7 +39,6 @@ public:
|
||||
|
||||
void setReservoirView(RimReservoirView* ownerReservoirView);
|
||||
|
||||
caf::PdmField<bool> showNNCs;
|
||||
caf::PdmField<bool> showCustomFaultResult;
|
||||
|
||||
bool hasValidCustomResult();
|
||||
|
Loading…
Reference in New Issue
Block a user