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 branch 'dev' into dev-deeper

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-21 14:00:46 +01:00
parent 939dfe664a 2912059922
commit 5e769b337f
26 changed files with 1065 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ProjectDataModel/RimContourMapView.cpp
View File

@@ -120,18 +120,6 @@ QString RimContourMapView::createAutoName() const
return autoName.join(": ");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimContourMapView::isTimeStepDependentDataVisible() const
{
if (RimEclipseView::isTimeStepDependentDataVisible())
{
return true;
}
return m_contourMapProjection->isChecked();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -153,6 +141,12 @@ void RimContourMapView::createDisplayModel()
{
RimEclipseView::createDisplayModel();
if (!this->isTimeStepDependentDataVisible())
{
// Need to add geometry even if it hasn't happened during dynamic time step update.
updateGeometry();
}
if (this->viewer()->mainCamera()->viewMatrix() == defaultViewMatrix)
{
this->zoomAll();
@@ -199,9 +193,16 @@ void RimContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrder
void RimContourMapView::updateCurrentTimeStep()
{
static_cast<RimEclipsePropertyFilterCollection*>(nativePropertyFilterCollection())->updateFromCurrentTimeStep();
updateGeometry();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimContourMapView::updateGeometry()
{
this->updateVisibleGeometriesAndCellColors();
if (m_contourMapProjection->isChecked())
{
m_contourMapProjection->generateResults();