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

Renaming and comments

Browse Source 
p4#: 22333
This commit is contained in:
Jacob Støren 2013-09-06 15:05:41 +02:00
parent 86f5e6017d
commit 46f02f9384
4 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -218,7 +218,7 @@ void RivReservoirViewPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicL
{ {
if (frameIndex >= m_propFilteredGeometryFramesNeedsRegen.size() || m_propFilteredGeometryFramesNeedsRegen[frameIndex]) if (frameIndex >= m_propFilteredGeometryFramesNeedsRegen.size() || m_propFilteredGeometryFramesNeedsRegen[frameIndex])
{ {
createPropertyFilteredGeometry(frameIndex); createPropertyFilteredNoneWellCellGeometry(frameIndex);
} }
m_propFilteredGeometryFrames[frameIndex]->appendPartsToModel(model, gridIndices); m_propFilteredGeometryFrames[frameIndex]->appendPartsToModel(model, gridIndices);
} }
@ -381,7 +381,7 @@ void RivReservoirViewPartMgr::computeVisibility(cvf::UByteArray* cellVisibility,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::createPropertyFilteredGeometry(size_t frameIndex) void RivReservoirViewPartMgr::createPropertyFilteredNoneWellCellGeometry(size_t frameIndex)
{ {
RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData();
@ -390,9 +390,12 @@ void RivReservoirViewPartMgr::createPropertyFilteredGeometry(size_t frameIndex)
m_propFilteredGeometryFrames.resize(frameIndex + 1); m_propFilteredGeometryFrames.resize(frameIndex + 1);
m_propFilteredGeometryFramesNeedsRegen.resize(frameIndex + 1, true); m_propFilteredGeometryFramesNeedsRegen.resize(frameIndex + 1, true);
} }
if ( m_propFilteredGeometryFrames[frameIndex].isNull()) m_propFilteredGeometryFrames[frameIndex] = new RivReservoirPartMgr; if ( m_propFilteredGeometryFrames[frameIndex].isNull()) m_propFilteredGeometryFrames[frameIndex] = new RivReservoirPartMgr;
m_propFilteredGeometryFrames[frameIndex]->clearAndSetReservoir(res); m_propFilteredGeometryFrames[frameIndex]->clearAndSetReservoir(res);
m_propFilteredGeometryFrames[frameIndex]->setTransform(m_scaleTransform.p()); m_propFilteredGeometryFrames[frameIndex]->setTransform(m_scaleTransform.p());
std::vector<RigGridBase*> grids; std::vector<RigGridBase*> grids;
res->allGrids(&grids); res->allGrids(&grids);

26
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@ -39,18 +39,18 @@ public:
enum ReservoirGeometryCacheType enum ReservoirGeometryCacheType
{ {
ACTIVE, ACTIVE, ///< All Active cells without ALL_WELL_CELLS
ALL_WELL_CELLS, ALL_WELL_CELLS, ///< All cells ever having a connection to a well (Might be inactive cells as well. Wellhead cells typically)
VISIBLE_WELL_CELLS, VISIBLE_WELL_CELLS, ///< ALL_WELL_CELLS && visible well cells including Fence
VISIBLE_WELL_FENCE_CELLS, VISIBLE_WELL_FENCE_CELLS, ///< (! ALL_WELL_CELLS) && visible well cells including Fence
INACTIVE, INACTIVE, ///< All inactive cells, but invalid cells might or might not be included
RANGE_FILTERED, RANGE_FILTERED, ///< ACTIVE Filtered by the set of range filters
RANGE_FILTERED_INACTIVE, RANGE_FILTERED_INACTIVE, ///< INACTIVE Filtered by the set of range filters
RANGE_FILTERED_WELL_CELLS, RANGE_FILTERED_WELL_CELLS, ///< ALL_WELL_CELLS Filtered by the set of range filters
VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER, VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER, ///< VISIBLE_WELL_CELLS && !RANGE_FILTERED_WELL_CELLS
VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER, VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER, ///< VISIBLE_WELL_FENCE_CELLS && !RANGE_FILTERED
PROPERTY_FILTERED, PROPERTY_FILTERED, ///< (RANGE_FILTERED || VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER) && !ExcludedByPropFilter && IncludedByPropFilter
PROPERTY_FILTERED_WELL_CELLS // Includes RANGE_FILTERED_WELL_CELLS and VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER and VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER PROPERTY_FILTERED_WELL_CELLS ///< (!(hasActiveRangeFilters || visibleWellCells) && (*ALL_WELL_CELLS)) || RANGE_FILTERED_WELL_CELLS || VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER
}; };
void clearGeometryCache(); void clearGeometryCache();
@ -72,7 +72,7 @@ private:
void createGeometry(ReservoirGeometryCacheType geometryType); void createGeometry(ReservoirGeometryCacheType geometryType);
void computeVisibility(cvf::UByteArray* cellVisibility, ReservoirGeometryCacheType geometryType, RigGridBase* grid, size_t gridIdx); void computeVisibility(cvf::UByteArray* cellVisibility, ReservoirGeometryCacheType geometryType, RigGridBase* grid, size_t gridIdx);
void createPropertyFilteredGeometry(size_t frameIndex); void createPropertyFilteredNoneWellCellGeometry(size_t frameIndex);
void createPropertyFilteredWellGeometry(size_t frameIndex); void createPropertyFilteredWellGeometry(size_t frameIndex);
void clearGeometryCache(ReservoirGeometryCacheType geomType); void clearGeometryCache(ReservoirGeometryCacheType geomType);

12
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@ -42,8 +42,8 @@ RimCellRangeFilterCollection::RimCellRangeFilterCollection()
CAF_PDM_InitObject("Cell Range Filters", ":/CellFilter_Range.png", "", ""); CAF_PDM_InitObject("Cell Range Filters", ":/CellFilter_Range.png", "", "");
CAF_PDM_InitFieldNoDefault(&rangeFilters, "RangeFilters", "Range Filters", "", "", ""); CAF_PDM_InitFieldNoDefault(&rangeFilters, "RangeFilters", "Range Filters", "", "", "");
CAF_PDM_InitField(&active, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
active.setUiHidden(true); isActive.setUiHidden(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -146,7 +146,7 @@ RigActiveCellInfo* RimCellRangeFilterCollection::activeCellInfo() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimCellRangeFilterCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
updateUiIconFromState(active); updateUiIconFromState(isActive);
CVF_ASSERT(m_reservoirView); CVF_ASSERT(m_reservoirView);
@ -209,7 +209,7 @@ void RimCellRangeFilterCollection::remove(RimCellRangeFilter* rangeFilter)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimCellRangeFilterCollection::hasActiveFilters() const bool RimCellRangeFilterCollection::hasActiveFilters() const
{ {
if (!active) return false; if (!isActive()) return false;
std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it; std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it) for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it)
@ -225,7 +225,7 @@ bool RimCellRangeFilterCollection::hasActiveFilters() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCellRangeFilterCollection::objectToggleField() caf::PdmFieldHandle* RimCellRangeFilterCollection::objectToggleField()
{ {
return &active; return &isActive;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -233,7 +233,7 @@ caf::PdmFieldHandle* RimCellRangeFilterCollection::objectToggleField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimCellRangeFilterCollection::hasActiveIncludeFilters() const bool RimCellRangeFilterCollection::hasActiveIncludeFilters() const
{ {
if (!active) return false; if (!isActive) return false;
std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it; std::list< caf::PdmPointer< RimCellRangeFilter > >::const_iterator it;
for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it) for (it = rangeFilters.v().begin(); it != rangeFilters.v().end(); ++it)

2
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.h
View File

@ -35,7 +35,7 @@ public:
virtual ~RimCellRangeFilterCollection(); virtual ~RimCellRangeFilterCollection();
// Fields // Fields
caf::PdmField<bool> active; caf::PdmField<bool> isActive;
caf::PdmField< std::list< caf::PdmPointer< RimCellRangeFilter > > > rangeFilters; caf::PdmField< std::list< caf::PdmPointer< RimCellRangeFilter > > > rangeFilters;
// Methods // Methods