Add characteristicCellSize to RimView

This commit is contained in:
Magne Sjaastad
2017-06-19 20:55:58 +02:00
parent b5b13789b4
commit 994198d388
6 changed files with 50 additions and 18 deletions

View File

@@ -399,6 +399,8 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m
//--------------------------------------------------------------------------------------------------
void RivWellPathPartMgr::appendDynamicGeometryPartsToModel(RimView* view, cvf::ModelBasicList* model)
{
CVF_ASSERT(view && model);
RimWellPathCollection* wellPathCollection = this->wellPathCollection();
if (!wellPathCollection) return;
@@ -410,32 +412,25 @@ void RivWellPathPartMgr::appendDynamicGeometryPartsToModel(RimView* view, cvf::M
if (wellPathCollection->wellPathVisibility() != RimWellPathCollection::FORCE_ALL_ON && m_rimWellPath->showWellPath() == false)
return;
cvf::ref<caf::DisplayCoordTransform> displayCoordTransform = view->displayCoordTransform();
double characteristicCellSize = 10.0;
QDateTime currentDateTime;
double characteristicCellSize = 10.0;
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(view);
if (eclipseView)
RimCase* rimCase = nullptr;
view->firstAncestorOrThisOfType(rimCase);
if (rimCase)
{
RigMainGrid* mainGrid = eclipseView->mainGrid();
if (mainGrid)
{
characteristicCellSize = mainGrid->characteristicIJCellSize();
}
std::vector<QDateTime> timeStepDates = rimCase->timeStepDates();
RimEclipseCase* eclipseCase = nullptr;
view->firstAncestorOrThisOfType(eclipseCase);
if (eclipseCase)
if (view->currentTimeStep() < timeStepDates.size())
{
std::vector<QDateTime> timeStepDates = eclipseCase->timeStepDates();
if (view->currentTimeStep() < timeStepDates.size())
{
currentDateTime = timeStepDates[view->currentTimeStep()];
}
currentDateTime = timeStepDates[view->currentTimeStep()];
}
characteristicCellSize = rimCase->characteristicCellSize();
}
cvf::ref<caf::DisplayCoordTransform> displayCoordTransform = view->displayCoordTransform();
appendPerforationsToModel(currentDateTime, model, displayCoordTransform.p(), characteristicCellSize);
}