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

#4880 Further renaming of methods in Rim3dView

Browse Source
This commit is contained in:
Jacob Støren 2019-11-01 10:13:32 +01:00
parent c9af22cf91
commit e85cd1b456
22 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
View File

@ -171,7 +171,7 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells( Rim
viewToModify->faultCollection()->showFaultCollection = false;
viewToModify->faultCollection()->updateConnectedEditors();
viewToModify->updateCurrentTimeStepAndRedraw();
viewToModify->updateDisplayModelForCurrentTimeStepAndRedraw();
viewToModify->scheduleCreateDisplayModelAndRedraw();
}

2
ApplicationCode/Commands/RicContourMapPickEventHandler.cpp
View File

@ -90,7 +90,7 @@ bool RicContourMapPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
return true;
}
contourMap->setPickPoint( cvf::Vec2d::UNDEFINED );
view->updateCurrentTimeStepAndRedraw();
view->updateDisplayModelForCurrentTimeStepAndRedraw();
return true;
}
}

2
ApplicationCode/Commands/RicFlyToObjectFeature.cpp
View File

@ -87,7 +87,7 @@ void RicFlyToObjectFeature::onActionTriggered( bool isChecked )
destinationViewer->setPointOfInterest( cameraViewRefPoint );
activeView->updateCurrentTimeStepAndRedraw();
activeView->updateDisplayModelForCurrentTimeStepAndRedraw();
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@ -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 ( viewer() ) viewer()->setCurrentFrame( m_currentTimeStep );
onUpdateCurrentTimeStep();
onUpdateDisplayModelForCurrentTimeStep();
}
if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
@ -548,7 +548,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim2dIntersectionView::onUpdateCurrentTimeStep()
void Rim2dIntersectionView::onUpdateDisplayModelForCurrentTimeStep()
{
update3dInfo();
onUpdateLegends();

4
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
View File

@ -85,11 +85,11 @@ protected:
void onUpdateLegends() 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 onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) override;
void onClampCurrentTimestep() override;
void onUpdateCurrentTimeStep() override;
void onUpdateDisplayModelForCurrentTimeStep() override;
void onUpdateStaticCellColors() override;
void onUpdateScaleTransform() override;
cvf::Transform* scaleTransform() override;

24
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@ -248,7 +248,7 @@ QWidget* Rim3dView::createViewWidget( QWidget* mainWindowParent )
cvf::String yLabel;
cvf::String zLabel;
this->axisLabels( &xLabel, &yLabel, &zLabel );
this->defineAxisLabels( &xLabel, &yLabel, &zLabel );
m_viewer->setAxisLabels( xLabel, yLabel, zLabel );
updateZScaleLabel();
@ -468,7 +468,7 @@ void Rim3dView::setCurrentTimeStep( int frameIndex )
if ( m_currentTimeStep != oldTimeStep )
{
RiuTimeStepChangedHandler::instance()->handleTimeStepChanged( this );
this->onTimeStepChanged();
this->onClearReservoirCellVisibilitiesIfNeccessary();
}
this->hasUserRequestedAnimation = true;
@ -481,11 +481,11 @@ void Rim3dView::setCurrentTimeStepAndUpdate( int frameIndex )
{
setCurrentTimeStep( frameIndex );
this->onUpdateCurrentTimeStep();
this->onUpdateDisplayModelForCurrentTimeStep();
if ( Rim3dView* depView = prepareComparisonView() )
{
depView->onUpdateCurrentTimeStep();
depView->onUpdateDisplayModelForCurrentTimeStep();
depView->appendAnnotationsToModel();
depView->appendMeasurementToModel();
@ -503,17 +503,17 @@ void Rim3dView::setCurrentTimeStepAndUpdate( int frameIndex )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dView::updateCurrentTimeStepAndRedraw()
void Rim3dView::updateDisplayModelForCurrentTimeStepAndRedraw()
{
if ( m_isCallingUpdateTimestepAndRedraw ) return;
if ( nativeOrOverrideViewer() )
{
this->onUpdateCurrentTimeStep();
this->onUpdateDisplayModelForCurrentTimeStep();
if ( Rim3dView* depView = prepareComparisonView() )
{
depView->onUpdateCurrentTimeStep();
depView->onUpdateDisplayModelForCurrentTimeStep();
restoreComparisonView();
}
@ -528,7 +528,7 @@ void Rim3dView::updateCurrentTimeStepAndRedraw()
{
for ( auto view : containerViews )
{
view->updateCurrentTimeStepAndRedraw();
view->updateDisplayModelForCurrentTimeStepAndRedraw();
}
}
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
// m_currentTimeStep
nativeOrOverrideViewer()->caf::Viewer::slotSetCurrentFrame( currentTimeStep() );
depView->onUpdateCurrentTimeStep();
depView->onUpdateDisplayModelForCurrentTimeStep();
}
restoreComparisonView();
@ -733,7 +733,7 @@ void Rim3dView::setSurfaceDrawstyle()
void Rim3dView::disableLighting( bool disable )
{
m_disableLighting = disable;
updateCurrentTimeStepAndRedraw();
updateDisplayModelForCurrentTimeStepAndRedraw();
updateConnectedEditors();
}
@ -796,7 +796,7 @@ void Rim3dView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
}
else if ( changedField == &m_showGridBox )
{
createHighlightAndGridBoxDisplayModelWithRedraw();
createHighlightAndGridBoxDisplayModelAndRedraw();
}
else if ( changedField == &m_disableLighting )
{
@ -1083,7 +1083,7 @@ void Rim3dView::createMeasurementDisplayModelAndRedraw()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dView::createHighlightAndGridBoxDisplayModelWithRedraw()
void Rim3dView::createHighlightAndGridBoxDisplayModelAndRedraw()
{
createHighlightAndGridBoxDisplayModel();

13
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@ -148,13 +148,13 @@ public:
void scheduleCreateDisplayModelAndRedraw();
void createDisplayModelAndRedraw();
void updateCurrentTimeStepAndRedraw();
void createHighlightAndGridBoxDisplayModelWithRedraw();
void updateDisplayModelForCurrentTimeStepAndRedraw();
void createHighlightAndGridBoxDisplayModelAndRedraw();
void createMeasurementDisplayModelAndRedraw();
void updateGridBoxData();
void updateAnnotationItems();
void updateScaling();
void updateZScaleLabel();
void createMeasurementDisplayModelAndRedraw();
bool isMasterView() const;
Rim3dView* activeComparisonView() const;
@ -206,14 +206,13 @@ protected:
// 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 onUpdateDisplayModelForCurrentTimeStep() = 0;
virtual void onUpdateDisplayModelVisibility(){};
virtual void onClampCurrentTimestep() = 0;
virtual void onUpdateCurrentTimeStep() = 0;
virtual void onTimeStepChanged(){};
virtual void onClearReservoirCellVisibilitiesIfNeccessary(){};
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 onUpdateStaticCellColors() = 0;

2
ApplicationCode/ProjectDataModel/RimEclipseContourMapView.cpp
View File

@ -219,7 +219,7 @@ void RimEclipseContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::onUpdateCurrentTimeStep()
void RimEclipseContourMapView::onUpdateDisplayModelForCurrentTimeStep()
{
static_cast<RimEclipsePropertyFilterCollection*>( nativePropertyFilterCollection() )->updateFromCurrentTimeStep();

2
ApplicationCode/ProjectDataModel/RimEclipseContourMapView.h
View File

@ -43,7 +43,7 @@ protected:
void onCreateDisplayModel() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void onUpdateCurrentTimeStep() override;
void onUpdateDisplayModelForCurrentTimeStep() override;
void updateGeometry();
void setFaultVisParameters();
void createContourMapGeometry();

8
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -354,8 +354,8 @@ void RimEclipseView::onCreateDisplayModel()
#if 0 // Debug info
static int callCount = 0;
std::cout << "RimReservoirView::createDisplayModel() " << callCount++ << std::endl;
RiuMainWindow::instance()->setResultInfo(QString("RimReservoirView::createDisplayModel() ") + QString::number(callCount++));
std::cout << "RimEclipseView::onCreateDisplayModel() " << callCount++ << std::endl;
RiuMainWindow::instance()->setResultInfo(QString("RimEclipseView::onCreateDisplayModel() ") + QString::number(callCount++));
#endif
if ( !( m_eclipseCase && m_eclipseCase->eclipseCaseData() ) ) return;
@ -590,7 +590,7 @@ void RimEclipseView::onCreateDisplayModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::onUpdateCurrentTimeStep()
void RimEclipseView::onUpdateDisplayModelForCurrentTimeStep()
{
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 );

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -135,7 +135,7 @@ public:
const QVariant& newValue ) override;
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;
@ -155,7 +155,7 @@ protected:
void onCreatePartCollectionFromSelection( cvf::Collection<cvf::Part>* parts ) override;
bool showActiveCellsOnly() override;
void onUpdateCurrentTimeStep() override;
void onUpdateDisplayModelForCurrentTimeStep() override;
void updateVisibleGeometriesAndCellColors();
void appendWellsAndFracturesToModel();

2
ApplicationCode/ProjectDataModel/RimGeoMechContourMapView.cpp
View File

@ -228,7 +228,7 @@ void RimGeoMechContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechContourMapView::onUpdateCurrentTimeStep()
void RimGeoMechContourMapView::onUpdateDisplayModelForCurrentTimeStep()
{
m_contourMapProjection->clearGeometry();

2
ApplicationCode/ProjectDataModel/RimGeoMechContourMapView.h
View File

@ -46,7 +46,7 @@ protected:
void onCreateDisplayModel() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void onUpdateCurrentTimeStep() override;
void onUpdateDisplayModelForCurrentTimeStep() override;
void updateGeometry();
void createContourMapGeometry();
void appendContourMapProjectionToModel();

4
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -316,7 +316,7 @@ RimPropertyFilterCollection* RimGeoMechView::nativePropertyFilterCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::onUpdateCurrentTimeStep()
void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep()
{
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 );

4
ApplicationCode/ProjectDataModel/RimGeoMechView.h
View File

@ -83,7 +83,7 @@ public:
void scheduleGeometryRegen( RivCellSetEnum geometryType ) override;
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;
@ -123,7 +123,7 @@ private:
void onClampCurrentTimestep() override;
void onUpdateCurrentTimeStep() override;
void onUpdateDisplayModelForCurrentTimeStep() override;
void onUpdateStaticCellColors() override;
void onResetLegendsInViewer() override;

2
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@ -390,7 +390,7 @@ void RimGridView::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridView::onTimeStepChanged()
void RimGridView::onClearReservoirCellVisibilitiesIfNeccessary()
{
if ( this->propertyFilterCollection() && this->propertyFilterCollection()->hasActiveDynamicFilters() )
{

2
ApplicationCode/ProjectDataModel/RimGridView.h
View File

@ -72,7 +72,7 @@ public:
protected:
virtual void updateViewFollowingRangeFilterUpdates();
void initAfterRead() override;
void onTimeStepChanged() override;
void onClearReservoirCellVisibilitiesIfNeccessary() override;
virtual void calculateCurrentTotalCellVisibility( cvf::UByteArray* totalVisibility, int timeStep ) = 0;
void selectOverlayInfoConfig() override;

2
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@ -267,7 +267,7 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
viewLinker->updateCellResult();
}
view->updateCurrentTimeStepAndRedraw();
view->updateDisplayModelForCurrentTimeStepAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}

2
ApplicationCode/ProjectDataModel/RimScaleLegendConfig.cpp
View File

@ -188,7 +188,7 @@ void RimScaleLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* changedF
viewLinker->updateCellResult();
}
view->updateCurrentTimeStepAndRedraw();
view->updateDisplayModelForCurrentTimeStepAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}

2
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@ -158,7 +158,7 @@ void RimTernaryLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
viewLinker->updateCellResult();
}
view->updateCurrentTimeStepAndRedraw();
view->updateDisplayModelForCurrentTimeStepAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}

2
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@ -323,7 +323,7 @@ void RiuSelectionChangedHandler::scheduleUpdateForAllVisibleViews() const
for ( size_t i = 0; i < visibleViews.size(); i++ )
{
visibleViews[i]->createHighlightAndGridBoxDisplayModelWithRedraw();
visibleViews[i]->createHighlightAndGridBoxDisplayModelAndRedraw();
visibleViews[i]->createMeasurementDisplayModelAndRedraw();
}
}

2
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -319,7 +319,7 @@ void RiuViewer::slotSetCurrentFrame( int frameIndex )
for ( auto contView : containingViews )
{
contView->updateCurrentTimeStepAndRedraw();
contView->updateDisplayModelForCurrentTimeStepAndRedraw();
}
}
}