fix clang-tidy + review fix

schaumb · schaumb · commit 71a61fb2dcb4 · 2024-11-25T17:57:13.000+01:00
diff --git a/src/base/type/physicalvalue.h b/src/base/type/physicalvalue.h
@@ -17,13 +17,14 @@ template <typename Value, Refl::is_enum Unit> struct PhysicalValue
 	constexpr bool operator==(const PhysicalValue &) const = default;
 
 	template <std::same_as<double> = Value>
-	static PhysicalValue fromString(const std::string &str)
+	[[nodiscard]] static PhysicalValue fromString(
+	    const std::string &str)
 	{
 		const Text::ValueUnit vu{str};
 		return {vu.getValue(), Refl::get_enum<Unit>(vu.getUnit())};
 	}
 
-	std::string toString() const
+	[[nodiscard]] std::string toString() const
 	{
 		return Conv::toString(value)
 		     + std::string{Conv::toString(unit)};
diff --git a/src/chart/generator/axis.h b/src/chart/generator/axis.h
@@ -29,7 +29,7 @@ struct ChannelStats
 	template <ChannelIdLike T>
 	[[nodiscard]] const TrackType &at(const T &id) const
 	{
-		return tracked[-id];
+		return tracked[+id];
 	}
 
 	void track(ChannelId at, const Data::MarkerId &id)
@@ -47,7 +47,7 @@ struct ChannelStats
 	template <ChannelIdLike Id>
 	void setIfRange(Id at, const Math::Range<> &range)
 	{
-		if (auto *r = std::get_if<0>(&tracked[-at])) *r = range;
+		if (auto *r = std::get_if<0>(&tracked[+at])) *r = range;
 	}
 };
 
diff --git a/src/chart/generator/marker.cpp b/src/chart/generator/marker.cpp
@@ -31,10 +31,10 @@ Marker::Marker(const Options &options,
     bool needMarkerInfo) :
     cellInfo(data.cellInfo(index, needMarkerInfo)),
     mainId(data.getId(mainAxisList,
-        options.dimLabelIndex(-options.mainAxisType()),
+        options.dimLabelIndex(+options.mainAxisType()),
         index)),
     subId(data.getId(subAxisList,
-        options.dimLabelIndex(-options.subAxisType()),
+        options.dimLabelIndex(+options.subAxisType()),
         index)),
     sizeId(data.getId(
         options.getChannels().at(ChannelId::size).dimensions(),
@@ -76,7 +76,7 @@ Marker::Marker(const Options &options,
 	if (subAxisList != options.subAxis().dimensions())
 		subId.label =
 		    data.getId(options.subAxis().dimensions(),
-		            options.dimLabelIndex(-options.subAxisType()),
+		            options.dimLabelIndex(+options.subAxisType()),
 		            index)
 		        .label;
 
@@ -223,14 +223,14 @@ void Marker::fromRectangle(const Geom::Rect &rect)
 
 Math::Range<> Marker::getSizeBy(AxisId axisId) const
 {
-	return isHorizontal(+axisId) ? toRectangle().hSize()
-	                             : toRectangle().vSize();
+	return isHorizontal(++axisId) ? toRectangle().hSize()
+	                              : toRectangle().vSize();
 }
 
 void Marker::setSizeBy(AxisId axisId, const Math::Range<> range)
 {
 	auto rect = toRectangle();
-	if (isHorizontal(+axisId))
+	if (isHorizontal(++axisId))
 		rect.setHSize(range);
 	else
 		rect.setVSize(range);
diff --git a/src/chart/generator/plotbuilder.cpp b/src/chart/generator/plotbuilder.cpp
@@ -206,8 +206,8 @@ bool PlotBuilder::linkMarkers(const Buckets &buckets,
 	    std::numeric_limits<double>::lowest());
 
 	auto isAggregatable =
-	    !plot->getOptions()->isMeasure(-axisIndex)
-	    || (isMain && plot->getOptions()->isMeasure(-!axisIndex)
+	    !plot->getOptions()->isMeasure(+axisIndex)
+	    || (isMain && plot->getOptions()->isMeasure(+!axisIndex)
 	        && plot->getOptions()->geometry.get()
 	               == ShapeType::rectangle);
 
@@ -228,7 +228,7 @@ bool PlotBuilder::linkMarkers(const Buckets &buckets,
 				auto &marker = **it.base().base().base();
 				if (!marker.enabled) continue;
 				o = std::max(o,
-				    marker.size.getCoord(+axisIndex),
+				    marker.size.getCoord(++axisIndex),
 				    Math::Floating::less);
 			}
 			if (o == std::numeric_limits<double>::lowest()) o = 0.0;
@@ -274,7 +274,7 @@ bool PlotBuilder::linkMarkers(const Buckets &buckets,
 			                 : *it.base().base().base();
 
 			if (act)
-				prevPos = act->position.getCoord(+axisIndex) +=
+				prevPos = act->position.getCoord(++axisIndex) +=
 				    isAggregatable ? dimOffset[i] : prevPos;
 
 			hasConnection |=
@@ -350,7 +350,7 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
 		if (scale.title) calcLegend.title = *scale.title;
 
 		if (auto &&meas = scale.measure()) {
-			if (plot->getOptions()->isMeasure(-type)) {
+			if (plot->getOptions()->isMeasure(+type)) {
 				if (isAutoTitle)
 					calcLegend.title = dataCube.getName(*meas);
 				calcLegend.measure = {std::get<0>(stats.at(type)),
@@ -364,7 +364,7 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
 			auto merge =
 			    type == LegendId::size
 			    || (type == LegendId::lightness
-			        && plot->getOptions()->dimLabelIndex(-type) == 0);
+			        && plot->getOptions()->dimLabelIndex(+type) == 0);
 			for (std::uint32_t i{}, count{}; i < indices.size(); ++i)
 				if (const auto &sliceIndex = indices[i]) {
 					auto rangeId = static_cast<double>(i);
@@ -412,7 +412,7 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable,
 	auto isAutoTitle = scale.title.isAuto();
 	if (scale.title) axis.title = *scale.title;
 
-	if (plot->getOptions()->isMeasure(-type)) {
+	if (plot->getOptions()->isMeasure(+type)) {
 		const auto &meas = *scale.measure();
 		if (isAutoTitle) axis.title = dataCube.getName(meas);
 
@@ -431,7 +431,7 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable,
 	}
 	else {
 		for (auto merge =
-		         plot->getOptions()->dimLabelIndex(-type) == 0
+		         plot->getOptions()->dimLabelIndex(+type) == 0
 		         && (type != plot->getOptions()->mainAxisType()
 		             || plot->getOptions()->sort != Sort::byValue
 		             || scale.dimensions().size() == 1);
diff --git a/src/chart/main/stylesheet.cpp b/src/chart/main/stylesheet.cpp
@@ -92,7 +92,7 @@ void Sheet::setPlot()
 		defaultParams.plot.paddingLeft =
 		    Gfx::Length::Emphemeral(45.0 / 12.0);
 	}
-	else if (!options->isMeasure(-options->getVerticalChannel())) {
+	else if (!options->isMeasure(+options->getVerticalChannel())) {
 		defaultParams.plot.paddingLeft =
 		    Gfx::Length::Emphemeral(80.0 / 12.0);
 	}
@@ -146,18 +146,18 @@ void Sheet::setMarkers()
 	else {
 		auto sizeMeasure = options->isMeasure(Gen::ChannelId::size);
 		auto mainMeasure =
-		    options->isMeasure(-options->mainAxisType());
-		auto subMeasure = options->isMeasure(-options->subAxisType());
+		    options->isMeasure(+options->mainAxisType());
+		auto subMeasure = options->isMeasure(+options->subAxisType());
 		if (options->geometry == Gen::ShapeType::circle && sizeMeasure
 		    && (mainMeasure || subMeasure)) {
 			defaultParams.plot.marker.borderWidth = 1;
 			defaultParams.plot.marker.fillOpacity = 0.8;
 		}
 		else if (options->geometry == Gen::ShapeType::rectangle) {
 			auto vIsMeasure =
-			    options->isMeasure(-options->getVerticalChannel());
+			    options->isMeasure(+options->getVerticalChannel());
 			auto hIsMeasure =
-			    options->isMeasure(-options->getHorizontalChannel());
+			    options->isMeasure(+options->getHorizontalChannel());
 			if (auto polar = options->coordSystem.get()
 			              == Gen::CoordSystem::polar;
 			    polar && options->getVerticalAxis().isEmpty())
diff --git a/src/chart/options/channel.h b/src/chart/options/channel.h
@@ -63,7 +63,7 @@ static_assert(std::ranges::all_of(Refl::enum_names<LegendId>,
 	            Refl::get_enum<ChannelId>(name));
     }));
 
-[[nodiscard]] constexpr Geom::Orientation operator+(
+[[nodiscard]] constexpr Geom::Orientation operator++(
     const AxisId &axis)
 {
 	return axis == AxisId::x ? Geom::Orientation::horizontal
@@ -170,28 +170,28 @@ class Channel
 	Base::AutoParam<double> step{};
 };
 
-[[nodiscard]] constexpr ChannelId operator-(const AxisId &axis)
+[[nodiscard]] constexpr ChannelId operator+(const AxisId &axis)
 {
 	return static_cast<ChannelId>(axis);
 }
 
-[[nodiscard]] constexpr ChannelId operator-(const LegendId &legend)
+[[nodiscard]] constexpr ChannelId operator+(const LegendId &legend)
 {
 	return static_cast<ChannelId>(legend);
 }
 
 template <class T>
 concept ChannelIdLike = requires(const T &v) {
 	{
-		-v
+		+v
 	} -> std::same_as<ChannelId>;
 };
 
 template <ChannelIdLike T>
 [[nodiscard]] constexpr bool operator==(const T &l,
     const ChannelId &c)
 {
-	return -l == c;
+	return +l == c;
 }
 
 template <ChannelIdLike T, ChannelIdLike U>
diff --git a/src/chart/options/channels.h b/src/chart/options/channels.h
@@ -29,12 +29,12 @@ struct Channels : Refl::EnumArray<ChannelId, Channel>
 	template <ChannelIdLike T>
 	[[nodiscard]] const Channel &at(const T &id) const
 	{
-		return at(-id);
+		return at(+id);
 	}
 
 	template <ChannelIdLike T> [[nodiscard]] Channel &at(const T &id)
 	{
-		return at(-id);
+		return at(+id);
 	}
 
 	void removeSeries(const Data::SeriesIndex &index);
diff --git a/src/chart/options/options.cpp b/src/chart/options/options.cpp
@@ -74,7 +74,7 @@ ChannelId Options::stackChannelType() const
 	if (channels.anyAxisSet()) {
 		switch (geometry.get()) {
 		case ShapeType::area:
-		case ShapeType::rectangle: return -subAxisType();
+		case ShapeType::rectangle: return +subAxisType();
 		default:
 		case ShapeType::circle:
 		case ShapeType::line: return ChannelId::size;
@@ -86,7 +86,7 @@ ChannelId Options::stackChannelType() const
 std::optional<ChannelId> Options::secondaryStackType() const
 {
 	if (channels.anyAxisSet() && geometry == ShapeType::line)
-		return -subAxisType();
+		return +subAxisType();
 
 	return std::nullopt;
 }
diff --git a/src/chart/options/options.h b/src/chart/options/options.h
@@ -121,7 +121,7 @@ class Options : public OptionProperties
 	    IdType channel) const
 	{
 		auto &&ch = channels.at(channel);
-		if (auto dimIndex = dimLabelIndex(-channel))
+		if (auto dimIndex = dimLabelIndex(+channel))
 			return *std::next(ch.set.dimensionIds.begin(),
 			    static_cast<std::intptr_t>(*dimIndex));
 		return ch.labelLevel.getValue(0) == 0 ? ch.measure()
diff --git a/src/chart/rendering/drawaxes.cpp b/src/chart/rendering/drawaxes.cpp
@@ -145,7 +145,7 @@ void DrawAxes::generateMeasure(Gen::AxisId axisIndex,
     double stepSize,
     double weight)
 {
-	auto orientation = !+axisIndex;
+	auto orientation = ++!axisIndex;
 	const auto &meas = getAxis(axisIndex).measure;
 	auto rangeSize = meas.range.size();
 	auto singleLabelRange = Math::Floating::is_zero(rangeSize);
@@ -213,9 +213,9 @@ void DrawAxes::generateMeasure(Gen::AxisId axisIndex,
 
 Geom::Line DrawAxes::getAxisLine(Gen::AxisId axisIndex) const
 {
-	auto offset = this->origo().getCoord(+!axisIndex);
+	auto offset = this->origo().getCoord(++!axisIndex);
 
-	auto direction = Geom::Point::Ident(+axisIndex);
+	auto direction = Geom::Point::Ident(++axisIndex);
 
 	auto p0 = direction.flip() * offset;
 	auto p1 = p0 + direction;
@@ -266,7 +266,9 @@ Geom::Point DrawAxes::getTitleBasePos(Gen::AxisId axisIndex,
 	default:
 	case Pos::min_edge: break;
 	case Pos::max_edge: orthogonal = 1.0; break;
-	case Pos::axis: orthogonal = origo().getCoord(+!axisIndex); break;
+	case Pos::axis:
+		orthogonal = origo().getCoord(++!axisIndex);
+		break;
 	}
 
 	double parallel{0.0};
@@ -440,7 +442,7 @@ void DrawAxes::drawDimensionLabel(Gen::AxisId axisIndex,
     double weight) const
 {
 	if (weight == 0) return;
-	auto orientation = +axisIndex;
+	auto orientation = ++axisIndex;
 
 	const auto &labelStyle = rootStyle.plot.getAxis(axisIndex).label;
 
diff --git a/src/chart/rendering/drawguides.cpp b/src/chart/rendering/drawguides.cpp
@@ -42,8 +42,8 @@ void DrawGuides::drawGuide(Gen::AxisId axisId,
 {
 	auto eventTarget = Events::Targets::axisGuide(axisId);
 
-	auto ident = Geom::Point::Ident(+axisId);
-	auto normal = Geom::Point::Ident(!+axisId);
+	auto ident = Geom::Point::Ident(++axisId);
+	auto normal = Geom::Point::Ident(++!axisId);
 	auto relMax = ident * val;
 
 	parent.canvas.setLineColor(color);
diff --git a/src/chart/rendering/drawinterlacing.cpp b/src/chart/rendering/drawinterlacing.cpp
@@ -65,7 +65,7 @@ void DrawInterlacing::drawGeometries(Gen::AxisId axisIndex) const
 				        othGuides.interlacings);
 		}
 
-	auto orientation = !+axisIndex;
+	auto orientation = ++!axisIndex;
 
 	parent.painter.setPolygonToCircleFactor(0);
 	parent.painter.setPolygonStraightFactor(0);
@@ -143,7 +143,7 @@ void DrawInterlacing::drawGeometries(Gen::AxisId axisIndex) const
 void DrawInterlacing::drawTexts(Gen::AxisId axisIndex) const
 {
 	const auto &axis = parent.getAxis(axisIndex).measure;
-	auto orientation = !+axisIndex;
+	auto orientation = ++!axisIndex;
 	auto origo = parent.origo().getCoord(orientation);
 	const auto &guides = parent.plot->guides.at(axisIndex);
 	const auto &axisStyle = parent.rootStyle.plot.getAxis(axisIndex);
@@ -212,7 +212,7 @@ void DrawInterlacing::drawDataLabel(
     const ::Anim::String &unit,
     double alpha) const
 {
-	auto orientation = !+axisIndex;
+	auto orientation = ++!axisIndex;
 	const auto &labelStyle =
 	    parent.rootStyle.plot.getAxis(axisIndex).label;
 
@@ -287,7 +287,7 @@ void DrawInterlacing::drawSticks(double tickLength,
 	            parent.coordSys
 	                .convertDirectionAt({tickPos,
 	                    tickPos
-	                        + Geom::Point::Coord(!+axisIndex, -1.0)})
+	                        + Geom::Point::Coord(++!axisIndex, -1.0)})
 	                .segment(0, tickLength)](const auto &position)
 	    {
 		    switch (position) {

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,14 @@ template <typename Value, Refl::is_enum Unit> struct PhysicalValue`
`17`	`17`	`constexpr bool operator==(const PhysicalValue &) const = default;`
`18`	`18`
`19`	`19`	`template <std::same_as<double> = Value>`
`20`		`- static PhysicalValue fromString(const std::string &str)`
	`20`	`+ [[nodiscard]] static PhysicalValue fromString(`
	`21`	`+ const std::string &str)`
`21`	`22`	`{`
`22`	`23`	`const Text::ValueUnit vu{str};`
`23`	`24`	`return {vu.getValue(), Refl::get_enum<Unit>(vu.getUnit())};`
`24`	`25`	`}`
`25`	`26`
`26`		`- std::string toString() const`
	`27`	`+ [[nodiscard]] std::string toString() const`
`27`	`28`	`{`
`28`	`29`	`return Conv::toString(value)`
`29`	`30`	`+ std::string{Conv::toString(unit)};`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ struct ChannelStats`
`29`	`29`	`template <ChannelIdLike T>`
`30`	`30`	`[[nodiscard]] const TrackType &at(const T &id) const`
`31`	`31`	`{`
`32`		`- return tracked[-id];`
	`32`	`+ return tracked[+id];`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`void track(ChannelId at, const Data::MarkerId &id)`
`@@ -47,7 +47,7 @@ struct ChannelStats`
`47`	`47`	`template <ChannelIdLike Id>`
`48`	`48`	`void setIfRange(Id at, const Math::Range<> &range)`
`49`	`49`	`{`
`50`		`- if (auto r = std::get_if<0>(&tracked[-at])) r = range;`
	`50`	`+ if (auto r = std::get_if<0>(&tracked[+at])) r = range;`
`51`	`51`	`}`
`52`	`52`	`};`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static_assert(std::ranges::all_of(Refl::enum_names<LegendId>,`
`63`	`63`	`Refl::get_enum<ChannelId>(name));`
`64`	`64`	`}));`
`65`	`65`
`66`		`-[[nodiscard]] constexpr Geom::Orientation operator+(`
	`66`	`+[[nodiscard]] constexpr Geom::Orientation operator++(`
`67`	`67`	`const AxisId &axis)`
`68`	`68`	`{`
`69`	`69`	`return axis == AxisId::x ? Geom::Orientation::horizontal`
`@@ -170,28 +170,28 @@ class Channel`
`170`	`170`	`Base::AutoParam<double> step{};`
`171`	`171`	`};`
`172`	`172`
`173`		`-[[nodiscard]] constexpr ChannelId operator-(const AxisId &axis)`
	`173`	`+[[nodiscard]] constexpr ChannelId operator+(const AxisId &axis)`
`174`	`174`	`{`
`175`	`175`	`return static_cast<ChannelId>(axis);`
`176`	`176`	`}`
`177`	`177`
`178`		`-[[nodiscard]] constexpr ChannelId operator-(const LegendId &legend)`
	`178`	`+[[nodiscard]] constexpr ChannelId operator+(const LegendId &legend)`
`179`	`179`	`{`
`180`	`180`	`return static_cast<ChannelId>(legend);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`template <class T>`
`184`	`184`	`concept ChannelIdLike = requires(const T &v) {`
`185`	`185`	`{`
`186`		`- -v`
	`186`	`+ +v`
`187`	`187`	`} -> std::same_as<ChannelId>;`
`188`	`188`	`};`
`189`	`189`
`190`	`190`	`template <ChannelIdLike T>`
`191`	`191`	`[[nodiscard]] constexpr bool operator==(const T &l,`
`192`	`192`	`const ChannelId &c)`
`193`	`193`	`{`
`194`		`- return -l == c;`
	`194`	`+ return +l == c;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`template <ChannelIdLike T, ChannelIdLike U>`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ struct Channels : Refl::EnumArray<ChannelId, Channel>`
`29`	`29`	`template <ChannelIdLike T>`
`30`	`30`	`[[nodiscard]] const Channel &at(const T &id) const`
`31`	`31`	`{`
`32`		`- return at(-id);`
	`32`	`+ return at(+id);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`template <ChannelIdLike T> [[nodiscard]] Channel &at(const T &id)`
`36`	`36`	`{`
`37`		`- return at(-id);`
	`37`	`+ return at(+id);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`void removeSeries(const Data::SeriesIndex &index);`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class Options : public OptionProperties`
`121`	`121`	`IdType channel) const`
`122`	`122`	`{`
`123`	`123`	`auto &&ch = channels.at(channel);`
`124`		`- if (auto dimIndex = dimLabelIndex(-channel))`
	`124`	`+ if (auto dimIndex = dimLabelIndex(+channel))`
`125`	`125`	`return *std::next(ch.set.dimensionIds.begin(),`
`126`	`126`	`static_cast<std::intptr_t>(*dimIndex));`
`127`	`127`	`return ch.labelLevel.getValue(0) == 0 ? ch.measure()`