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

#4025 Show delayed action progress bar during contour map generation

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-08 12:40:38 +01:00
parent 72e9683ac9
commit 0fd51b2088
5 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/RimEclipseContourMapView.cpp
View File

@@ -34,7 +34,9 @@
#include "RimGridCollection.h"
#include "RimSimWellInViewCollection.h"
#include "RimScaleLegendConfig.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafProgressInfo.h"
#include "cvfCamera.h"
#include "cvfModelBasicList.h"
@@ -237,23 +239,32 @@ void RimEclipseContourMapView::updateCurrentTimeStep()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapView::updateGeometry()
{
caf::ProgressInfo progress(100, "Generate Contour Map", true);
this->updateVisibleGeometriesAndCellColors();
if (m_contourMapProjection->isChecked())
{
m_contourMapProjection->generateResultsIfNecessary(m_currentTimeStep());
{ // Step 1: generate results and some minor updates. About 30% of the time.
if (m_contourMapProjection->isChecked())
{
m_contourMapProjection->generateResultsIfNecessary(m_currentTimeStep());
}
progress.setProgress(30);
}
updateLegends(); // To make sure the scalar mappers are set up correctly
appendWellsAndFracturesToModel();
createContourMapGeometry();
appendContourMapProjectionToModel();
appendContourLinesToModel();
appendPickPointVisToModel();
{ // Step 2: generate geometry. Takes about 60% of the time.
createContourMapGeometry();
progress.setProgress(90);
}
{ // Step 3: generate drawables. Takes about 10% of the time.
appendContourMapProjectionToModel();
appendContourLinesToModel();
appendPickPointVisToModel();
progress.setProgress(100);
}
m_overlayInfoConfig()->update3DInfo();
}