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

#898 Include inactive cells in box intersections

Browse Source
This commit is contained in:
Jacob Støren
2016-09-29 14:57:27 +02:00
parent ca71b03d80
commit 865d1e1d9c
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp
View File

@@ -411,8 +411,7 @@ cvf::ref<RivIntersectionHexGridInterface> RivIntersectionBoxPartMgr::createHexGr
RigMainGrid* grid = NULL; RigMainGrid* grid = NULL;
grid = eclipseView->eclipseCase()->reservoirData()->mainGrid(); grid = eclipseView->eclipseCase()->reservoirData()->mainGrid();
// TODO: Should flag for inactive cells be available at a centralized object? return new RivEclipseIntersectionGrid(grid, eclipseView->currentActiveCellInfo(), m_rimIntersectionBox->showInactiveCells());
return new RivEclipseIntersectionGrid(grid, eclipseView->currentActiveCellInfo(), false);
} }
RimGeoMechView* geoView; RimGeoMechView* geoView;

29
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@@ -73,6 +73,9 @@ RimIntersectionBox::RimIntersectionBox()
CAF_PDM_InitField(&m_maxDepth, "MaxDepth", 0.0, "Max", "", "", ""); CAF_PDM_InitField(&m_maxDepth, "MaxDepth", 0.0, "Max", "", "", "");
m_maxDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_maxDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Inactive Cells", "", "", "");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -119,12 +122,12 @@ void RimIntersectionBox::setToDefaultSizeBox()
double defaultWidthFactor = 0.5; double defaultWidthFactor = 0.5;
m_minXCoord = center.x() - 0.5 * boundingBox.extent().x() * defaultWidthFactor; m_minXCoord = center.x() - 0.5 * boundingBox.extent().x() * defaultWidthFactor;
m_minYCoord = center.y() - 0.5 * boundingBox.extent().y() * defaultWidthFactor; m_minYCoord = center.y() - 0.5 * boundingBox.extent().y() * defaultWidthFactor;
m_minDepth = center.z() - 0.5 * boundingBox.extent().z() * defaultWidthFactor; m_minDepth = -(center.z() + 0.5 * boundingBox.extent().z() * defaultWidthFactor);
m_maxXCoord = center.x() + 0.5 * boundingBox.extent().x() * defaultWidthFactor; m_maxXCoord = center.x() + 0.5 * boundingBox.extent().x() * defaultWidthFactor;
m_maxYCoord = center.y() + 0.5 * boundingBox.extent().y() * defaultWidthFactor; m_maxYCoord = center.y() + 0.5 * boundingBox.extent().y() * defaultWidthFactor;
m_maxDepth = center.z() + 0.5 * boundingBox.extent().z() * defaultWidthFactor; m_maxDepth = -(center.z() - 0.5 * boundingBox.extent().z() * defaultWidthFactor);
} }
@@ -142,18 +145,18 @@ void RimIntersectionBox::setToDefaultSizeSlice(SinglePlaneState plane, const cvf
double defaultWidthFactor = 0.5; double defaultWidthFactor = 0.5;
m_minXCoord = center[0] - 0.5 * boundingBox.extent().x() * defaultWidthFactor; m_minXCoord = center[0] - 0.5 * boundingBox.extent().x() * defaultWidthFactor;
m_minYCoord = center[1] - 0.5 * boundingBox.extent().y() * defaultWidthFactor; m_minYCoord = center[1] - 0.5 * boundingBox.extent().y() * defaultWidthFactor;
m_minDepth = center[2] - 0.5 * boundingBox.extent().z() * defaultWidthFactor; m_minDepth = -(center[2] + 0.5 * boundingBox.extent().z() * defaultWidthFactor);
m_maxXCoord = center[0] + 0.5 * boundingBox.extent().x() * defaultWidthFactor; m_maxXCoord = center[0] + 0.5 * boundingBox.extent().x() * defaultWidthFactor;
m_maxYCoord = center[1] + 0.5 * boundingBox.extent().y() * defaultWidthFactor; m_maxYCoord = center[1] + 0.5 * boundingBox.extent().y() * defaultWidthFactor;
m_maxDepth = center[2] + 0.5 * boundingBox.extent().z() * defaultWidthFactor; m_maxDepth = -(center[2] - 0.5 * boundingBox.extent().z() * defaultWidthFactor);
switch (plane) switch (plane)
{ {
case PLANE_STATE_X: m_minXCoord = m_maxXCoord = center[0]; break; case PLANE_STATE_X: m_minXCoord = m_maxXCoord = center[0]; break;
case PLANE_STATE_Y: m_minYCoord = m_maxYCoord = center[1]; break; case PLANE_STATE_Y: m_minYCoord = m_maxYCoord = center[1]; break;
case PLANE_STATE_Z: m_minDepth = m_maxDepth = center[2]; break; case PLANE_STATE_Z: m_minDepth = m_maxDepth = -center[2]; break;
} }
updateVisibility(); updateVisibility();

1
ApplicationCode/ProjectDataModel/RimIntersectionBox.h
View File

@@ -50,6 +50,7 @@ public:
// Fields // Fields
caf::PdmField<QString> name; caf::PdmField<QString> name;
caf::PdmField<bool> isActive; caf::PdmField<bool> isActive;
caf::PdmField< bool > showInactiveCells;
cvf::Mat4d boxOrigin() const; cvf::Mat4d boxOrigin() const;
cvf::Vec3d boxSize() const; cvf::Vec3d boxSize() const;