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

Layout cleanup

Browse Source
This commit is contained in:
Magne Sjaastad 2014-08-11 07:46:08 +02:00
parent 748e056bbc
commit a8de19984a
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
View File

@ -47,7 +47,7 @@ RivTextureCoordsCreator::RivTextureCoordsCreator(RimResultSlot* cellResultSlot,
m_resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, resTimeStepIdx, cellResultSlot->resultVariable()); m_resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, resTimeStepIdx, cellResultSlot->resultVariable());
CVF_ASSERT(m_resultAccessor.notNull()); CVF_ASSERT(m_resultAccessor.notNull());
cvf::ref<RigPipeInCellEvaluator> pipeInCellEval = new RigPipeInCellEvaluator( cellResultSlot->reservoirView()->wellCollection()->isWellPipesVisible(timeStepIndex), cvf::ref<RigPipeInCellEvaluator> pipeInCellEval = new RigPipeInCellEvaluator(cellResultSlot->reservoirView()->wellCollection()->isWellPipesVisible(timeStepIndex),
eclipseCase->gridCellToWellIndex(gridIndex)); eclipseCase->gridCellToWellIndex(gridIndex));
const cvf::ScalarMapper* mapper = cellResultSlot->legendConfig()->scalarMapper(); const cvf::ScalarMapper* mapper = cellResultSlot->legendConfig()->scalarMapper();
@ -59,7 +59,11 @@ RivTextureCoordsCreator::RivTextureCoordsCreator(RimResultSlot* cellResultSlot,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivTextureCoordsCreator::createTextureCoords(cvf::Vec2fArray* quadTextureCoords, const cvf::StructGridQuadToCellFaceMapper* quadMapper, const RigResultAccessor* resultAccessor, const RivResultToTextureMapper* texMapper) void RivTextureCoordsCreator::createTextureCoords(
cvf::Vec2fArray* quadTextureCoords,
const cvf::StructGridQuadToCellFaceMapper* quadMapper,
const RigResultAccessor* resultAccessor,
const RivResultToTextureMapper* texMapper)
{ {
CVF_ASSERT(quadTextureCoords && quadMapper && resultAccessor && texMapper); CVF_ASSERT(quadTextureCoords && quadMapper && resultAccessor && texMapper);

17
ApplicationCode/ModelVisualization/RivTextureCoordsCreator.h
View File

@ -26,9 +26,9 @@ class RimResultSlot;
class RigResultAccessor; class RigResultAccessor;
class RivResultToTextureMapper; class RivResultToTextureMapper;
namespace cvf{ namespace cvf
class StructGridQuadToCellFaceMapper; {
class StructGridQuadToCellFaceMapper;
} }
@ -38,7 +38,7 @@ public:
RivTextureCoordsCreator(RimResultSlot* cellResultSlot, RivTextureCoordsCreator(RimResultSlot* cellResultSlot,
size_t timeStepIndex, size_t timeStepIndex,
size_t gridIndex, size_t gridIndex,
const cvf::StructGridQuadToCellFaceMapper* quadMapper); const cvf::StructGridQuadToCellFaceMapper* quadMapper);
void createTextureCoords(cvf::Vec2fArray* quadTextureCoords) void createTextureCoords(cvf::Vec2fArray* quadTextureCoords)
{ {
@ -52,11 +52,8 @@ private:
const RigResultAccessor* resultAccessor, const RigResultAccessor* resultAccessor,
const RivResultToTextureMapper* texMapper); const RivResultToTextureMapper* texMapper);
cvf::cref<cvf::StructGridQuadToCellFaceMapper> m_quadMapper; cvf::cref<cvf::StructGridQuadToCellFaceMapper> m_quadMapper;
cvf::ref<RigResultAccessor> m_resultAccessor; cvf::ref<RigResultAccessor> m_resultAccessor;
cvf::ref<RivResultToTextureMapper> m_texMapper; cvf::ref<RivResultToTextureMapper> m_texMapper;
}; };