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

#5539 Add optional top N filter

Browse Source 
Adjust layout in Analysis Plot property panel
Add colormap option to barchart builder
This commit is contained in:
Jacob Støren
2020-02-26 11:21:44 +01:00
parent afea6963b2
commit 782b5c360d
4 changed files with 116 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,7 +206,15 @@ void RiuGroupedBarChartBuilder::addBarEntry( const QString& majorTickText,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientation barOrientation )
void RiuGroupedBarChartBuilder::setLegendColorMap( const std::map<QString, QColor>& legendColors )
{
m_legendColors = legendColors;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientation barOrientation, int maxBarCount )
{
const double majGroupSpacing = 1.6;
const double midGroupSpacing = 0.5;
@@ -234,6 +242,42 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
QList<double> midTickPositions;
QList<double> minTickPositions;
// Filter the entries according to value
std::multiset<BarEntry> filteredBarEntries;
if ( maxBarCount >= 0 )
{
std::map<double, BarEntry> valueFilteredBarEntries;
int mapSize = 0;
for ( const BarEntry& barDef : m_sortedBarEntries )
{
if ( mapSize < maxBarCount )
{
if ( valueFilteredBarEntries.insert( std::make_pair( fabs( barDef.m_value ), barDef ) ).second )
{
mapSize++;
}
}
else if ( fabs( barDef.m_value ) > valueFilteredBarEntries.begin()->first )
{
if ( valueFilteredBarEntries.insert( std::make_pair( fabs( barDef.m_value ), barDef ) ).second )
{
valueFilteredBarEntries.erase( valueFilteredBarEntries.begin() );
}
}
}
for ( auto valEntryPair : valueFilteredBarEntries )
{
filteredBarEntries.insert( valEntryPair.second );
}
}
else
{
// No filtering
filteredBarEntries = m_sortedBarEntries;
}
// clang-format off
auto addGroupTickText = [&]( double groupStartPos, QString tickText, QList<double>& groupTickPosList )
{
@@ -259,7 +303,7 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
// Loop over entries, calculate tick positions and bar positions as we go
for ( const BarEntry& barDef : m_sortedBarEntries )
for ( const BarEntry& barDef : filteredBarEntries )
{
bool hasAnyMajTics = !majTickTexts.empty();
auto majInsertResult = majTickTexts.insert( barDef.m_majTickText );
@@ -379,11 +423,15 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
int idx = 0;
for ( const auto& legendToBarPointsPair : legendToBarPointsMap )
{
addQwtBarChart( plot,
legendToBarPointsPair.second,
legendToBarPointsPair.first,
RiaColorTables::summaryCurveDefaultPaletteColors().cycledQColor( idx ),
barOrientation );
QColor legendColor = RiaColorTables::categoryPaletteColors().cycledQColor( idx );
auto legendColorPairIt = m_legendColors.find( legendToBarPointsPair.first );
if ( legendColorPairIt != m_legendColors.end() )
{
legendColor = legendColorPairIt->second;
}
addQwtBarChart( plot, legendToBarPointsPair.second, legendToBarPointsPair.first, legendColor, barOrientation );
idx++;
}

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

@@ -21,6 +21,7 @@
#include <QString>
#include <QVector>
#include <map>
#include <set>
class QwtPlot;
@@ -42,13 +43,12 @@ public:
const QString& barText,
const double value );
void addBarChartToPlot( QwtPlot* plot, Qt::Orientation orientation );
void setLegendColorMap( const std::map<QString, QColor>& legendColors );
void addBarChartToPlot( QwtPlot* plot, Qt::Orientation orientation, int maxBarCount = -1 );
private:
double midPoint( double v1, double v2 )
{
return v1 + 0.5 * ( v2 - 1.0 - v1 );
}
double midPoint( double v1, double v2 ) { return v1 + 0.5 * ( v2 - 1.0 - v1 ); }
void addQwtBarChart( QwtPlot* plot,
const QVector<QPointF>& posAndValue,
@@ -80,6 +80,7 @@ private:
bool operator<( const BarEntry& other ) const;
};
std::multiset<BarEntry> m_sortedBarEntries;
Qt::Orientation m_orientation;
std::multiset<BarEntry> m_sortedBarEntries;
Qt::Orientation m_orientation;
std::map<QString, QColor> m_legendColors;
};