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

Merge remote-tracking branch 'origin/dev' into dev-deeper

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-20 11:37:14 +01:00
parent 75c923d102 b41217455f
commit e3c619ddfe
15 changed files with 584 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/ProjectDataModel/RimContourMapView.cpp
View File

@@ -204,18 +204,19 @@ void RimContourMapView::updateCurrentTimeStep()
static_cast<RimEclipsePropertyFilterCollection*>(nativePropertyFilterCollection())->updateFromCurrentTimeStep();
this->updateVisibleGeometriesAndCellColors();
if (m_contourMapProjection->isChecked())
{
m_contourMapProjection->generateResults();
}
updateLegends(); // To make sure the scalar mappers are set up correctly
appendWellsAndFracturesToModel();
appendContourMapProjectionToModel();
appendPickPointVisToModel();
if (m_overlayInfoConfig->isActive())
{
m_overlayInfoConfig()->update3DInfo();
@@ -227,9 +228,7 @@ void RimContourMapView::updateCurrentTimeStep()
//--------------------------------------------------------------------------------------------------
void RimContourMapView::setFaultVisParameters()
{
// TODO: temporarily commented out
// faultCollection()->setShowFaultsOutsideFilter(false);
faultCollection()->setShowFaultsOutsideFilter(false);
faultCollection()->showOppositeFaultFaces = true;
faultCollection()->faultResult = RimFaultInViewCollection::FAULT_NO_FACE_CULLING;
faultResultSettings()->showCustomFaultResult = true;
@@ -261,6 +260,31 @@ void RimContourMapView::appendContourMapProjectionToModel()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimContourMapView::appendPickPointVisToModel()
{
if (m_viewer && m_contourMapProjection->isChecked())
{
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep);
if (frameScene)
{
cvf::String name = "ContourMapPickPoint";
this->removeModelByName(frameScene, name);
cvf::ref<cvf::ModelBasicList> contourMapProjectionModelBasicList = new cvf::ModelBasicList;
contourMapProjectionModelBasicList->setName(name);
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
m_contourMapProjectionPartMgr->appendPickPointVisToModel(contourMapProjectionModelBasicList.p(), transForm.p());
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(contourMapProjectionModelBasicList.p());
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------