Skip to content

Commit

Permalink
Improvements for bar groups
Browse files Browse the repository at this point in the history 
Don't overly adjust scaling axis.
Prevent group bar from going outside of the plotting area.
  • Loading branch information
@Blake-Madden
Blake-Madden committed Oct 15, 2023
1 parent 1448b62 commit cda8055
Showing 1 changed file with 61 additions and 31 deletions.
92 changes: 61 additions & 31 deletions src/graphs/barchart.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,8 @@ namespace Wisteria::Graphs
{
for (const auto& bar : GetBars())
{ UpdateScalingAxisFromBar(bar); }
const auto originalLongestBar{ m_longestBarLength };
double longestGroupBarWithSubBars{ 0 };
for (const auto& barGroup : m_barGroups)
{
double groupBarLength{ 0 };
Expand All @@ -370,17 +372,24 @@ namespace Wisteria::Graphs
groupBarLength += barEnd;
}
m_longestBarLength = std::max(m_longestBarLength, longestSubBarLength + groupBarLength);
longestGroupBarWithSubBars =
std::max(longestGroupBarWithSubBars, longestSubBarLength + groupBarLength);
}
// Add a couple of extra intervals for the connection braces
// (it will consume one, but add some wiggle room) and extra space if bin labels are included.
// AdjustScalingAxisFromBarLength() will add an extra interval for the bin label on the longest
// regular bar, but we will be including another bin label on the group bar also.
const auto extraIntervalsNeeded = ((GetBinLabelDisplay() != BinLabelDisplay::NoDisplay) ? 3 : 2);
if (GetScalingAxis().GetRange().second <
(m_longestBarLength + (GetScalingAxis().GetInterval() * extraIntervalsNeeded)))
// If a group of bars with a supergroup bar (with connection braces) are larger
// than the tallest regular bar, then we need to adjust the intervals.
if (originalLongestBar < (longestGroupBarWithSubBars + GetScalingAxis().GetInterval()))
{
AdjustScalingAxisFromBarLength(m_longestBarLength +
(GetScalingAxis().GetInterval() * extraIntervalsNeeded));
// Add an extra interval for the connection braces
// (it will consume one) and extra space if bin labels are included.
// AdjustScalingAxisFromBarLength() will add an extra interval for the bin label on the longest
// regular bar, but we will be including another bin label on the group bar also.
const auto extraIntervalsNeeded = ((GetBinLabelDisplay() != BinLabelDisplay::NoDisplay) ? 2 : 1);
if (GetScalingAxis().GetRange().second <
(m_longestBarLength + (GetScalingAxis().GetInterval() * extraIntervalsNeeded)))
{
AdjustScalingAxisFromBarLength(m_longestBarLength +
(GetScalingAxis().GetInterval() * extraIntervalsNeeded));
}
}
}

Expand Down Expand Up @@ -1832,7 +1841,7 @@ namespace Wisteria::Graphs
if (grandTotal == 0)
{ continue; }

const double bracesWidth{ DownscaleFromScreenAndCanvas(GetScalingAxis().GetIntervalPhysicalLength()) };
double bracesWidth{ DownscaleFromScreenAndCanvas(GetScalingAxis().GetIntervalPhysicalLength()) };
double scalingAxisPos{ 0 }, barAxisPos{ 0 };
if (GetBarOrientation() == Orientation::Horizontal)
{
Expand Down Expand Up @@ -1864,16 +1873,6 @@ namespace Wisteria::Graphs
safe_divide<double>(
GetBars()[barGroup.m_barPositions.second].GetCustomWidth().
value_or(barWidth), 2);
const auto braces = std::make_shared<Shape>(
GraphItemInfo().Pen(wxPen(*wxBLACK, 2)).
Scaling(GetScaling()).DPIScaling(GetDPIScaleFactor()).
AnchorPoint(wxPoint(
brackStartXPos,
std::min(brackPos1.y, brackPos2.y) - yOffset)).
Anchoring(Anchoring::TopLeftCorner),
Icons::IconShape::RightCurlyBrace,
wxSize(bracesWidth, DownscaleFromScreenAndCanvas(barsWidth)),
nullptr);

const auto yPos = std::min(brackPos1.y, brackPos2.y) +
safe_divide<double>(std::abs(brackPos1.y - brackPos2.y), 2);
Expand All @@ -1893,9 +1892,30 @@ namespace Wisteria::Graphs
},
wxString{}, Label{}, GetBarEffect(), GetBarOpacity());
UpdateBarLabel(theBar);
// if the superbar is going outside of the plot area, then
// shove it back over and adjust the width of the bracket as well
if ((scalingAxisPos + grandTotal) > GetScalingAxis().GetRange().second)
{
scalingAxisPos -=
((scalingAxisPos + grandTotal) - GetScalingAxis().GetRange().second);
wxCoord newBracketRight{ 0 };
if (GetScalingAxis().GetPhysicalCoordinate(scalingAxisPos, newBracketRight))
{ bracesWidth = newBracketRight - brackStartXPos; }
}
theBar.SetCustomScalingAxisStartPosition(scalingAxisPos);
theBar.SetAxisPosition(barAxisPos);

const auto braces = std::make_shared<Shape>(
GraphItemInfo().Pen(wxPen(*wxBLACK, 2)).
Scaling(GetScaling()).DPIScaling(GetDPIScaleFactor()).
AnchorPoint(wxPoint(
brackStartXPos,
std::min(brackPos1.y, brackPos2.y) - yOffset)).
Anchoring(Anchoring::TopLeftCorner),
Icons::IconShape::RightCurlyBrace,
wxSize(bracesWidth, DownscaleFromScreenAndCanvas(barsWidth)),
nullptr);

AddObject(braces);
drawBar(theBar, false, 0);
// cppcheck-suppress knownEmptyContainer
Expand Down Expand Up @@ -1937,17 +1957,6 @@ namespace Wisteria::Graphs
GetBars()[barGroup.m_barPositions.second].GetCustomWidth().
value_or(barWidth), 2);

const auto braces = std::make_shared<Shape>(
GraphItemInfo().Pen(wxPen(*wxBLACK, 2)).
Scaling(GetScaling()).DPIScaling(GetDPIScaleFactor()).
AnchorPoint(wxPoint(
std::min(brackPos1.x, brackPos2.x) - xOffset,
brackStartYPos - ScaleToScreenAndCanvas(bracesWidth))).
Anchoring(Anchoring::TopLeftCorner),
Icons::IconShape::TopCurlyBrace,
wxSize(DownscaleFromScreenAndCanvas(barsWidth), bracesWidth),
nullptr);

const auto xPos = std::min(brackPos1.x, brackPos2.x) +
safe_divide<double>(std::abs(brackPos1.x - brackPos2.x), 2);
if (GetBarAxis().GetValueFromPhysicalCoordinate(xPos, barAxisPos))
Expand All @@ -1966,9 +1975,30 @@ namespace Wisteria::Graphs
},
wxString{}, Label{}, GetBarEffect(), GetBarOpacity());
UpdateBarLabel(theBar);
// if the superbar is going outside of the plot area, then
// shove it back down and adjust the height of the bracket as well
if ((scalingAxisPos + grandTotal) > GetScalingAxis().GetRange().second)
{
scalingAxisPos -=
((scalingAxisPos + grandTotal) - GetScalingAxis().GetRange().second);
wxCoord newBracketTop{ 0 };
if (GetScalingAxis().GetPhysicalCoordinate(scalingAxisPos, newBracketTop))
{ bracesWidth = brackStartYPos - newBracketTop; }
}
theBar.SetCustomScalingAxisStartPosition(scalingAxisPos);
theBar.SetAxisPosition(barAxisPos);

const auto braces = std::make_shared<Shape>(
GraphItemInfo().Pen(wxPen(*wxBLACK, 2)).
Scaling(GetScaling()).DPIScaling(GetDPIScaleFactor()).
AnchorPoint(wxPoint(
std::min(brackPos1.x, brackPos2.x) - xOffset,
brackStartYPos - ScaleToScreenAndCanvas(bracesWidth))).
Anchoring(Anchoring::TopLeftCorner),
Icons::IconShape::TopCurlyBrace,
wxSize(DownscaleFromScreenAndCanvas(barsWidth), bracesWidth),
nullptr);

AddObject(braces);
drawBar(theBar, false, 0);
// cppcheck-suppress knownEmptyContainer
Expand Down

0 comments on commit cda8055

Please sign in to comment.