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 Fixed missing spacing after groups without names

Browse Source
This commit is contained in:
Jacob Støren 2020-02-14 16:27:44 +01:00
parent a1410ca118
commit dd114b7928
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -322,6 +322,8 @@ void RimAnalysisPlot::onLoadDataAndUpdate()
{
RiuGroupedBarChartBuilder chartBuilder( Qt::Horizontal );
chartBuilder.addBarEntry( "T1_The_red_Fox", "", "", std::numeric_limits<double>::infinity(), "R1", 0.4 );
chartBuilder.addBarEntry( "T1_The_red_Fox", "", "", std::numeric_limits<double>::infinity(), "R2", 0.45 );
chartBuilder.addBarEntry( "T1_The_red_Fox", "W1", "", std::numeric_limits<double>::infinity(), "R1", 0.5 );
chartBuilder.addBarEntry( "T1_The_red_Fox", "W1", "", std::numeric_limits<double>::infinity(), "R2", 0.55 );
chartBuilder.addBarEntry( "T1_The_red_Fox", "W3", "", std::numeric_limits<double>::infinity(), "R1", 0.7 );

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

@ -238,10 +238,9 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot )
double tickPos = midPoint( groupStartPos, currentBarPosition );
QwtScaleDiv::TickType ttyp = &groupTickPosList == &majTickPoss
? QwtScaleDiv::MajorTick
: &groupTickPosList == &midTickPoss ? QwtScaleDiv::MediumTick
: QwtScaleDiv::MinorTick;
QwtScaleDiv::TickType ttyp = (&groupTickPosList == &majTickPoss ) ? QwtScaleDiv::MajorTick
: ( &groupTickPosList == &midTickPoss ) ? QwtScaleDiv::MediumTick
: QwtScaleDiv::MinorTick;
// Make sure we do not get ticks of different level exactly at the same spot,
// so that the drawing is able to distinguish
@ -257,9 +256,10 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot )
for ( const BarEntry& barDef : m_sortedBarEntries )
{
bool hasAnyMajTics = !majTickTexts.empty();
auto majInsertResult = majTickTexts.insert( barDef.m_majTickText );
bool isStartingNewMajGroup = majInsertResult.second;
bool isFinishingMajGroup = isStartingNewMajGroup && !previousMajText.isEmpty();
bool isFinishingMajGroup = isStartingNewMajGroup && hasAnyMajTics;
if ( isFinishingMajGroup )
{
@ -284,9 +284,10 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot )
currentMinGroupStartPos = currentBarPosition;
}
bool hasAnyMidTics = !midTickTexts.empty();
auto midInsertResult = midTickTexts.insert( barDef.m_midTickText );
bool isStartingNewMidGroup = midInsertResult.second;
bool isFinishingMidGroup = isStartingNewMidGroup && !previousMidText.isEmpty();
bool isFinishingMidGroup = isStartingNewMidGroup && hasAnyMidTics;
if ( isFinishingMidGroup )
{
@ -307,9 +308,10 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot )
currentMinGroupStartPos = currentBarPosition;
}
bool hasAnyMinTics = !minTickTexts.empty();
auto minInsertResult = minTickTexts.insert( barDef.m_minTickText );
bool isStartingNewMinGroup = minInsertResult.second;
bool isFinishingMinGroup = minInsertResult.second && !previousMinText.isEmpty();
bool isFinishingMinGroup = minInsertResult.second && hasAnyMinTics;
if ( isFinishingMinGroup )
{