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

Merge pull request #4985 from OPM/feature-fix-point-manipulators-in-comparison-view

Browse Source 
#4981 Fix well target manipulators not responding
This commit is contained in:
Jacob Støren
2019-11-05 15:42:02 +01:00
committed by GitHub
parent b227ef7bdb 3c3c207bbc
commit 58c1734334
5 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -93,6 +93,7 @@ std::unique_ptr<QCursor> RiuViewer::s_hoverCursor;
RiuViewer::RiuViewer( const QGLFormat& format, QWidget* parent )
: caf::Viewer( format, parent )
, m_isNavigationRotationEnabled( true )
, m_zScale( 1.0 )
{
cvf::Font* standardFont = RiaGuiApplication::instance()->defaultSceneFont();
QFont font = RiaGuiApplication::instance()->font();
@@ -490,7 +491,12 @@ void RiuViewer::showZScaleLabel( bool enable )
//--------------------------------------------------------------------------------------------------
void RiuViewer::setZScale( int scale )
{
bool isScaleChanged = m_zScale != scale;
m_zScale = scale;
m_zScaleLabel->setText( QString( "Z: %1" ).arg( scale ) );
if ( isScaleChanged ) m_selectionVisualizerManager->updateVisibleEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -531,14 +537,16 @@ void RiuViewer::setHistogramPercentiles( double pmin, double pmax, double mean )
//--------------------------------------------------------------------------------------------------
void RiuViewer::showGridBox( bool enable )
{
this->removeStaticModel( m_gridBoxGenerator->model() );
this->removeStaticModel( m_comparisonGridBoxGenerator->model() );
if ( enable )
{
this->addStaticModelOnce( m_gridBoxGenerator->model(), false );
this->addStaticModelOnce( m_comparisonGridBoxGenerator->model(), true );
}
else
{
this->removeStaticModel( m_gridBoxGenerator->model() );
this->removeStaticModel( m_comparisonGridBoxGenerator->model() );
}
}
//--------------------------------------------------------------------------------------------------
@@ -930,8 +938,6 @@ void RiuViewer::updateGridBoxData( double scaleZ,
m_comparisonGridBoxGenerator->setGridBoxDomainCoordBoundingBox( domainCoordBoundingBox );
m_comparisonGridBoxGenerator->createGridBoxParts();
m_selectionVisualizerManager->updateVisibleEditors();
}
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -175,6 +175,7 @@ private:
QLabel* m_zScaleLabel;
bool m_showZScaleLabel;
bool m_hideZScaleCheckbox;
double m_zScale;
caf::QStyledProgressBar* m_animationProgress;
bool m_showAnimProgress;