Skip to content

Commit fe9e9c0

Browse files
committed
clang-tidy + fix tests
1 parent 0f0ec17 commit fe9e9c0

File tree

10 files changed

+45
-35
lines changed

10 files changed

+45
-35
lines changed

src/base/math/renard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Renard
1818
[[nodiscard]] double floor(double value) const;
1919

2020
private:
21-
std::span<const double> numbers;
21+
std::span<const double> numbers{};
2222
};
2323

2424
}

src/chart/generator/axis.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#include "axis.h"
22

3-
#include <__compare/compare_three_way.h>
43
#include <algorithm>
54
#include <cmath>
65
#include <compare>
76
#include <cstddef>
87
#include <cstdint>
9-
#include <functional>
108
#include <limits>
119
#include <memory>
1210
#include <optional>
1311
#include <string>
1412
#include <string_view>
1513
#include <tuple>
1614
#include <utility>
15+
#include <vector>
1716

1817
#include "base/alg/merge.h"
1918
#include "base/anim/interpolated.h"
@@ -338,9 +337,6 @@ DimensionAxis interpolate(const DimensionAxis &op0,
338337
const Val &rhs,
339338
const Val::first_type *key = nullptr) -> Val
340339
{
341-
printf("%s to %s\n",
342-
DimensionAxis::mergedLabels(lhs.first).c_str(),
343-
DimensionAxis::mergedLabels(rhs.first).c_str());
344340
return {key ? *key : lhs.first,
345341
interpolate(lhs.second, rhs.second, factor)};
346342
};

src/chart/generator/axis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ struct DimensionAxis
188188
[[nodiscard]] static std::string mergedLabels(
189189
const std::vector<Data::SliceIndex> &slices)
190190
{
191-
return {std::from_range,
191+
return std::ranges::to<std::string>(
192192
std::views::transform(slices,
193193
[](const Data::SliceIndex &slice)
194194
{
195195
return ", " + slice.*which;
196196
})
197-
| std::views::join | std::views::drop(2)};
197+
| std::views::join | std::views::drop(2));
198198
}
199199

200200
private:

src/chart/generator/plotbuilder.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -462,14 +462,14 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
462462
if (auto &&series = plot->getOptions()->labelSeries(type);
463463
!series.empty() && isAutoTitle
464464
&& calcLegend.dimension.empty())
465-
calcLegend.title = std::string{std::from_range,
465+
calcLegend.title = std::ranges::to<std::string>(
466466
series
467-
| std::views::transform(
468-
[](const Data::SeriesIndex &series)
469-
{
470-
return ", " + series.getColIndex();
471-
})
472-
| std::views::join | std::views::drop(2)};
467+
| std::views::transform(
468+
[](const Data::SeriesIndex &series)
469+
{
470+
return ", " + series.getColIndex();
471+
})
472+
| std::views::join | std::views::drop(2));
473473
}
474474
}
475475

@@ -571,14 +571,14 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable,
571571
if (auto &&series = plot->getOptions()->labelSeries(type);
572572
!axis.dimension.setLabels(axisProps.step.getValue(1.0))
573573
&& !series.empty() && isAutoTitle)
574-
axis.title = std::string{std::from_range,
574+
axis.title = std::ranges::to<std::string>(
575575
series
576-
| std::views::transform(
577-
[](const Data::SeriesIndex &series)
578-
{
579-
return ", " + series.getColIndex();
580-
})
581-
| std::views::join | std::views::drop(2)};
576+
| std::views::transform(
577+
[](const Data::SeriesIndex &series)
578+
{
579+
return ", " + series.getColIndex();
580+
})
581+
| std::views::join | std::views::drop(2));
582582
for (std::uint32_t pos{};
583583
DimensionAxis::Item & i : axis.dimension.sortedItems())
584584
i.endPos = i.startPos =

src/chart/options/channel.h

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,28 @@ struct Channel
195195
[[nodiscard]] auto operator<=>(
196196
const LabelLevelList &) const = default;
197197

198-
LabelLevelList(std::size_t one) : levels{one} {}
199-
template <class T> LabelLevelList(T &&) = delete;
198+
explicit LabelLevelList(std::size_t one) : levels{one} {}
199+
LabelLevelList(const LabelLevelList &) = default;
200+
LabelLevelList(LabelLevelList &&) noexcept = default;
201+
LabelLevelList &operator=(const LabelLevelList &) = default;
202+
LabelLevelList &operator=(
203+
LabelLevelList &&) noexcept = default;
204+
205+
template <class T>
206+
requires(!std::is_same_v<std::remove_cvref_t<T>,
207+
LabelLevelList>)
208+
// NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward)
209+
explicit LabelLevelList(T &&) = delete;
200210

201211
explicit LabelLevelList(std::vector<std::size_t> &&levels) :
202212
levels(std::move(levels))
203213
{}
204214

205215
static LabelLevelList fromString(const std::string &str)
206216
{
207-
return LabelLevelList{{std::from_range,
208-
std::string_view{str} | std::views::split(',')
217+
return LabelLevelList{
218+
std::ranges::to<std::vector<std::size_t>>(
219+
std::string_view{str} | std::views::split(',')
209220
| std::views::transform(
210221
[](const auto &s)
211222
{
@@ -222,7 +233,7 @@ struct Channel
222233
range.end(),
223234
ix);
224235
return ix;
225-
})}};
236+
}))};
226237
}
227238

228239
[[nodiscard]] std::string toString() const

src/chart/options/options.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
#include "options.h"
33

4+
#include <algorithm>
45
#include <atomic>
56
#include <cstddef>
67
#include <iterator>

src/chart/options/options.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ class Options : public OptionProperties
107107
}
108108
else if (!lll && !hasMeasure && ch.dimensions().size() > 1
109109
&& channel == legend.get().getValueOrAuto()) {
110-
lll.emplace(
111-
Channel::LabelLevelList{std::vector{std::from_range,
110+
lll.emplace(Channel::LabelLevelList{
111+
std::ranges::to<std::vector<std::size_t>>(
112112
std::views::iota(std::size_t{},
113-
ch.dimensions().size())}});
113+
ch.dimensions().size()))});
114114
}
115115
else if (!lll) {
116116
lll.emplace(std::size_t{0});
@@ -159,7 +159,9 @@ class Options : public OptionProperties
159159
}
160160
if (auto &&measure = ch.measure();
161161
measure
162-
&& ch.labelLevel.getValue(std::size_t{}).levels
162+
&& ch.labelLevel
163+
.getValue(Channel::LabelLevelList{size_t{}})
164+
.levels
163165
== std::vector{std::size_t{}})
164166
return {*measure};
165167
return {};

src/chart/rendering/drawaxes.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "chart/main/events.h"
2929
#include "chart/main/style.h"
3030
#include "chart/options/channel.h"
31-
#include "dataframe/old/types.h"
3231

3332
#include "drawguides.h"
3433
#include "drawinterlacing.h"

src/chart/rendering/drawlegend.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <functional>
88
#include <string>
99
#include <utility>
10+
#include <vector>
1011

1112
#include "base/anim/interpolated.h"
1213
#include "base/geom/affinetransform.h"

test/e2e/test_cases/test_cases.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"refs": ["bc224eb"]
5757
},
5858
"basic_animations/legend_transitions/color_2discrete_anim": {
59-
"refs": ["86f503c"]
59+
"refs": ["71a45d2"]
6060
},
6161
"basic_animations/legend_transitions/color_conti_anim": {
6262
"refs": ["106245c"]
@@ -80,7 +80,7 @@
8080
"refs": ["0617129"]
8181
},
8282
"basic_animations/legend_transitions/lightness_2discrete_anim": {
83-
"refs": ["3e29b58"]
83+
"refs": ["f818429"]
8484
},
8585
"basic_animations/legend_transitions/lightness_conti_anim": {
8686
"refs": ["e65d2ff"]
@@ -299,7 +299,7 @@
299299
"refs": ["b627ce9"]
300300
},
301301
"operations/orientation_tutorial_data/line_orientation": {
302-
"refs": ["dc9ac6c"]
302+
"refs": ["156df8d"]
303303
},
304304
"operations/orientation_tutorial_data/rectangle_orientation": {
305305
"refs": ["a97572f"]

0 commit comments

Comments
 (0)