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

Improvements to Correlation plots

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-05-27 12:58:21 +02:00
parent 2fe4372dc2
commit e6c2b693ef
12 changed files with 241 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/UserInterface/RiuMultiPlotPage.cpp
View File

@@ -71,8 +71,8 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare
, m_titleFontPixelSize( 12 )
, m_subTitleFontPixelSize( 11 )
, m_legendFontPixelSize( 8 )
, m_axisTitleFontPixelSize( 10 )
, m_axisValueFontPixelSize( 10 )
, m_axisTitleFontSize( 8 )
, m_axisValueFontSize( 8 )
{
CAF_ASSERT( m_plotDefinition );
@@ -284,8 +284,8 @@ void RiuMultiPlotPage::setLegendFontSize( int legendFontSize )
//--------------------------------------------------------------------------------------------------
void RiuMultiPlotPage::setAxisFontSizes( int axisTitleFontSize, int axisValueFontSize )
{
m_axisTitleFontPixelSize = caf::FontTools::pointSizeToPixelSize( axisTitleFontSize );
m_axisValueFontPixelSize = caf::FontTools::pointSizeToPixelSize( axisValueFontSize );
m_axisTitleFontSize = axisTitleFontSize;
m_axisValueFontSize = axisValueFontSize;
scheduleUpdate();
}
@@ -636,9 +636,7 @@ void RiuMultiPlotPage::reinsertPlotWidgets()
showYAxis( row, column ),
showYAxis( row, column ) );
plotWidgets[visibleIndex]->setAxisTitleEnabled( QwtPlot::yLeft, showYAxis( row, column ) );
plotWidgets[visibleIndex]->setAxisFontsAndAlignment( QwtPlot::yLeft,
m_axisTitleFontPixelSize,
m_axisValueFontPixelSize );
plotWidgets[visibleIndex]->setAxesFontsAndAlignment( m_axisTitleFontSize, m_axisValueFontSize );
plotWidgets[visibleIndex]->show();
@@ -784,6 +782,7 @@ QList<QPointer<QLabel>> RiuMultiPlotPage::subTitlesForVisiblePlots() const
{
if ( m_plotWidgets[i]->isChecked() )
{
m_subTitles[i]->setText( m_plotWidgets[i]->plotTitle() );
subTitles.push_back( m_subTitles[i] );
}
}

4
ApplicationCode/UserInterface/RiuMultiPlotPage.h
View File

@@ -146,8 +146,8 @@ protected:
int m_titleFontPixelSize;
int m_subTitleFontPixelSize;
int m_legendFontPixelSize;
int m_axisTitleFontPixelSize;
int m_axisValueFontPixelSize;
int m_axisTitleFontSize;
int m_axisValueFontSize;
bool m_previewMode;
bool m_showSubTitles;

20
ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@@ -165,11 +165,14 @@ int RiuQwtPlotWidget::axisValueFontSize( QwtPlot::Axis axis ) const
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::setAxisFontsAndAlignment( QwtPlot::Axis axis,
int titleFontPixelSize,
int valueFontPixelSize,
int titleFontSize,
int valueFontSize,
bool titleBold,
int alignment )
{
int titleFontPixelSize = caf::FontTools::pointSizeToPixelSize( titleFontSize );
int valueFontPixelSize = caf::FontTools::pointSizeToPixelSize( valueFontSize );
// Axis number font
QFont axisFont = this->axisFont( axis );
axisFont.setPixelSize( valueFontPixelSize );
@@ -188,6 +191,17 @@ void RiuQwtPlotWidget::setAxisFontsAndAlignment( QwtPlot::Axis axis,
applyAxisTitleToQwt( axis );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::setAxesFontsAndAlignment( int titleFontSize, int valueFontSize, bool titleBold, int alignment )
{
for ( auto axisTitlePair : m_axisTitles )
{
setAxisFontsAndAlignment( axisTitlePair.first, titleFontSize, valueFontSize, titleBold, alignment );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -983,7 +997,7 @@ void RiuQwtPlotWidget::selectClosestPlotItem( const QPoint& pos, bool toggleItem
bool horizontal = barChart->orientation() == Qt::Horizontal;
for ( size_t i = 0; i < barChart->dataSize(); ++i )
{
QPointF samplePoint = barChart->sample( i );
QPointF samplePoint = barChart->sample( (int)i );
double dist = horizontal ? std::abs( samplePoint.x() - scalePos.y() )
: std::abs( samplePoint.x() - scalePos.x() );
if ( dist < distMin )

10
ApplicationCode/UserInterface/RiuQwtPlotWidget.h
View File

@@ -72,10 +72,14 @@ public:
int axisTitleFontSize( QwtPlot::Axis axis ) const;
int axisValueFontSize( QwtPlot::Axis axis ) const;
void setAxisFontsAndAlignment( QwtPlot::Axis,
int titleFontPixelSize,
int valueFontPixelSize,
int titleFontSize,
int valueFontSize,
bool titleBold = false,
int alignment = (int)Qt::AlignRight );
int alignment = (int)Qt::AlignCenter );
void setAxesFontsAndAlignment( int titleFontSize,
int valueFontSize,
bool titleBold = false,
int alignment = (int)Qt::AlignCenter );
void setAxisTitleText( QwtPlot::Axis axis, const QString& title );
void setAxisTitleEnabled( QwtPlot::Axis axis, bool enable );