Minor changes, changed logging to standard output when switching frame, e.g. fixed so that current frame number is shown correctly.

p4#: 21848
This commit is contained in:
Vidar Lundberg 2013-06-06 16:37:35 +02:00
parent ceb5dd8470
commit c3cd40d7eb

View File

@ -652,7 +652,7 @@ void RimReservoirView::createDisplayModel()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirView::updateCurrentTimeStep() void RimReservoirView::updateCurrentTimeStep()
{ {
printf("########## updateCurrentTimeStep for frame %i ##########\n", m_currentTimeStep.v());
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> geometriesToRecolor; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> geometriesToRecolor;
if (this->propertyFilterCollection()->hasActiveFilters()) if (this->propertyFilterCollection()->hasActiveFilters())
@ -737,7 +737,7 @@ void RimReservoirView::updateCurrentTimeStep()
for (size_t i = 0; i < wellPipeModels.size(); i++) for (size_t i = 0; i < wellPipeModels.size(); i++)
{ {
printf("updateCurrentTimeStep: Remove WellPipeModel %i from frameScene\n", i); //printf("updateCurrentTimeStep: Remove WellPipeModel %i from frameScene, for frame %i\n", i, m_currentTimeStep.v());
frameScene->removeModel(wellPipeModels[i]); frameScene->removeModel(wellPipeModels[i]);
} }
@ -748,7 +748,7 @@ void RimReservoirView::updateCurrentTimeStep()
m_pipesPartManager->updatePipeResultColor(m_currentTimeStep); m_pipesPartManager->updatePipeResultColor(m_currentTimeStep);
wellPipeModelBasicList->updateBoundingBoxesRecursive(); wellPipeModelBasicList->updateBoundingBoxesRecursive();
printf("updateCurrentTimeStep: Add WellPipeModel to frameScene\n"); //printf("updateCurrentTimeStep: Add WellPipeModel to frameScene\n");
frameScene->addModel(wellPipeModelBasicList.p()); frameScene->addModel(wellPipeModelBasicList.p());
// Well paths // Well paths
@ -765,7 +765,7 @@ void RimReservoirView::updateCurrentTimeStep()
for (size_t i = 0; i < wellPathModels.size(); i++) for (size_t i = 0; i < wellPathModels.size(); i++)
{ {
printf("updateCurrentTimeStep: Remove WellPathModel %i from frameScene\n", i); printf("updateCurrentTimeStep: Remove WellPathModel %i from frameScene, for frame %i\n", i, m_currentTimeStep.v());
frameScene->removeModel(wellPathModels[i]); frameScene->removeModel(wellPathModels[i]);
} }
@ -777,7 +777,7 @@ void RimReservoirView::updateCurrentTimeStep()
RivWellPathCollectionPartMgr* wellPathCollectionPartMgr = (wellPathCollection) ? wellPathCollection->wellPathCollectionPartMgr() : NULL; RivWellPathCollectionPartMgr* wellPathCollectionPartMgr = (wellPathCollection) ? wellPathCollection->wellPathCollectionPartMgr() : NULL;
if (wellPathCollectionPartMgr) if (wellPathCollectionPartMgr)
{ {
printf("updateCurrentTimeStep: Append well paths for frame %i: ", m_currentTimeStep); printf("updateCurrentTimeStep: Append well paths for frame %i: ", m_currentTimeStep.v());
cvf::Vec3d displayModelOffset = eclipseCase()->reservoirData()->mainGrid()->displayModelOffset(); cvf::Vec3d displayModelOffset = eclipseCase()->reservoirData()->mainGrid()->displayModelOffset();
double characteristicCellSize = eclipseCase()->reservoirData()->mainGrid()->characteristicIJCellSize(); double characteristicCellSize = eclipseCase()->reservoirData()->mainGrid()->characteristicIJCellSize();
cvf::BoundingBox boundingBox = currentActiveCellInfo()->geometryBoundingBox(); cvf::BoundingBox boundingBox = currentActiveCellInfo()->geometryBoundingBox();