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

Faults : Show NNCs moved from fault result to fault collection

Browse Source
This commit is contained in:
Magne Sjaastad 2014-08-26 11:55:26 +02:00
parent f69413087a
commit 56b1f78f2f
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -132,7 +132,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
rivFaultPart->appendOppositeFaultFacesToModel(&parts); rivFaultPart->appendOppositeFaultFacesToModel(&parts);
} }
if (faultCollection->showFaultFaces() || faultCollection->showOppositeFaultFaces() || m_reservoirView->faultResultSettings()->showNNCs() || forceDisplayOfFault) if (faultCollection->showFaultFaces() || faultCollection->showOppositeFaultFaces() || faultCollection->showNNCs() || forceDisplayOfFault)
{ {
rivFaultPart->appendMeshLinePartsToModel(&parts); rivFaultPart->appendMeshLinePartsToModel(&parts);
} }
@ -142,7 +142,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
if (rimFault->showFault() && faultCollection->showFaultCollection()) if (rimFault->showFault() && faultCollection->showFaultCollection())
{ {
if (m_reservoirView->faultResultSettings()->showNNCs()) if (faultCollection->showNNCs())
{ {
rivFaultPart->appendNNCFacesToModel(&parts); rivFaultPart->appendNNCFacesToModel(&parts);
} }

5
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@ -69,6 +69,8 @@ RimFaultCollection::RimFaultCollection()
cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor(); cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
CAF_PDM_InitField(&faultLabelColor, "FaultLabelColor", defWellLabelColor, "Label color", "", "", ""); CAF_PDM_InitField(&faultLabelColor, "FaultLabelColor", defWellLabelColor, "Label color", "", "", "");
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
CAF_PDM_InitFieldNoDefault(&faults, "Faults", "Faults", "", "", ""); CAF_PDM_InitFieldNoDefault(&faults, "Faults", "Faults", "", "", "");
CAF_PDM_InitFieldNoDefault(&noCommonAreaNnncCollection, "NoCommonAreaNnncCollection", "NNCs With No Common Area", "", "", ""); CAF_PDM_InitFieldNoDefault(&noCommonAreaNnncCollection, "NoCommonAreaNnncCollection", "NNCs With No Common Area", "", "", "");
@ -106,7 +108,8 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
&showFaultLabel == changedField || &showFaultLabel == changedField ||
&m_showFaultsOutsideFilters == changedField || &m_showFaultsOutsideFilters == changedField ||
&faultLabelColor == changedField || &faultLabelColor == changedField ||
&faultResult == changedField &faultResult == changedField ||
&showNNCs == changedField
) )
{ {
if (m_reservoirView) if (m_reservoirView)

1
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@ -74,6 +74,7 @@ public:
caf::PdmField<cvf::Color3f> faultLabelColor; caf::PdmField<cvf::Color3f> faultLabelColor;
caf::PdmField<bool> showFaultCollection; caf::PdmField<bool> showFaultCollection;
caf::PdmField<bool> showNNCs;
caf::PdmPointersField<RimFault*> faults; caf::PdmPointersField<RimFault*> faults;
RimFault* findFaultByName(QString name); RimFault* findFaultByName(QString name);

4
ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
View File

@ -37,8 +37,6 @@ RimFaultResultSlot::RimFaultResultSlot()
CAF_PDM_InitField(&showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", ""); CAF_PDM_InitField(&showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", "");
showCustomFaultResult.setUiHidden(true); showCustomFaultResult.setUiHidden(true);
CAF_PDM_InitField(&showNNCs, "ShowNNCs", false, "Show NNCs", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
m_customFaultResult = new RimResultSlot(); m_customFaultResult = new RimResultSlot();
m_customFaultResult.setOwnerObject(this); m_customFaultResult.setOwnerObject(this);
@ -125,8 +123,6 @@ caf::PdmFieldHandle* RimFaultResultSlot::objectToggleField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimFaultResultSlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&showNNCs);
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result"); caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
group1->add(&(m_customFaultResult->m_resultTypeUiField)); group1->add(&(m_customFaultResult->m_resultTypeUiField));
group1->add(&(m_customFaultResult->m_porosityModelUiField)); group1->add(&(m_customFaultResult->m_porosityModelUiField));

1
ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
View File

@ -39,7 +39,6 @@ public:
void setReservoirView(RimReservoirView* ownerReservoirView); void setReservoirView(RimReservoirView* ownerReservoirView);
caf::PdmField<bool> showNNCs;
caf::PdmField<bool> showCustomFaultResult; caf::PdmField<bool> showCustomFaultResult;
bool hasValidCustomResult(); bool hasValidCustomResult();