File tree Expand file tree Collapse file tree 6 files changed +15
-8
lines changed
Expand file tree Collapse file tree 6 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,9 @@ struct Bools
1919 return boolArr.data () + 1 + static_cast <bool >(max);
2020 }
2121};
22+
23+ template <class T > Bools (T) -> Bools<T>;
24+
2225}
2326
2427#endif
Original file line number Diff line number Diff line change @@ -222,7 +222,7 @@ std::optional<Options::MarkerInfoId> Options::getMarkerInfoId(
222222Options::MarkerInfoId Options::generateMarkerInfoId ()
223223{
224224 static std::atomic<MarkerInfoId> nextMarkerInfoId{1 };
225- return nextMarkerInfoId.fetch_add (1 , std::memory_order_relaxed );
225+ return nextMarkerInfoId.fetch_add (1 , std::memory_order_acq_rel );
226226}
227227
228228void Options::setAutoParameters ()
Original file line number Diff line number Diff line change @@ -195,7 +195,8 @@ void DrawAxes::drawTitle(Gen::ChannelId axisIndex) const
195195
196196 Geom::AffineTransform transform (posDir.begin , 1.0 , -posAngle);
197197
198- auto calcOrientation = [&size](const auto &orientation)
198+ auto calcOrientation =
199+ [&size](const Styles::AxisTitle::Orientation &orientation)
199200 {
200201 return Geom::Size{
201202 orientation
Original file line number Diff line number Diff line change 66namespace Vizzu ::Charts
77{
88
9- BubbleChart::BubbleChart (const std::vector<double > &sizes ,
9+ BubbleChart::BubbleChart (const std::vector<double > &circleAreas ,
1010 const Geom::Rect &rect)
1111{
12- markers.reserve (sizes .size ());
12+ markers.reserve (circleAreas .size ());
1313
14- for (auto j = 0U ; j < sizes.size (); ++j)
15- markers.emplace_back (j, std::sqrt (std::max (0.0 , sizes[j])));
14+ for (auto j = 0U ; j < circleAreas.size (); ++j)
15+ markers.emplace_back (j,
16+ std::sqrt (std::max (0.0 , circleAreas[j])));
1617
1718 std::sort (markers.begin (), markers.end (), SpecMarker::sizeOrder);
1819
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ class BubbleChart
1818
1919 Markers markers;
2020
21- explicit BubbleChart (const std::vector<double > &sizes ,
21+ explicit BubbleChart (const std::vector<double > &circleAreas ,
2222 const Geom::Rect &rect = Geom::Rect(Geom::Point{0 , 0 },
2323 Geom::Size{1 , 1 }));
2424
Original file line number Diff line number Diff line change @@ -16,7 +16,9 @@ struct SpecMarker
1616 double size;
1717 std::variant<Geom::Rect, Geom::Circle> shape;
1818
19- SpecMarker (size_t index, double size) : index(index), size(size)
19+ SpecMarker (size_t index, double radiusOrAreaFactor) :
20+ index (index),
21+ size (radiusOrAreaFactor)
2022 {}
2123
2224 template <typename ... T> void emplaceCircle (T &&...params)
You can’t perform that action at this time.
0 commit comments