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

Better minimum width for well log tracks (#4824)

Browse Source 
* Better minimum width for well log tracks

* Fix alignment of scrollbar in Well log plots
This commit is contained in:
Gaute Lindkvist 2019-10-07 08:32:34 +02:00 committed by GitHub
parent 3d3ad421dd
commit 4a4653a0df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -1492,7 +1492,8 @@ void RimWellLogTrack::initAfterRead()
{ {
if ( m_showFormations_OBSOLETE() && m_regionAnnotationType() == RiuPlotAnnotationTool::NO_ANNOTATIONS ) if ( m_showFormations_OBSOLETE() && m_regionAnnotationType() == RiuPlotAnnotationTool::NO_ANNOTATIONS )
{ {
m_regionAnnotationType = RiuPlotAnnotationTool::FORMATION_ANNOTATIONS; m_regionAnnotationType = RiuPlotAnnotationTool::FORMATION_ANNOTATIONS;
m_regionAnnotationDisplay = RiuPlotAnnotationTool::DARK_LINES;
} }
} }

43
ApplicationCode/UserInterface/RiuWellLogPlot.cpp
View File

@ -82,14 +82,10 @@ RiuWellLogPlot::RiuWellLogPlot( RimWellLogPlot* plotDefinition, QWidget* parent
setAutoFillBackground( true ); setAutoFillBackground( true );
m_scrollBarLayout = new QVBoxLayout;
m_scrollBarLayout->setContentsMargins( 0, 50, 0, 0 );
m_plotLayout->addLayout( m_scrollBarLayout );
m_scrollBar = new QScrollBar( nullptr ); m_scrollBar = new QScrollBar( nullptr );
m_scrollBar->setOrientation( Qt::Vertical ); m_scrollBar->setOrientation( Qt::Vertical );
m_scrollBar->setVisible( true );
m_scrollBarLayout = new QVBoxLayout;
m_scrollBarLayout->addWidget( m_scrollBar, 0 ); m_scrollBarLayout->addWidget( m_scrollBar, 0 );
new RiuPlotObjectPicker( m_plotTitle, m_plotDefinition ); new RiuPlotObjectPicker( m_plotTitle, m_plotDefinition );
@ -223,8 +219,8 @@ void RiuWellLogPlot::setTitleVisible( bool visible )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::updateChildrenLayout() void RiuWellLogPlot::updateChildrenLayout()
{ {
reinsertTracks(); reinsertTracksAndScrollbar();
alignCanvasTops(); alignCanvasTopsAndScrollbar();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -287,6 +283,27 @@ void RiuWellLogPlot::resizeEvent( QResizeEvent* event )
updateChildrenLayout(); updateChildrenLayout();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::showEvent( QShowEvent* event )
{
QWidget::showEvent( event );
updateChildrenLayout();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::changeEvent( QEvent* event )
{
QWidget::changeEvent( event );
if ( event->type() == QEvent::WindowStateChange )
{
updateChildrenLayout();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -312,7 +329,7 @@ void RiuWellLogPlot::updateScrollBar( double minDepth, double maxDepth )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::alignCanvasTops() void RiuWellLogPlot::alignCanvasTopsAndScrollbar()
{ {
CVF_ASSERT( m_legends.size() == m_trackPlots.size() ); CVF_ASSERT( m_legends.size() == m_trackPlots.size() );
@ -333,12 +350,13 @@ void RiuWellLogPlot::alignCanvasTops()
m_trackPlots[tIdx]->axisScaleDraw( QwtPlot::xTop )->setMinimumExtent( maxExtent ); m_trackPlots[tIdx]->axisScaleDraw( QwtPlot::xTop )->setMinimumExtent( maxExtent );
} }
} }
m_scrollBarLayout->setContentsMargins( 0, maxExtent, 0, 0 );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::reinsertTracks() void RiuWellLogPlot::reinsertTracksAndScrollbar()
{ {
clearTrackLayout(); clearTrackLayout();
@ -347,8 +365,8 @@ void RiuWellLogPlot::reinsertTracks()
{ {
if ( m_trackPlots[tIdx]->isRimTrackVisible() ) if ( m_trackPlots[tIdx]->isRimTrackVisible() )
{ {
m_trackLayout->addWidget( m_legends[tIdx], 0, static_cast<int>( visibleIndex ) ); m_trackLayout->addWidget( m_legends[tIdx], 0, visibleIndex );
m_trackLayout->addWidget( m_trackPlots[tIdx], 1, static_cast<int>( visibleIndex ) ); m_trackLayout->addWidget( m_trackPlots[tIdx], 1, visibleIndex );
if ( m_plotDefinition->areTrackLegendsVisible() ) if ( m_plotDefinition->areTrackLegendsVisible() )
{ {
@ -358,7 +376,6 @@ void RiuWellLogPlot::reinsertTracks()
legendColumns = 0; // unlimited legendColumns = 0; // unlimited
} }
m_legends[tIdx]->setMaxColumns( legendColumns ); m_legends[tIdx]->setMaxColumns( legendColumns );
m_trackPlots[tIdx]->updateLegend();
int minimumHeight = m_legends[tIdx]->heightForWidth( m_trackPlots[tIdx]->width() ); int minimumHeight = m_legends[tIdx]->heightForWidth( m_trackPlots[tIdx]->width() );
m_legends[tIdx]->setMinimumHeight( minimumHeight ); m_legends[tIdx]->setMinimumHeight( minimumHeight );
@ -388,6 +405,8 @@ void RiuWellLogPlot::reinsertTracks()
m_legends[tIdx]->hide(); m_legends[tIdx]->hide();
} }
} }
m_trackLayout->addLayout( m_scrollBarLayout, 1, visibleIndex );
m_scrollBar->setVisible( visibleIndex > 0 );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationCode/UserInterface/RiuWellLogPlot.h
View File

@ -77,11 +77,13 @@ protected:
QLabel* createTitleLabel() const; QLabel* createTitleLabel() const;
void resizeEvent( QResizeEvent* event ) override; void resizeEvent( QResizeEvent* event ) override;
void showEvent( QShowEvent* event ) override;
void changeEvent( QEvent* ) override;
private: private:
void updateScrollBar( double minDepth, double maxDepth ); void updateScrollBar( double minDepth, double maxDepth );
void alignCanvasTops(); void alignCanvasTopsAndScrollbar();
void reinsertTracks(); void reinsertTracksAndScrollbar();
void clearTrackLayout(); void clearTrackLayout();
private slots: private slots:

29
ApplicationCode/UserInterface/RiuWellLogTrack.cpp
View File

@ -87,9 +87,8 @@ void RiuWellLogTrack::setDefaults()
axisScaleEngine( QwtPlot::yLeft )->setAttribute( QwtScaleEngine::Floating, true ); axisScaleEngine( QwtPlot::yLeft )->setAttribute( QwtScaleEngine::Floating, true );
setAxisScale( QwtPlot::yLeft, 1000, 0 ); setAxisScale( QwtPlot::yLeft, 1000, 0 );
setXRange( 0, 100 ); setXRange( 0, 100 );
QFont font = axisFont( QwtPlot::xTop ); axisScaleDraw( QwtPlot::xTop )->setMinimumExtent( axisExtent( QwtPlot::xTop ) );
int lineHeight = QFontMetrics( font ).height() + axisScaleDraw( QwtPlot::xTop )->tickLength( QwtScaleDiv::MajorTick ); setMinimumWidth( defaultMinimumWidth() );
axisScaleDraw( QwtPlot::xTop )->setMinimumExtent( lineHeight );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -119,6 +118,7 @@ void RiuWellLogTrack::setDepthTitle( const QString& title )
{ {
axisTitleY.setText( title ); axisTitleY.setText( title );
setAxisTitle( QwtPlot::yLeft, axisTitleY ); setAxisTitle( QwtPlot::yLeft, axisTitleY );
setMinimumWidth( defaultMinimumWidth() + axisExtent( QwtPlot::yLeft ) );
} }
} }
@ -236,6 +236,14 @@ void RiuWellLogTrack::selectClosestCurve( const QPoint& pos )
RiuPlotMainWindowTools::selectAsCurrentItem( m_plotTrackDefinition ); RiuPlotMainWindowTools::selectAsCurrentItem( m_plotTrackDefinition );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RiuWellLogTrack::defaultMinimumWidth()
{
return 80;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -374,3 +382,18 @@ double RiuWellLogTrack::getCurrentMinorTickInterval() const
return minorTicks.at( 1 ) - minorTicks.at( 0 ); return minorTicks.at( 1 ) - minorTicks.at( 0 );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RiuWellLogTrack::axisExtent( QwtPlot::Axis axis ) const
{
QFont tickLabelFont = axisFont( axis );
int lineExtent = static_cast<int>( std::ceil( axisScaleDraw( axis )->extent( tickLabelFont ) ) );
if ( !axisTitle( axis ).text().isEmpty() )
{
QFont titleFont = axisTitle( axis ).font();
lineExtent += QFontMetrics( titleFont ).height();
}
return lineExtent;
}

6
ApplicationCode/UserInterface/RiuWellLogTrack.h
View File

@ -60,6 +60,7 @@ public:
void setAutoTickIntervalCounts( int maxMajorTickIntervalCount, int maxMinorTickIntervalCount ); void setAutoTickIntervalCounts( int maxMajorTickIntervalCount, int maxMinorTickIntervalCount );
double getCurrentMajorTickInterval() const; double getCurrentMajorTickInterval() const;
double getCurrentMinorTickInterval() const; double getCurrentMinorTickInterval() const;
int axisExtent( QwtPlot::Axis axis ) const;
protected: protected:
bool eventFilter( QObject* watched, QEvent* event ) override; bool eventFilter( QObject* watched, QEvent* event ) override;
@ -67,8 +68,9 @@ protected:
QSize minimumSizeHint() const override; QSize minimumSizeHint() const override;
private: private:
void setDefaults(); void setDefaults();
void selectClosestCurve( const QPoint& pos ); void selectClosestCurve( const QPoint& pos );
static int defaultMinimumWidth();
private: private:
caf::PdmPointer<RimWellLogTrack> m_plotTrackDefinition; caf::PdmPointer<RimWellLogTrack> m_plotTrackDefinition;