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

Fault visibility : Restructured code

Browse Source
This commit is contained in:
Magne Sjaastad
2014-08-01 14:48:37 +02:00
parent 0550f9df8c
commit 39dc1421c4
5 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -2062,7 +2062,7 @@ void RiaApplication::regressionTestConfigureProject()
riv->viewer()->setFixedSize(1000, 745); riv->viewer()->setFixedSize(1000, 745);
} }
riv->faultCollection->showFaultsOutsideFilters.setValueFromUi(false); riv->faultCollection->setShowFaultsOutsideFilters(false);
riv->faultResultSettings->showCustomFaultResult.setValueFromUi(false); riv->faultResultSettings->showCustomFaultResult.setValueFromUi(false);
} }
} }

2
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -119,7 +119,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
forceDisplayOfFault = true; forceDisplayOfFault = true;
} }
if (rimFault->showFault() || forceDisplayOfFault) if ( (faultCollection->showFaultCollection() && rimFault->showFault()) || forceDisplayOfFault)
{ {
if (faultCollection->showFaultFaces() || forceDisplayOfFault) if (faultCollection->showFaultFaces() || forceDisplayOfFault)
{ {

24
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@@ -59,7 +59,7 @@ RimFaultCollection::RimFaultCollection()
CAF_PDM_InitField(&showFaultFaces, "ShowFaultFaces", true, "Show defined faces", "", "", ""); CAF_PDM_InitField(&showFaultFaces, "ShowFaultFaces", true, "Show defined faces", "", "", "");
CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite faces", "", "", ""); CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite faces", "", "", "");
CAF_PDM_InitField(&showFaultsOutsideFilters,"ShowFaultsOutsideFilters", true, "Show faults outside filters", "", "", ""); CAF_PDM_InitField(&m_showFaultsOutsideFilters,"ShowFaultsOutsideFilters", true, "Show faults outside filters", "", "", "");
CAF_PDM_InitField(&faultResult, "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_BACK_FACE_CULLING), "Dynamic Face Selection", "", "", ""); CAF_PDM_InitField(&faultResult, "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_BACK_FACE_CULLING), "Dynamic Face Selection", "", "", "");
@@ -97,7 +97,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
&showOppositeFaultFaces == changedField || &showOppositeFaultFaces == changedField ||
&showFaultCollection == changedField || &showFaultCollection == changedField ||
&showFaultLabel == changedField || &showFaultLabel == changedField ||
&showFaultsOutsideFilters == changedField || &m_showFaultsOutsideFilters == changedField ||
&faultLabelColor == changedField || &faultLabelColor == changedField ||
&faultResult == changedField &faultResult == changedField
) )
@@ -254,7 +254,7 @@ void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
labs->add(&faultLabelColor); labs->add(&faultLabelColor);
caf::PdmUiGroup* adv = uiOrdering.addNewGroup("Fault Options"); caf::PdmUiGroup* adv = uiOrdering.addNewGroup("Fault Options");
adv->add(&showFaultsOutsideFilters); adv->add(&m_showFaultsOutsideFilters);
caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup("Fault Face Visibility"); caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup("Fault Face Visibility");
ffviz->add(&showFaultFaces); ffviz->add(&showFaultFaces);
@@ -262,3 +262,21 @@ void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
ffviz->add(&faultResult); ffviz->add(&faultResult);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimFaultCollection::showFaultsOutsideFilters() const
{
if (!showFaultCollection) return false;
return m_showFaultsOutsideFilters;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::setShowFaultsOutsideFilters(bool enableState)
{
m_showFaultsOutsideFilters = enableState;
}

7
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@@ -57,10 +57,12 @@ public:
void syncronizeFaults(); void syncronizeFaults();
bool isGridVisualizationMode() const; bool isGridVisualizationMode() const;
bool showFaultsOutsideFilters() const;
void setShowFaultsOutsideFilters(bool enableState);
caf::PdmField<bool> showFaultFaces; caf::PdmField<bool> showFaultFaces;
caf::PdmField<bool> showOppositeFaultFaces; caf::PdmField<bool> showOppositeFaultFaces;
caf::PdmField<bool> showFaultsOutsideFilters;
caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultResult; caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultResult;
@@ -80,6 +82,7 @@ private:
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
private: private:
RimReservoirView* m_reservoirView; caf::PdmField<bool> m_showFaultsOutsideFilters;
RimReservoirView* m_reservoirView;
}; };

10
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -620,7 +620,7 @@ void RimReservoirView::createDisplayModel()
m_visibleGridParts = geometryTypesToAdd; m_visibleGridParts = geometryTypesToAdd;
} }
if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters) if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters())
{ {
updateFaultForcedVisibility(); updateFaultForcedVisibility();
@@ -714,7 +714,7 @@ void RimReservoirView::updateCurrentTimeStep()
geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS); geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS);
m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, gridIndices); m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, gridIndices);
if (faultCollection()->showFaultsOutsideFilters) if (faultCollection()->showFaultsOutsideFilters())
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes(); std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
@@ -748,7 +748,7 @@ void RimReservoirView::updateCurrentTimeStep()
{ {
m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE, gridIndices); m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE, gridIndices);
if (!faultCollection()->showFaultsOutsideFilters) if (!faultCollection()->showFaultsOutsideFilters())
{ {
m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE); m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE);
} }
@@ -757,7 +757,7 @@ void RimReservoirView::updateCurrentTimeStep()
{ {
m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE, gridIndices); m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE, gridIndices);
if (!faultCollection()->showFaultsOutsideFilters) if (!faultCollection()->showFaultsOutsideFilters())
{ {
m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE); m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE);
} }
@@ -1980,7 +1980,7 @@ std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimReservoirVie
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts;
if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters) if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
{ {
faultParts.push_back(RivReservoirViewPartMgr::PROPERTY_FILTERED); faultParts.push_back(RivReservoirViewPartMgr::PROPERTY_FILTERED);
faultParts.push_back(RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS); faultParts.push_back(RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS);