#4683 clang-format on all files in ApplicationCode

This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions

View File

@@ -1,39 +1,39 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2018- Equinor ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimEclipseContourMapView.h"
#include "RivContourMapProjectionPartMgr.h"
#include "RiuViewer.h"
#include "RivContourMapProjectionPartMgr.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimAnnotationInViewCollection.h"
#include "RimCase.h"
#include "RimCellRangeFilterCollection.h"
#include "RimViewNameConfig.h"
#include "RimEclipseContourMapProjection.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseContourMapProjection.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimGridCollection.h"
#include "RimSimWellInViewCollection.h"
#include "RimScaleLegendConfig.h"
#include "RimSimWellInViewCollection.h"
#include "RimViewNameConfig.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafProgressInfo.h"
@@ -43,34 +43,31 @@
#include "cvfPart.h"
#include "cvfScene.h"
CAF_PDM_SOURCE_INIT(RimEclipseContourMapView, "RimContourMapView");
const cvf::Mat4d RimEclipseContourMapView::sm_defaultViewMatrix = cvf::Mat4d(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 1000,
0, 0, 0, 1);
CAF_PDM_SOURCE_INIT( RimEclipseContourMapView, "RimContourMapView" );
const cvf::Mat4d RimEclipseContourMapView::sm_defaultViewMatrix =
cvf::Mat4d( 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1000, 0, 0, 0, 1 );
RimEclipseContourMapView::RimEclipseContourMapView()
: m_cameraPositionLastUpdate(cvf::Vec3d::UNDEFINED)
: m_cameraPositionLastUpdate( cvf::Vec3d::UNDEFINED )
{
CAF_PDM_InitObject("Contour Map View", ":/2DMap16x16.png", "", "");
CAF_PDM_InitObject( "Contour Map View", ":/2DMap16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault(&m_contourMapProjection, "ContourMapProjection", "Contour Map Projection", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_contourMapProjection, "ContourMapProjection", "Contour Map Projection", "", "", "" );
m_contourMapProjection = new RimEclipseContourMapProjection();
CAF_PDM_InitField(&m_showAxisLines, "ShowAxisLines", true, "Show Axis Lines", "", "", "");
CAF_PDM_InitField(&m_showScaleLegend, "ShowScaleLegend", true, "Show Scale Legend", "", "", "");
CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", true, "Show Axis Lines", "", "", "" );
CAF_PDM_InitField( &m_showScaleLegend, "ShowScaleLegend", true, "Show Scale Legend", "", "", "" );
setFaultVisParameters();
setDefaultCustomName();
m_contourMapProjectionPartMgr = new RivContourMapProjectionPartMgr(contourMapProjection(), this);
m_contourMapProjectionPartMgr = new RivContourMapProjectionPartMgr( contourMapProjection(), this );
((RiuViewerToViewInterface*)this)->setCameraPosition(sm_defaultViewMatrix);
( (RiuViewerToViewInterface*)this )->setCameraPosition( sm_defaultViewMatrix );
cellResult()->setTernaryEnabled(false);
cellResult()->setTernaryEnabled( false );
}
//--------------------------------------------------------------------------------------------------
@@ -88,41 +85,41 @@ QString RimEclipseContourMapView::createAutoName() const
{
QStringList autoName;
if (!nameConfig()->customName().isEmpty())
if ( !nameConfig()->customName().isEmpty() )
{
autoName.push_back(nameConfig()->customName());
autoName.push_back( nameConfig()->customName() );
}
QStringList generatedAutoTags;
RimCase* ownerCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted(ownerCase);
this->firstAncestorOrThisOfTypeAsserted( ownerCase );
if (nameConfig()->addCaseName())
if ( nameConfig()->addCaseName() )
{
generatedAutoTags.push_back(ownerCase->caseUserDescription());
generatedAutoTags.push_back( ownerCase->caseUserDescription() );
}
if (nameConfig()->addAggregationType())
if ( nameConfig()->addAggregationType() )
{
generatedAutoTags.push_back(contourMapProjection()->resultAggregationText());
generatedAutoTags.push_back( contourMapProjection()->resultAggregationText() );
}
if (nameConfig()->addProperty() && !contourMapProjection()->isColumnResult())
if ( nameConfig()->addProperty() && !contourMapProjection()->isColumnResult() )
{
generatedAutoTags.push_back(cellResult()->resultVariable());
generatedAutoTags.push_back( cellResult()->resultVariable() );
}
if (nameConfig()->addSampleSpacing())
if ( nameConfig()->addSampleSpacing() )
{
generatedAutoTags.push_back(QString("%1").arg(contourMapProjection()->sampleSpacingFactor(), 3, 'f', 2));
generatedAutoTags.push_back( QString( "%1" ).arg( contourMapProjection()->sampleSpacingFactor(), 3, 'f', 2 ) );
}
if (!generatedAutoTags.empty())
if ( !generatedAutoTags.empty() )
{
autoName.push_back(generatedAutoTags.join(", "));
autoName.push_back( generatedAutoTags.join( ", " ) );
}
return autoName.join(": ");
return autoName.join( ": " );
}
//--------------------------------------------------------------------------------------------------
@@ -130,11 +127,11 @@ QString RimEclipseContourMapView::createAutoName() const
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::setDefaultCustomName()
{
nameConfig()->setCustomName("Contour Map");
nameConfig()->hideCaseNameField(false);
nameConfig()->hideAggregationTypeField(false);
nameConfig()->hidePropertyField(false);
nameConfig()->hideSampleSpacingField(false);
nameConfig()->setCustomName( "Contour Map" );
nameConfig()->hideCaseNameField( false );
nameConfig()->hideAggregationTypeField( false );
nameConfig()->hidePropertyField( false );
nameConfig()->hideSampleSpacingField( false );
}
//--------------------------------------------------------------------------------------------------
@@ -143,7 +140,7 @@ void RimEclipseContourMapView::setDefaultCustomName()
void RimEclipseContourMapView::updatePickPointAndRedraw()
{
appendPickPointVisToModel();
if (m_viewer)
if ( m_viewer )
{
m_viewer->update();
}
@@ -164,9 +161,9 @@ void RimEclipseContourMapView::updateCurrentTimeStepAndRedraw()
void RimEclipseContourMapView::initAfterRead()
{
disablePerspectiveProjectionField();
setShowGridBox(false);
meshMode.setValue(RiaDefines::NO_MESH);
surfaceMode.setValue(FAULTS);
setShowGridBox( false );
meshMode.setValue( RiaDefines::NO_MESH );
surfaceMode.setValue( FAULTS );
setFaultVisParameters();
scheduleCreateDisplayModelAndRedraw();
}
@@ -177,14 +174,14 @@ void RimEclipseContourMapView::initAfterRead()
void RimEclipseContourMapView::createDisplayModel()
{
RimEclipseView::createDisplayModel();
if (!this->isTimeStepDependentDataVisible())
if ( !this->isTimeStepDependentDataVisible() )
{
// Need to add geometry even if it hasn't happened during dynamic time step update.
updateGeometry();
}
if (this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix)
if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
{
this->zoomAll();
}
@@ -193,34 +190,35 @@ void RimEclipseContourMapView::createDisplayModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimEclipseContourMapView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup("Viewer");
viewGroup->add(this->userDescriptionField());
viewGroup->add(this->backgroundColorField());
viewGroup->add(&m_showAxisLines);
viewGroup->add(&m_showScaleLegend);
caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup( "Viewer" );
viewGroup->add( this->userDescriptionField() );
viewGroup->add( this->backgroundColorField() );
viewGroup->add( &m_showAxisLines );
viewGroup->add( &m_showScaleLegend );
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Contour Map Name");
nameConfig()->uiOrdering(uiConfigName, *nameGroup);
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Contour Map Name" );
nameConfig()->uiOrdering( uiConfigName, *nameGroup );
uiOrdering.skipRemainingFields(true);
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
void RimEclipseContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering,
QString uiConfigName /*= ""*/ )
{
uiTreeOrdering.add(m_overlayInfoConfig());
uiTreeOrdering.add(m_contourMapProjection);
uiTreeOrdering.add(cellResult());
cellResult()->uiCapability()->setUiReadOnly(m_contourMapProjection->isColumnResult());
uiTreeOrdering.add(wellCollection());
uiTreeOrdering.add(faultCollection());
uiTreeOrdering.add(annotationCollection());
uiTreeOrdering.add(m_rangeFilterCollection());
uiTreeOrdering.add(nativePropertyFilterCollection());
uiTreeOrdering.add( m_overlayInfoConfig() );
uiTreeOrdering.add( m_contourMapProjection );
uiTreeOrdering.add( cellResult() );
cellResult()->uiCapability()->setUiReadOnly( m_contourMapProjection->isColumnResult() );
uiTreeOrdering.add( wellCollection() );
uiTreeOrdering.add( faultCollection() );
uiTreeOrdering.add( annotationCollection() );
uiTreeOrdering.add( m_rangeFilterCollection() );
uiTreeOrdering.add( nativePropertyFilterCollection() );
uiTreeOrdering.skipRemainingChildren();
}
@@ -230,7 +228,7 @@ void RimEclipseContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTr
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateCurrentTimeStep()
{
static_cast<RimEclipsePropertyFilterCollection*>(nativePropertyFilterCollection())->updateFromCurrentTimeStep();
static_cast<RimEclipsePropertyFilterCollection*>( nativePropertyFilterCollection() )->updateFromCurrentTimeStep();
updateGeometry();
}
@@ -239,16 +237,16 @@ void RimEclipseContourMapView::updateCurrentTimeStep()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateGeometry()
{
caf::ProgressInfo progress(100, "Generate Contour Map", true);
caf::ProgressInfo progress( 100, "Generate Contour Map", true );
this->updateVisibleGeometriesAndCellColors();
{ // Step 1: generate results and some minor updates. About 30% of the time.
if (m_contourMapProjection->isChecked())
if ( m_contourMapProjection->isChecked() )
{
m_contourMapProjection->generateResultsIfNecessary(m_currentTimeStep());
m_contourMapProjection->generateResultsIfNecessary( m_currentTimeStep() );
}
progress.setProgress(30);
progress.setProgress( 30 );
}
updateLegends(); // To make sure the scalar mappers are set up correctly
@@ -256,14 +254,14 @@ void RimEclipseContourMapView::updateGeometry()
{ // Step 2: generate geometry. Takes about 60% of the time.
createContourMapGeometry();
progress.setProgress(90);
progress.setProgress( 90 );
}
{ // Step 3: generate drawables. Takes about 10% of the time.
appendContourMapProjectionToModel();
appendContourLinesToModel();
appendPickPointVisToModel();
progress.setProgress(100);
progress.setProgress( 100 );
}
m_overlayInfoConfig()->update3DInfo();
}
@@ -273,11 +271,11 @@ void RimEclipseContourMapView::updateGeometry()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::setFaultVisParameters()
{
faultCollection()->setShowFaultsOutsideFilter(false);
faultCollection()->showOppositeFaultFaces = true;
faultCollection()->faultResult = RimFaultInViewCollection::FAULT_NO_FACE_CULLING;
faultCollection()->setShowFaultsOutsideFilter( false );
faultCollection()->showOppositeFaultFaces = true;
faultCollection()->faultResult = RimFaultInViewCollection::FAULT_NO_FACE_CULLING;
faultResultSettings()->showCustomFaultResult = true;
faultResultSettings()->customFaultResult()->setResultVariable("None");
faultResultSettings()->customFaultResult()->setResultVariable( "None" );
}
//--------------------------------------------------------------------------------------------------
@@ -285,7 +283,7 @@ void RimEclipseContourMapView::setFaultVisParameters()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::createContourMapGeometry()
{
if (m_viewer && m_contourMapProjection->isChecked())
if ( m_viewer && m_contourMapProjection->isChecked() )
{
m_contourMapProjectionPartMgr->createProjectionGeometry();
}
@@ -296,22 +294,23 @@ void RimEclipseContourMapView::createContourMapGeometry()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::appendContourMapProjectionToModel()
{
if (m_viewer && m_contourMapProjection->isChecked())
if ( m_viewer && m_contourMapProjection->isChecked() )
{
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep);
if (frameScene)
cvf::Scene* frameScene = m_viewer->frame( m_currentTimeStep );
if ( frameScene )
{
cvf::String name = "ContourMapProjection";
this->removeModelByName(frameScene, name);
this->removeModelByName( frameScene, name );
cvf::ref<cvf::ModelBasicList> contourMapProjectionModelBasicList = new cvf::ModelBasicList;
contourMapProjectionModelBasicList->setName(name);
contourMapProjectionModelBasicList->setName( name );
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
m_contourMapProjectionPartMgr->appendProjectionToModel(contourMapProjectionModelBasicList.p(), transForm.p());
m_contourMapProjectionPartMgr->appendProjectionToModel( contourMapProjectionModelBasicList.p(),
transForm.p() );
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(contourMapProjectionModelBasicList.p());
frameScene->addModel( contourMapProjectionModelBasicList.p() );
}
}
}
@@ -321,22 +320,24 @@ void RimEclipseContourMapView::appendContourMapProjectionToModel()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::appendContourLinesToModel()
{
if (m_viewer && m_contourMapProjection->isChecked())
if ( m_viewer && m_contourMapProjection->isChecked() )
{
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep);
if (frameScene)
cvf::Scene* frameScene = m_viewer->frame( m_currentTimeStep );
if ( frameScene )
{
cvf::String name = "ContourMapLines";
this->removeModelByName(frameScene, name);
this->removeModelByName( frameScene, name );
cvf::ref<cvf::ModelBasicList> contourMapLabelModelBasicList = new cvf::ModelBasicList;
contourMapLabelModelBasicList->setName(name);
contourMapLabelModelBasicList->setName( name );
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
m_contourMapProjectionPartMgr->appendContourLinesToModel(viewer()->mainCamera(), contourMapLabelModelBasicList.p(), transForm.p());
m_contourMapProjectionPartMgr->appendContourLinesToModel( viewer()->mainCamera(),
contourMapLabelModelBasicList.p(),
transForm.p() );
contourMapLabelModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(contourMapLabelModelBasicList.p());
frameScene->addModel( contourMapLabelModelBasicList.p() );
}
}
}
@@ -346,22 +347,23 @@ void RimEclipseContourMapView::appendContourLinesToModel()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::appendPickPointVisToModel()
{
if (m_viewer && m_contourMapProjection->isChecked())
if ( m_viewer && m_contourMapProjection->isChecked() )
{
cvf::Scene* frameScene = m_viewer->frame(m_currentTimeStep);
if (frameScene)
cvf::Scene* frameScene = m_viewer->frame( m_currentTimeStep );
if ( frameScene )
{
cvf::String name = "ContourMapPickPoint";
this->removeModelByName(frameScene, name);
this->removeModelByName( frameScene, name );
cvf::ref<cvf::ModelBasicList> contourMapProjectionModelBasicList = new cvf::ModelBasicList;
contourMapProjectionModelBasicList->setName(name);
contourMapProjectionModelBasicList->setName( name );
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
m_contourMapProjectionPartMgr->appendPickPointVisToModel(contourMapProjectionModelBasicList.p(), transForm.p());
m_contourMapProjectionPartMgr->appendPickPointVisToModel( contourMapProjectionModelBasicList.p(),
transForm.p() );
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(contourMapProjectionModelBasicList.p());
frameScene->addModel( contourMapProjectionModelBasicList.p() );
}
}
}
@@ -371,24 +373,24 @@ void RimEclipseContourMapView::appendPickPointVisToModel()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateLegends()
{
if (m_viewer)
if ( m_viewer )
{
m_viewer->removeAllColorLegends();
if (m_contourMapProjection && m_contourMapProjection->isChecked())
if ( m_contourMapProjection && m_contourMapProjection->isChecked() )
{
RimRegularLegendConfig* projectionLegend = m_contourMapProjection->legendConfig();
if (projectionLegend)
if ( projectionLegend )
{
m_contourMapProjection->updateLegend();
if (projectionLegend->showLegend())
if ( projectionLegend->showLegend() )
{
m_viewer->addColorLegendToBottomLeftCorner(projectionLegend->titledOverlayFrame());
m_viewer->addColorLegendToBottomLeftCorner( projectionLegend->titledOverlayFrame() );
}
}
}
m_viewer->showScaleLegend(m_showScaleLegend());
m_viewer->showScaleLegend( m_showScaleLegend() );
}
}
@@ -397,11 +399,11 @@ void RimEclipseContourMapView::updateLegends()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateViewWidgetAfterCreation()
{
if (m_viewer)
if ( m_viewer )
{
m_viewer->showAxisCross(false);
m_viewer->showEdgeTickMarksXY(true, m_showAxisLines());
m_viewer->enableNavigationRotation(false);
m_viewer->showAxisCross( false );
m_viewer->showEdgeTickMarksXY( true, m_showAxisLines() );
m_viewer->enableNavigationRotation( false );
}
Rim3dView::updateViewWidgetAfterCreation();
@@ -412,7 +414,7 @@ void RimEclipseContourMapView::updateViewWidgetAfterCreation()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateViewFollowingRangeFilterUpdates()
{
m_contourMapProjection->setCheckState(true);
m_contourMapProjection->setCheckState( true );
scheduleCreateDisplayModelAndRedraw();
}
@@ -422,29 +424,31 @@ void RimEclipseContourMapView::updateViewFollowingRangeFilterUpdates()
void RimEclipseContourMapView::onLoadDataAndUpdate()
{
RimEclipseView::onLoadDataAndUpdate();
if (m_viewer)
if ( m_viewer )
{
m_viewer->setView(cvf::Vec3d(0, 0, -1), cvf::Vec3d(0, 1, 0));
m_viewer->setView( cvf::Vec3d( 0, 0, -1 ), cvf::Vec3d( 0, 1, 0 ) );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimEclipseContourMapView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimEclipseView::fieldChangedByUi(changedField, oldValue, newValue);
RimEclipseView::fieldChangedByUi( changedField, oldValue, newValue );
if (changedField == &m_showAxisLines)
if ( changedField == &m_showAxisLines )
{
m_viewer->showEdgeTickMarksXY(true, m_showAxisLines());
m_viewer->showEdgeTickMarksXY( true, m_showAxisLines() );
scheduleCreateDisplayModelAndRedraw();
}
else if (changedField == backgroundColorField())
else if ( changedField == backgroundColorField() )
{
scheduleCreateDisplayModelAndRedraw();
}
else if (changedField == &m_showScaleLegend)
else if ( changedField == &m_showScaleLegend )
{
updateLegends();
scheduleCreateDisplayModelAndRedraw();
@@ -466,7 +470,7 @@ std::set<RivCellSetEnum> RimEclipseContourMapView::allVisibleFaultGeometryTypes(
{
std::set<RivCellSetEnum> faultGeoTypes;
// Normal eclipse views always shows faults for active and visible eclipse cells.
if (faultCollection()->showFaultCollection())
if ( faultCollection()->showFaultCollection() )
{
faultGeoTypes = RimEclipseView::allVisibleFaultGeometryTypes();
}
@@ -476,14 +480,14 @@ std::set<RivCellSetEnum> RimEclipseContourMapView::allVisibleFaultGeometryTypes(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimEclipseContourMapView::createViewWidget(QWidget* mainWindowParent)
QWidget* RimEclipseContourMapView::createViewWidget( QWidget* mainWindowParent )
{
auto widget = Rim3dView::createViewWidget(mainWindowParent);
auto widget = Rim3dView::createViewWidget( mainWindowParent );
if (viewer())
if ( viewer() )
{
viewer()->showZScaleLabel(false);
viewer()->hideZScaleCheckbox(true);
viewer()->showZScaleLabel( false );
viewer()->hideZScaleCheckbox( true );
}
return widget;
}
@@ -494,7 +498,7 @@ QWidget* RimEclipseContourMapView::createViewWidget(QWidget* mainWindowParent)
void RimEclipseContourMapView::onViewNavigationChanged()
{
cvf::Vec3d currentCameraPosition = viewer()->mainCamera()->position();
if (m_cameraPositionLastUpdate.isUndefined() || zoomChangeAboveTreshold(currentCameraPosition))
if ( m_cameraPositionLastUpdate.isUndefined() || zoomChangeAboveTreshold( currentCameraPosition ) )
{
appendContourLinesToModel();
m_cameraPositionLastUpdate = currentCameraPosition;
@@ -504,9 +508,9 @@ void RimEclipseContourMapView::onViewNavigationChanged()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseContourMapView::zoomChangeAboveTreshold(const cvf::Vec3d& currentCameraPosition) const
bool RimEclipseContourMapView::zoomChangeAboveTreshold( const cvf::Vec3d& currentCameraPosition ) const
{
double distance = std::max(std::fabs(m_cameraPositionLastUpdate.z()), std::fabs(currentCameraPosition.z()));
double distance = std::max( std::fabs( m_cameraPositionLastUpdate.z() ), std::fabs( currentCameraPosition.z() ) );
const double threshold = 0.05 * distance;
return std::fabs(m_cameraPositionLastUpdate.z() - currentCameraPosition.z()) > threshold;
return std::fabs( m_cameraPositionLastUpdate.z() - currentCameraPosition.z() ) > threshold;
}