mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4880 Further renaming of methods in Rim3dView
This commit is contained in:
@@ -171,7 +171,7 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells( Rim
|
|||||||
viewToModify->faultCollection()->showFaultCollection = false;
|
viewToModify->faultCollection()->showFaultCollection = false;
|
||||||
viewToModify->faultCollection()->updateConnectedEditors();
|
viewToModify->faultCollection()->updateConnectedEditors();
|
||||||
|
|
||||||
viewToModify->updateCurrentTimeStepAndRedraw();
|
viewToModify->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
viewToModify->scheduleCreateDisplayModelAndRedraw();
|
viewToModify->scheduleCreateDisplayModelAndRedraw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ bool RicContourMapPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
contourMap->setPickPoint( cvf::Vec2d::UNDEFINED );
|
contourMap->setPickPoint( cvf::Vec2d::UNDEFINED );
|
||||||
view->updateCurrentTimeStepAndRedraw();
|
view->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ void RicFlyToObjectFeature::onActionTriggered( bool isChecked )
|
|||||||
|
|
||||||
destinationViewer->setPointOfInterest( cameraViewRefPoint );
|
destinationViewer->setPointOfInterest( cameraViewRefPoint );
|
||||||
|
|
||||||
activeView->updateCurrentTimeStepAndRedraw();
|
activeView->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -468,7 +468,7 @@ bool Rim2dIntersectionView::isWindowVisible() const
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Rim2dIntersectionView::axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) {}
|
void Rim2dIntersectionView::defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) {}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
@@ -536,7 +536,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
|
|||||||
if ( this->hasUserRequestedAnimation() )
|
if ( this->hasUserRequestedAnimation() )
|
||||||
{
|
{
|
||||||
if ( viewer() ) viewer()->setCurrentFrame( m_currentTimeStep );
|
if ( viewer() ) viewer()->setCurrentFrame( m_currentTimeStep );
|
||||||
onUpdateCurrentTimeStep();
|
onUpdateDisplayModelForCurrentTimeStep();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
|
if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
|
||||||
@@ -548,7 +548,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Rim2dIntersectionView::onUpdateCurrentTimeStep()
|
void Rim2dIntersectionView::onUpdateDisplayModelForCurrentTimeStep()
|
||||||
{
|
{
|
||||||
update3dInfo();
|
update3dInfo();
|
||||||
onUpdateLegends();
|
onUpdateLegends();
|
||||||
|
|||||||
@@ -85,11 +85,11 @@ protected:
|
|||||||
void onUpdateLegends() override;
|
void onUpdateLegends() override;
|
||||||
|
|
||||||
bool isGridVisualizationMode() const override;
|
bool isGridVisualizationMode() const override;
|
||||||
void axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) override;
|
void defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) override;
|
||||||
void onCreateDisplayModel() override;
|
void onCreateDisplayModel() override;
|
||||||
void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) override;
|
void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) override;
|
||||||
void onClampCurrentTimestep() override;
|
void onClampCurrentTimestep() override;
|
||||||
void onUpdateCurrentTimeStep() override;
|
void onUpdateDisplayModelForCurrentTimeStep() override;
|
||||||
void onUpdateStaticCellColors() override;
|
void onUpdateStaticCellColors() override;
|
||||||
void onUpdateScaleTransform() override;
|
void onUpdateScaleTransform() override;
|
||||||
cvf::Transform* scaleTransform() override;
|
cvf::Transform* scaleTransform() override;
|
||||||
|
|||||||
@@ -248,7 +248,7 @@ QWidget* Rim3dView::createViewWidget( QWidget* mainWindowParent )
|
|||||||
cvf::String yLabel;
|
cvf::String yLabel;
|
||||||
cvf::String zLabel;
|
cvf::String zLabel;
|
||||||
|
|
||||||
this->axisLabels( &xLabel, &yLabel, &zLabel );
|
this->defineAxisLabels( &xLabel, &yLabel, &zLabel );
|
||||||
m_viewer->setAxisLabels( xLabel, yLabel, zLabel );
|
m_viewer->setAxisLabels( xLabel, yLabel, zLabel );
|
||||||
|
|
||||||
updateZScaleLabel();
|
updateZScaleLabel();
|
||||||
@@ -468,7 +468,7 @@ void Rim3dView::setCurrentTimeStep( int frameIndex )
|
|||||||
if ( m_currentTimeStep != oldTimeStep )
|
if ( m_currentTimeStep != oldTimeStep )
|
||||||
{
|
{
|
||||||
RiuTimeStepChangedHandler::instance()->handleTimeStepChanged( this );
|
RiuTimeStepChangedHandler::instance()->handleTimeStepChanged( this );
|
||||||
this->onTimeStepChanged();
|
this->onClearReservoirCellVisibilitiesIfNeccessary();
|
||||||
}
|
}
|
||||||
|
|
||||||
this->hasUserRequestedAnimation = true;
|
this->hasUserRequestedAnimation = true;
|
||||||
@@ -481,11 +481,11 @@ void Rim3dView::setCurrentTimeStepAndUpdate( int frameIndex )
|
|||||||
{
|
{
|
||||||
setCurrentTimeStep( frameIndex );
|
setCurrentTimeStep( frameIndex );
|
||||||
|
|
||||||
this->onUpdateCurrentTimeStep();
|
this->onUpdateDisplayModelForCurrentTimeStep();
|
||||||
|
|
||||||
if ( Rim3dView* depView = prepareComparisonView() )
|
if ( Rim3dView* depView = prepareComparisonView() )
|
||||||
{
|
{
|
||||||
depView->onUpdateCurrentTimeStep();
|
depView->onUpdateDisplayModelForCurrentTimeStep();
|
||||||
depView->appendAnnotationsToModel();
|
depView->appendAnnotationsToModel();
|
||||||
depView->appendMeasurementToModel();
|
depView->appendMeasurementToModel();
|
||||||
|
|
||||||
@@ -503,17 +503,17 @@ void Rim3dView::setCurrentTimeStepAndUpdate( int frameIndex )
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Rim3dView::updateCurrentTimeStepAndRedraw()
|
void Rim3dView::updateDisplayModelForCurrentTimeStepAndRedraw()
|
||||||
{
|
{
|
||||||
if ( m_isCallingUpdateTimestepAndRedraw ) return;
|
if ( m_isCallingUpdateTimestepAndRedraw ) return;
|
||||||
|
|
||||||
if ( nativeOrOverrideViewer() )
|
if ( nativeOrOverrideViewer() )
|
||||||
{
|
{
|
||||||
this->onUpdateCurrentTimeStep();
|
this->onUpdateDisplayModelForCurrentTimeStep();
|
||||||
|
|
||||||
if ( Rim3dView* depView = prepareComparisonView() )
|
if ( Rim3dView* depView = prepareComparisonView() )
|
||||||
{
|
{
|
||||||
depView->onUpdateCurrentTimeStep();
|
depView->onUpdateDisplayModelForCurrentTimeStep();
|
||||||
|
|
||||||
restoreComparisonView();
|
restoreComparisonView();
|
||||||
}
|
}
|
||||||
@@ -528,7 +528,7 @@ void Rim3dView::updateCurrentTimeStepAndRedraw()
|
|||||||
{
|
{
|
||||||
for ( auto view : containerViews )
|
for ( auto view : containerViews )
|
||||||
{
|
{
|
||||||
view->updateCurrentTimeStepAndRedraw();
|
view->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_isCallingUpdateTimestepAndRedraw = false;
|
m_isCallingUpdateTimestepAndRedraw = false;
|
||||||
@@ -570,7 +570,7 @@ void Rim3dView::createDisplayModelAndRedraw()
|
|||||||
// But avoid any call back down to this Rim3dView, instead do the update manually to not confuse the
|
// But avoid any call back down to this Rim3dView, instead do the update manually to not confuse the
|
||||||
// m_currentTimeStep
|
// m_currentTimeStep
|
||||||
nativeOrOverrideViewer()->caf::Viewer::slotSetCurrentFrame( currentTimeStep() );
|
nativeOrOverrideViewer()->caf::Viewer::slotSetCurrentFrame( currentTimeStep() );
|
||||||
depView->onUpdateCurrentTimeStep();
|
depView->onUpdateDisplayModelForCurrentTimeStep();
|
||||||
}
|
}
|
||||||
|
|
||||||
restoreComparisonView();
|
restoreComparisonView();
|
||||||
@@ -733,7 +733,7 @@ void Rim3dView::setSurfaceDrawstyle()
|
|||||||
void Rim3dView::disableLighting( bool disable )
|
void Rim3dView::disableLighting( bool disable )
|
||||||
{
|
{
|
||||||
m_disableLighting = disable;
|
m_disableLighting = disable;
|
||||||
updateCurrentTimeStepAndRedraw();
|
updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
updateConnectedEditors();
|
updateConnectedEditors();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -796,7 +796,7 @@ void Rim3dView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
|
|||||||
}
|
}
|
||||||
else if ( changedField == &m_showGridBox )
|
else if ( changedField == &m_showGridBox )
|
||||||
{
|
{
|
||||||
createHighlightAndGridBoxDisplayModelWithRedraw();
|
createHighlightAndGridBoxDisplayModelAndRedraw();
|
||||||
}
|
}
|
||||||
else if ( changedField == &m_disableLighting )
|
else if ( changedField == &m_disableLighting )
|
||||||
{
|
{
|
||||||
@@ -1083,7 +1083,7 @@ void Rim3dView::createMeasurementDisplayModelAndRedraw()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Rim3dView::createHighlightAndGridBoxDisplayModelWithRedraw()
|
void Rim3dView::createHighlightAndGridBoxDisplayModelAndRedraw()
|
||||||
{
|
{
|
||||||
createHighlightAndGridBoxDisplayModel();
|
createHighlightAndGridBoxDisplayModel();
|
||||||
|
|
||||||
|
|||||||
@@ -148,13 +148,13 @@ public:
|
|||||||
void scheduleCreateDisplayModelAndRedraw();
|
void scheduleCreateDisplayModelAndRedraw();
|
||||||
|
|
||||||
void createDisplayModelAndRedraw();
|
void createDisplayModelAndRedraw();
|
||||||
void updateCurrentTimeStepAndRedraw();
|
void updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
void createHighlightAndGridBoxDisplayModelWithRedraw();
|
void createHighlightAndGridBoxDisplayModelAndRedraw();
|
||||||
|
void createMeasurementDisplayModelAndRedraw();
|
||||||
void updateGridBoxData();
|
void updateGridBoxData();
|
||||||
void updateAnnotationItems();
|
void updateAnnotationItems();
|
||||||
void updateScaling();
|
void updateScaling();
|
||||||
void updateZScaleLabel();
|
void updateZScaleLabel();
|
||||||
void createMeasurementDisplayModelAndRedraw();
|
|
||||||
|
|
||||||
bool isMasterView() const;
|
bool isMasterView() const;
|
||||||
Rim3dView* activeComparisonView() const;
|
Rim3dView* activeComparisonView() const;
|
||||||
@@ -206,14 +206,13 @@ protected:
|
|||||||
|
|
||||||
// Abstract methods to implement in subclasses
|
// Abstract methods to implement in subclasses
|
||||||
|
|
||||||
virtual void axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) = 0;
|
|
||||||
|
|
||||||
virtual void onCreateDisplayModel() = 0;
|
virtual void onCreateDisplayModel() = 0;
|
||||||
|
virtual void onUpdateDisplayModelForCurrentTimeStep() = 0;
|
||||||
virtual void onUpdateDisplayModelVisibility(){};
|
virtual void onUpdateDisplayModelVisibility(){};
|
||||||
virtual void onClampCurrentTimestep() = 0;
|
virtual void onClampCurrentTimestep() = 0;
|
||||||
virtual void onUpdateCurrentTimeStep() = 0;
|
virtual void onClearReservoirCellVisibilitiesIfNeccessary(){};
|
||||||
virtual void onTimeStepChanged(){};
|
|
||||||
virtual bool isTimeStepDependentDataVisible() const = 0;
|
virtual bool isTimeStepDependentDataVisible() const = 0;
|
||||||
|
virtual void defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) = 0;
|
||||||
|
|
||||||
virtual void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) = 0;
|
virtual void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) = 0;
|
||||||
virtual void onUpdateStaticCellColors() = 0;
|
virtual void onUpdateStaticCellColors() = 0;
|
||||||
|
|||||||
@@ -219,7 +219,7 @@ void RimEclipseContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimEclipseContourMapView::onUpdateCurrentTimeStep()
|
void RimEclipseContourMapView::onUpdateDisplayModelForCurrentTimeStep()
|
||||||
{
|
{
|
||||||
static_cast<RimEclipsePropertyFilterCollection*>( nativePropertyFilterCollection() )->updateFromCurrentTimeStep();
|
static_cast<RimEclipsePropertyFilterCollection*>( nativePropertyFilterCollection() )->updateFromCurrentTimeStep();
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ protected:
|
|||||||
void onCreateDisplayModel() override;
|
void onCreateDisplayModel() override;
|
||||||
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
||||||
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
|
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
|
||||||
void onUpdateCurrentTimeStep() override;
|
void onUpdateDisplayModelForCurrentTimeStep() override;
|
||||||
void updateGeometry();
|
void updateGeometry();
|
||||||
void setFaultVisParameters();
|
void setFaultVisParameters();
|
||||||
void createContourMapGeometry();
|
void createContourMapGeometry();
|
||||||
|
|||||||
@@ -354,8 +354,8 @@ void RimEclipseView::onCreateDisplayModel()
|
|||||||
|
|
||||||
#if 0 // Debug info
|
#if 0 // Debug info
|
||||||
static int callCount = 0;
|
static int callCount = 0;
|
||||||
std::cout << "RimReservoirView::createDisplayModel() " << callCount++ << std::endl;
|
std::cout << "RimEclipseView::onCreateDisplayModel() " << callCount++ << std::endl;
|
||||||
RiuMainWindow::instance()->setResultInfo(QString("RimReservoirView::createDisplayModel() ") + QString::number(callCount++));
|
RiuMainWindow::instance()->setResultInfo(QString("RimEclipseView::onCreateDisplayModel() ") + QString::number(callCount++));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ( !( m_eclipseCase && m_eclipseCase->eclipseCaseData() ) ) return;
|
if ( !( m_eclipseCase && m_eclipseCase->eclipseCaseData() ) ) return;
|
||||||
@@ -590,7 +590,7 @@ void RimEclipseView::onCreateDisplayModel()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimEclipseView::onUpdateCurrentTimeStep()
|
void RimEclipseView::onUpdateDisplayModelForCurrentTimeStep()
|
||||||
{
|
{
|
||||||
clearReservoirCellVisibilities();
|
clearReservoirCellVisibilities();
|
||||||
|
|
||||||
@@ -2045,7 +2045,7 @@ void RimEclipseView::updateIconStateForFilterCollections()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimEclipseView::axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel )
|
void RimEclipseView::defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel )
|
||||||
{
|
{
|
||||||
CVF_ASSERT( xLabel && yLabel && zLabel );
|
CVF_ASSERT( xLabel && yLabel && zLabel );
|
||||||
|
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ public:
|
|||||||
const QVariant& newValue ) override;
|
const QVariant& newValue ) override;
|
||||||
void updateIconStateForFilterCollections();
|
void updateIconStateForFilterCollections();
|
||||||
|
|
||||||
void axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) override;
|
void defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) override;
|
||||||
|
|
||||||
bool isUsingFormationNames() const override;
|
bool isUsingFormationNames() const override;
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ protected:
|
|||||||
|
|
||||||
void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) override;
|
void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) override;
|
||||||
bool showActiveCellsOnly() override;
|
bool showActiveCellsOnly() override;
|
||||||
void onUpdateCurrentTimeStep() override;
|
void onUpdateDisplayModelForCurrentTimeStep() override;
|
||||||
void updateVisibleGeometriesAndCellColors();
|
void updateVisibleGeometriesAndCellColors();
|
||||||
void appendWellsAndFracturesToModel();
|
void appendWellsAndFracturesToModel();
|
||||||
|
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ void RimGeoMechContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimGeoMechContourMapView::onUpdateCurrentTimeStep()
|
void RimGeoMechContourMapView::onUpdateDisplayModelForCurrentTimeStep()
|
||||||
{
|
{
|
||||||
m_contourMapProjection->clearGeometry();
|
m_contourMapProjection->clearGeometry();
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ protected:
|
|||||||
void onCreateDisplayModel() override;
|
void onCreateDisplayModel() override;
|
||||||
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
||||||
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
|
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
|
||||||
void onUpdateCurrentTimeStep() override;
|
void onUpdateDisplayModelForCurrentTimeStep() override;
|
||||||
void updateGeometry();
|
void updateGeometry();
|
||||||
void createContourMapGeometry();
|
void createContourMapGeometry();
|
||||||
void appendContourMapProjectionToModel();
|
void appendContourMapProjectionToModel();
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ RimPropertyFilterCollection* RimGeoMechView::nativePropertyFilterCollection()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimGeoMechView::onUpdateCurrentTimeStep()
|
void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep()
|
||||||
{
|
{
|
||||||
onUpdateLegends();
|
onUpdateLegends();
|
||||||
|
|
||||||
@@ -892,7 +892,7 @@ void RimGeoMechView::updateIconStateForFilterCollections()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimGeoMechView::axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel )
|
void RimGeoMechView::defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel )
|
||||||
{
|
{
|
||||||
CVF_ASSERT( xLabel && yLabel && zLabel );
|
CVF_ASSERT( xLabel && yLabel && zLabel );
|
||||||
|
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ public:
|
|||||||
void scheduleGeometryRegen( RivCellSetEnum geometryType ) override;
|
void scheduleGeometryRegen( RivCellSetEnum geometryType ) override;
|
||||||
void updateIconStateForFilterCollections();
|
void updateIconStateForFilterCollections();
|
||||||
|
|
||||||
void axisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) override;
|
void defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel ) override;
|
||||||
|
|
||||||
bool isUsingFormationNames() const override;
|
bool isUsingFormationNames() const override;
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ private:
|
|||||||
|
|
||||||
void onClampCurrentTimestep() override;
|
void onClampCurrentTimestep() override;
|
||||||
|
|
||||||
void onUpdateCurrentTimeStep() override;
|
void onUpdateDisplayModelForCurrentTimeStep() override;
|
||||||
void onUpdateStaticCellColors() override;
|
void onUpdateStaticCellColors() override;
|
||||||
|
|
||||||
void onResetLegendsInViewer() override;
|
void onResetLegendsInViewer() override;
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ void RimGridView::initAfterRead()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimGridView::onTimeStepChanged()
|
void RimGridView::onClearReservoirCellVisibilitiesIfNeccessary()
|
||||||
{
|
{
|
||||||
if ( this->propertyFilterCollection() && this->propertyFilterCollection()->hasActiveDynamicFilters() )
|
if ( this->propertyFilterCollection() && this->propertyFilterCollection()->hasActiveDynamicFilters() )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
virtual void updateViewFollowingRangeFilterUpdates();
|
virtual void updateViewFollowingRangeFilterUpdates();
|
||||||
void initAfterRead() override;
|
void initAfterRead() override;
|
||||||
void onTimeStepChanged() override;
|
void onClearReservoirCellVisibilitiesIfNeccessary() override;
|
||||||
virtual void calculateCurrentTotalCellVisibility( cvf::UByteArray* totalVisibility, int timeStep ) = 0;
|
virtual void calculateCurrentTotalCellVisibility( cvf::UByteArray* totalVisibility, int timeStep ) = 0;
|
||||||
void selectOverlayInfoConfig() override;
|
void selectOverlayInfoConfig() override;
|
||||||
|
|
||||||
|
|||||||
@@ -267,7 +267,7 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
|
|||||||
viewLinker->updateCellResult();
|
viewLinker->updateCellResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
view->updateCurrentTimeStepAndRedraw();
|
view->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
|
|
||||||
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ void RimScaleLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* changedF
|
|||||||
viewLinker->updateCellResult();
|
viewLinker->updateCellResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
view->updateCurrentTimeStepAndRedraw();
|
view->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
|
|
||||||
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ void RimTernaryLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
|
|||||||
viewLinker->updateCellResult();
|
viewLinker->updateCellResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
view->updateCurrentTimeStepAndRedraw();
|
view->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -323,7 +323,7 @@ void RiuSelectionChangedHandler::scheduleUpdateForAllVisibleViews() const
|
|||||||
|
|
||||||
for ( size_t i = 0; i < visibleViews.size(); i++ )
|
for ( size_t i = 0; i < visibleViews.size(); i++ )
|
||||||
{
|
{
|
||||||
visibleViews[i]->createHighlightAndGridBoxDisplayModelWithRedraw();
|
visibleViews[i]->createHighlightAndGridBoxDisplayModelAndRedraw();
|
||||||
visibleViews[i]->createMeasurementDisplayModelAndRedraw();
|
visibleViews[i]->createMeasurementDisplayModelAndRedraw();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -319,7 +319,7 @@ void RiuViewer::slotSetCurrentFrame( int frameIndex )
|
|||||||
|
|
||||||
for ( auto contView : containingViews )
|
for ( auto contView : containingViews )
|
||||||
{
|
{
|
||||||
contView->updateCurrentTimeStepAndRedraw();
|
contView->updateDisplayModelForCurrentTimeStepAndRedraw();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user