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 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw

Browse Source
This commit is contained in:
Jacob Støren
2019-11-01 09:13:40 +01:00
parent 8f1e272b8b
commit c9af22cf91
5 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -144,11 +144,11 @@ public:
bool isTimeStepDependentDataVisibleInThisOrComparisonView() const; bool isTimeStepDependentDataVisibleInThisOrComparisonView() const;
// Updating // Updating
virtual void updateCurrentTimeStepAndRedraw();
virtual void scheduleGeometryRegen( RivCellSetEnum geometryType ) = 0; virtual void scheduleGeometryRegen( RivCellSetEnum geometryType ) = 0;
void scheduleCreateDisplayModelAndRedraw(); void scheduleCreateDisplayModelAndRedraw();
void createDisplayModelAndRedraw(); void createDisplayModelAndRedraw();
void updateCurrentTimeStepAndRedraw();
void createHighlightAndGridBoxDisplayModelWithRedraw(); void createHighlightAndGridBoxDisplayModelWithRedraw();
void updateGridBoxData(); void updateGridBoxData();
void updateAnnotationItems(); void updateAnnotationItems();

11
ApplicationCode/ProjectDataModel/RimEclipseContourMapView.cpp
View File

@@ -146,15 +146,6 @@ void RimEclipseContourMapView::updatePickPointAndRedraw()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateCurrentTimeStepAndRedraw()
{
m_contourMapProjection->clearGeometry();
RimEclipseView::updateCurrentTimeStepAndRedraw();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -231,6 +222,8 @@ void RimEclipseContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
void RimEclipseContourMapView::onUpdateCurrentTimeStep() void RimEclipseContourMapView::onUpdateCurrentTimeStep()
{ {
static_cast<RimEclipsePropertyFilterCollection*>( nativePropertyFilterCollection() )->updateFromCurrentTimeStep(); static_cast<RimEclipsePropertyFilterCollection*>( nativePropertyFilterCollection() )->updateFromCurrentTimeStep();
m_contourMapProjection->clearGeometry();
updateGeometry(); updateGeometry();
} }

1
ApplicationCode/ProjectDataModel/RimEclipseContourMapView.h
View File

@@ -37,7 +37,6 @@ public:
QString createAutoName() const override; QString createAutoName() const override;
void setDefaultCustomName(); void setDefaultCustomName();
void updatePickPointAndRedraw(); void updatePickPointAndRedraw();
void updateCurrentTimeStepAndRedraw() override;
protected: protected:
void initAfterRead() override; void initAfterRead() override;

11
ApplicationCode/ProjectDataModel/RimGeoMechContourMapView.cpp
View File

@@ -142,15 +142,6 @@ void RimGeoMechContourMapView::updatePickPointAndRedraw()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechContourMapView::updateCurrentTimeStepAndRedraw()
{
m_contourMapProjection->clearGeometry();
RimGeoMechView::updateCurrentTimeStepAndRedraw();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -239,6 +230,8 @@ void RimGeoMechContourMapView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGeoMechContourMapView::onUpdateCurrentTimeStep() void RimGeoMechContourMapView::onUpdateCurrentTimeStep()
{ {
m_contourMapProjection->clearGeometry();
updateGeometry(); updateGeometry();
} }

1
ApplicationCode/ProjectDataModel/RimGeoMechContourMapView.h
View File

@@ -37,7 +37,6 @@ public:
QString createAutoName() const override; QString createAutoName() const override;
void setDefaultCustomName(); void setDefaultCustomName();
void updatePickPointAndRedraw(); void updatePickPointAndRedraw();
void updateCurrentTimeStepAndRedraw() override;
bool isGridVisualizationMode() const override; bool isGridVisualizationMode() const override;
bool isTimeStepDependentDataVisible() const override; bool isTimeStepDependentDataVisible() const override;