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

Add multi selection for Correlation Cross Plot and fix label font sizes for Tornado plots

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-06-08 16:12:32 +02:00
parent c1ca5054e8
commit 457cdae367
11 changed files with 134 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
View File

@@ -19,6 +19,9 @@
#include "RiuGroupedBarChartBuilder.h"
#include "RiaColorTables.h"
#include "RiaPreferences.h"
#include "cafFontTools.h"
#include "qwt_column_symbol.h"
#include "qwt_legend.h"
@@ -89,8 +92,10 @@ public:
class RiuBarChartScaleDraw : public QwtScaleDraw
{
public:
RiuBarChartScaleDraw( const std::map<double, std::pair<QwtScaleDiv::TickType, QString>>& posTickTypeAndTexts )
RiuBarChartScaleDraw( const std::map<double, std::pair<QwtScaleDiv::TickType, QString>>& posTickTypeAndTexts,
int labelFontPointSize )
: m_posTickTypeAndTexts( posTickTypeAndTexts )
, m_labelFontPointSize( labelFontPointSize )
{
this->setTickLength( QwtScaleDiv::MajorTick, 0 );
this->setTickLength( QwtScaleDiv::MediumTick, 0 );
@@ -122,6 +127,14 @@ public:
m_majSpacing = m_medSpacing + QString().fill( ' ', 2 * medTickMaxTextSize );
}
QwtText createLabelFromString( const QString& string ) const
{
QwtText text( string );
QFont font = text.font();
font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_labelFontPointSize ) );
text.setFont( font );
return text;
}
/// Override to add new lines to the labels according to the tick level
QwtText label( double v ) const override
@@ -133,36 +146,36 @@ public:
{
if ( posTypeTextPairIt->second.first == QwtScaleDiv::MediumTick )
{
return m_medLineBreak + posTypeTextPairIt->second.second;
return createLabelFromString( m_medLineBreak + posTypeTextPairIt->second.second );
}
else if ( posTypeTextPairIt->second.first == QwtScaleDiv::MajorTick )
{
return m_majLineBreak + posTypeTextPairIt->second.second;
return createLabelFromString( m_majLineBreak + posTypeTextPairIt->second.second );
}
else
{
return posTypeTextPairIt->second.second;
return createLabelFromString( posTypeTextPairIt->second.second );
}
}
else if ( this->alignment() == LeftScale )
{
if ( posTypeTextPairIt->second.first == QwtScaleDiv::MediumTick )
{
return posTypeTextPairIt->second.second + m_medSpacing;
return createLabelFromString( posTypeTextPairIt->second.second + m_medSpacing );
}
else if ( posTypeTextPairIt->second.first == QwtScaleDiv::MajorTick )
{
return posTypeTextPairIt->second.second + m_majSpacing;
return createLabelFromString( posTypeTextPairIt->second.second + m_majSpacing );
}
else
{
return posTypeTextPairIt->second.second;
return createLabelFromString( posTypeTextPairIt->second.second );
}
}
else
{
return posTypeTextPairIt->second.second;
return createLabelFromString( posTypeTextPairIt->second.second );
}
}
else
@@ -212,6 +225,8 @@ private:
QString m_majLineBreak;
QString m_medSpacing;
QString m_majSpacing;
int m_labelFontPointSize;
};
//--------------------------------------------------------------------------------------------------
@@ -220,6 +235,8 @@ private:
RiuGroupedBarChartBuilder::RiuGroupedBarChartBuilder( bool sortGroupsByMaxValueInGroup )
: m_isSortingByMaxValueInGroups( sortGroupsByMaxValueInGroup )
{
m_labelPointSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultPlotFontSize(),
caf::FontTools::RelativeSize::Small );
}
//--------------------------------------------------------------------------------------------------
@@ -575,7 +592,7 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
}
}
RiuBarChartScaleDraw* scaleDrawer = new RiuBarChartScaleDraw( groupPositionedAxisTexts );
RiuBarChartScaleDraw* scaleDrawer = new RiuBarChartScaleDraw( groupPositionedAxisTexts, m_labelPointSize );
plot->setAxisScaleDraw( axis, scaleDrawer );
plot->setAxisScaleDiv( axis, groupAxisScaleDiv );
@@ -700,7 +717,7 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
}
}
RiuBarChartScaleDraw* barTextScaleDrawer = new RiuBarChartScaleDraw( positionedBarLabels );
RiuBarChartScaleDraw* barTextScaleDrawer = new RiuBarChartScaleDraw( positionedBarLabels, m_labelPointSize );
barTextScaleDrawer->setAlignment( alignment );
barTextScaleDrawer->setLabelRotation( labelRotation );
barTextScaleDrawer->setLabelAlignment( labelAlignment );
@@ -713,6 +730,14 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuGroupedBarChartBuilder::setLabelFontSize( int labelPointSize )
{
m_labelPointSize = labelPointSize;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.h
View File

@@ -47,6 +47,7 @@ public:
void setLegendColorMap( const std::map<QString, QColor>& legendColors );
void addBarChartToPlot( QwtPlot* plot, Qt::Orientation orientation, int maxBarCount = -1 );
void setLabelFontSize( int labelPointSize );
private:
double midPoint( double v1, double v2 ) { return v1 + 0.5 * ( v2 - 1.0 - v1 ); }
@@ -87,4 +88,5 @@ private:
Qt::Orientation m_orientation;
std::map<QString, QColor> m_legendColors;
bool m_isSortingByMaxValueInGroups;
int m_labelPointSize;
};