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

#945 Removed flag as watertight flag was always set true

Browse Source
This commit is contained in:
Magne Sjaastad 2016-11-18 14:05:50 +01:00
parent 8344617ba9
commit e89b73d64c
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -283,9 +283,9 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::forceWatertightGeometryOn(bool forceWatertightGeometry) void RivReservoirFaultsPartMgr::forceWatertightGeometryOn()
{ {
m_forceWatertightGeometry = forceWatertightGeometry; m_forceWatertightGeometry = true;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
View File

@ -49,7 +49,7 @@ public:
void setTransform(cvf::Transform* scaleTransform); void setTransform(cvf::Transform* scaleTransform);
void setCellVisibility(cvf::UByteArray* cellVisibilities); void setCellVisibility(cvf::UByteArray* cellVisibilities);
void forceWatertightGeometryOn(bool forceWatertightGeometry); void forceWatertightGeometryOn();
void setOpacityLevel(float opacity); void setOpacityLevel(float opacity);
void applySingleColorEffect(); void applySingleColorEffect();

4
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

@ -191,11 +191,11 @@ void RivReservoirPartMgr::appendFaultLabelPartsToModel(cvf::ModelBasicList* mode
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::forceWatertightGeometryOn(bool forceWatertightGeometry) void RivReservoirPartMgr::forceWatertightGeometryOn()
{ {
if (m_faultsPartMgr.notNull()) if (m_faultsPartMgr.notNull())
{ {
m_faultsPartMgr->forceWatertightGeometryOn(forceWatertightGeometry); m_faultsPartMgr->forceWatertightGeometryOn();
} }
} }

2
ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
View File

@ -50,7 +50,7 @@ public:
void clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView); void clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView);
void setTransform(cvf::Transform* scaleTransform); void setTransform(cvf::Transform* scaleTransform);
void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities ); void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities );
void forceWatertightGeometryOn(bool forceWatertightGeometry); void forceWatertightGeometryOn();
//size_t gridCount() { return m_allGrids.size(); } //size_t gridCount() { return m_allGrids.size(); }
cvf::ref<cvf::UByteArray> cvf::ref<cvf::UByteArray>

10
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -1099,28 +1099,28 @@ void RivReservoirViewPartMgr::appendFaultLabelsDynamicGeometryPartsToModel(cvf::
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::forceWatertightGeometryForType(RivCellSetEnum geometryType, bool forceWatertightGeometry) void RivReservoirViewPartMgr::forceWatertightGeometryOnForType(RivCellSetEnum geometryType)
{ {
if (geometryType == PROPERTY_FILTERED) if (geometryType == PROPERTY_FILTERED)
{ {
for (size_t i = 0; i < m_propFilteredGeometryFrames.size(); ++i) for (size_t i = 0; i < m_propFilteredGeometryFrames.size(); ++i)
{ {
if (m_propFilteredGeometryFrames[i].p()) m_propFilteredGeometryFrames[i]->forceWatertightGeometryOn(forceWatertightGeometry); if (m_propFilteredGeometryFrames[i].p()) m_propFilteredGeometryFrames[i]->forceWatertightGeometryOn();
} }
} }
else if (geometryType == PROPERTY_FILTERED_WELL_CELLS) else if (geometryType == PROPERTY_FILTERED_WELL_CELLS)
{ {
for (size_t i = 0; i < m_propFilteredWellGeometryFrames.size(); ++i) for (size_t i = 0; i < m_propFilteredWellGeometryFrames.size(); ++i)
{ {
if (m_propFilteredWellGeometryFrames[i].p()) m_propFilteredWellGeometryFrames[i]->forceWatertightGeometryOn(forceWatertightGeometry); if (m_propFilteredWellGeometryFrames[i].p()) m_propFilteredWellGeometryFrames[i]->forceWatertightGeometryOn();
} }
} }
else else
{ {
if (forceWatertightGeometry && m_geometriesNeedsRegen[geometryType]) if (m_geometriesNeedsRegen[geometryType])
{ {
createGeometry(geometryType); createGeometry(geometryType);
} }
m_geometries[geometryType].forceWatertightGeometryOn(forceWatertightGeometry); m_geometries[geometryType].forceWatertightGeometryOn();
} }
} }

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@ -78,7 +78,7 @@ public:
void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType); void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex); void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex);
void forceWatertightGeometryForType(RivCellSetEnum geometryType, bool forceVisibility); void forceWatertightGeometryOnForType(RivCellSetEnum geometryType);
private: private:
void createGeometry(RivCellSetEnum geometryType); void createGeometry(RivCellSetEnum geometryType);

16
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1372,7 +1372,7 @@ void RimEclipseView::forceWatertightGeometryOn()
{ {
if (this->viewController() && this->viewController()->isVisibleCellsOveridden()) if (this->viewController() && this->viewController()->isVisibleCellsOveridden())
{ {
m_reservoirGridPartManager->forceWatertightGeometryForType(OVERRIDDEN_CELL_VISIBILITY, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(OVERRIDDEN_CELL_VISIBILITY);
return; return;
} }
@ -1382,18 +1382,18 @@ void RimEclipseView::forceWatertightGeometryOn()
if (!faultCollection->showFaultCollection) if (!faultCollection->showFaultCollection)
{ {
m_reservoirGridPartManager->forceWatertightGeometryForType(ALL_WELL_CELLS, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(ALL_WELL_CELLS);
} }
m_reservoirGridPartManager->forceWatertightGeometryForType(RANGE_FILTERED, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(RANGE_FILTERED);
m_reservoirGridPartManager->forceWatertightGeometryForType(VISIBLE_WELL_CELLS, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(VISIBLE_WELL_CELLS);
m_reservoirGridPartManager->forceWatertightGeometryForType(VISIBLE_WELL_FENCE_CELLS, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(VISIBLE_WELL_FENCE_CELLS);
m_reservoirGridPartManager->forceWatertightGeometryForType(VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER);
if (this->eclipsePropertyFilterCollection()->hasActiveFilters()) if (this->eclipsePropertyFilterCollection()->hasActiveFilters())
{ {
m_reservoirGridPartManager->forceWatertightGeometryForType(PROPERTY_FILTERED, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(PROPERTY_FILTERED);
m_reservoirGridPartManager->forceWatertightGeometryForType(PROPERTY_FILTERED_WELL_CELLS, true); m_reservoirGridPartManager->forceWatertightGeometryOnForType(PROPERTY_FILTERED_WELL_CELLS);
} }
} }