Clang format

schaumb · schaumb · commit 3b494c15fbd4 · 2024-08-06T19:50:41.000+02:00
diff --git a/src/base/anim/interpolated.h b/src/base/anim/interpolated.h
@@ -230,8 +230,8 @@ template <typename Type> class Interpolated
 		    std::less<T>>;
 		return !has_second ? this->values[0].value
 		                   : std::min(this->values[0].value,
-		                       this->values[1].value,
-		                       Less{});
+		                         this->values[1].value,
+		                         Less{});
 	}
 
 	template <typename T = Type> [[nodiscard]] T max() const
@@ -241,8 +241,8 @@ template <typename Type> class Interpolated
 		    std::less<T>>;
 		return !has_second ? this->values[0].value
 		                   : std::max(this->values[0].value,
-		                       this->values[1].value,
-		                       Less{});
+		                         this->values[1].value,
+		                         Less{});
 	}
 };
 
diff --git a/src/base/conv/parse.h b/src/base/conv/parse.h
@@ -43,8 +43,7 @@ template <typename To> To parse(const std::string &string)
 		[]<bool flag = false>()
 		{
 			static_assert(flag, "no conversion from string");
-		}
-	();
+		}();
 }
 
 }
diff --git a/src/base/conv/tostring.h b/src/base/conv/tostring.h
@@ -47,8 +47,7 @@ std::string toString(const From &value)
 		[]<bool flag = false>()
 		{
 			static_assert(flag, "no string conversion");
-		}
-	();
+		}();
 }
 
 }
diff --git a/src/base/geom/circle.cpp b/src/base/geom/circle.cpp
@@ -34,8 +34,7 @@ bool Circle::overlaps(const Circle &c) const
 {
 	auto d = c.center - center;
 	auto sumRadius = radius + c.radius;
-	return Math::AddTolerance(d.sqrAbs())
-	     < sumRadius * sumRadius;
+	return Math::AddTolerance(d.sqrAbs()) < sumRadius * sumRadius;
 }
 
 Rect Circle::boundary() const
diff --git a/src/base/geom/line.h b/src/base/geom/line.h
@@ -61,8 +61,7 @@ struct Line
 
 	[[nodiscard]] double distance(const Point &point) const
 	{
-		if (isPoint())
-			return (point - begin).abs();
+		if (isPoint()) return (point - begin).abs();
 
 		auto projection = ((point - begin).dot(getDirection()))
 		                / (length() * length());
diff --git a/src/base/geom/quadrilateral.h b/src/base/geom/quadrilateral.h
@@ -22,7 +22,7 @@ class ConvexQuad
 	    double base0Length,
 	    double base1Length);
 
-	[[nodiscard]] double distance(const Point& point) const;
+	[[nodiscard]] double distance(const Point &point) const;
 };
 
 }
diff --git a/src/base/geom/triangle.h b/src/base/geom/triangle.h
@@ -15,7 +15,7 @@ class Triangle
 
 	[[nodiscard]] double area() const;
 
-	[[nodiscard]] double distance(const Point& point) const;
+	[[nodiscard]] double distance(const Point &point) const;
 };
 
 }
diff --git a/src/base/math/interpolation.h b/src/base/math/interpolation.h
@@ -8,8 +8,9 @@ namespace Math
 
 template <typename T>
     requires(!std::is_same_v<std::remove_cvref_t<T>, bool>)
-auto interpolate(const T &op0, const T &op1, double factor)
-    -> decltype(op0 * (1.0 - factor) + op1 * factor)
+auto interpolate(const T &op0,
+    const T &op1,
+    double factor) -> decltype(op0 * (1.0 - factor) + op1 * factor)
 {
 	if (factor <= 0.0) return op0;
 	if (factor >= 1.0) return op1;
diff --git a/src/base/refl/auto_struct.h b/src/base/refl/auto_struct.h
@@ -535,8 +535,8 @@ namespace Functors
 namespace Composite
 {
 template <class T, class U>
-constexpr inline auto operator>>(U &&arg, const T &)
-    -> decltype(T::get(std::forward<U &&>(arg)))
+constexpr inline auto operator>>(U &&arg,
+    const T &) -> decltype(T::get(std::forward<U &&>(arg)))
 {
 	return T::get(std::forward<U &&>(arg));
 }
diff --git a/src/base/style/impl.tpp b/src/base/style/impl.tpp
@@ -15,20 +15,22 @@ template <class T> T Sheet<T>::getFullParams() const
 
 template <class T> ParamRegistry<T>::ParamRegistry()
 {
-	Refl::visit<T>([this]<class U,
-	    class =
-	        std::enable_if_t<std::is_constructible_v<Accessor, U>>>(
-	    U && accessor,
-	    const std::initializer_list<std::string_view> &thePath = {}) {
-		std::string currentPath;
-		for (auto sv : thePath) {
-			if (!currentPath.empty()) currentPath += '.';
-			currentPath += sv;
-		}
+	Refl::visit<T>(
+	    [this]<class U,
+	        class = std::enable_if_t<
+	            std::is_constructible_v<Accessor, U>>>(U &&accessor,
+	        const std::initializer_list<std::string_view> &thePath =
+	            {})
+	    {
+		    std::string currentPath;
+		    for (auto sv : thePath) {
+			    if (!currentPath.empty()) currentPath += '.';
+			    currentPath += sv;
+		    }
 
-		accessors.try_emplace(std::move(currentPath),
-		    std::forward<U>(accessor));
-	});
+		    accessors.try_emplace(std::move(currentPath),
+		        std::forward<U>(accessor));
+	    });
 }
 }
 
diff --git a/src/chart/generator/buckets.cpp b/src/chart/generator/buckets.cpp
@@ -40,15 +40,14 @@ Buckets::const_iterator &Buckets::const_iterator::operator++()
 	    curr_end == real_end
 	        ? curr_end
 	        : std::partition_point(curr_end,
-	            real_end,
-	            [this,
-	                searched =
-	                    (*curr_end->*parent->marker_id_get).seriesId](
-	                Marker *lhs) -> bool
-	            {
-		            return (lhs->*parent->marker_id_get).seriesId
-		                == searched;
-	            })};
+	              real_end,
+	              [this,
+	                  searched = (*curr_end->*parent->marker_id_get)
+	                                 .seriesId](Marker *lhs) -> bool
+	              {
+		              return (lhs->*parent->marker_id_get).seriesId
+		                  == searched;
+	              })};
 	return *this;
 }
 
diff --git a/src/chart/main/chart.cpp b/src/chart/main/chart.cpp
@@ -91,9 +91,9 @@ void Chart::draw(Gfx::ICanvas &canvas)
 {
 	renderedChart = Draw::RenderedChart{
 	    actPlot ? Draw::CoordinateSystem{layout.plotArea,
-	        actPlot->getOptions()->angle,
-	        actPlot->getOptions()->coordSystem,
-	        actPlot->keepAspectRatio}
+	                  actPlot->getOptions()->angle,
+	                  actPlot->getOptions()->coordSystem,
+	                  actPlot->keepAspectRatio}
 	            : Draw::CoordinateSystem{layout.plotArea},
 	    actPlot};
 
diff --git a/src/chart/rendering/drawaxes.cpp b/src/chart/rendering/drawaxes.cpp
@@ -212,12 +212,13 @@ void DrawAxes::drawTitle(Gen::ChannelId axisIndex) const
 		                      .value
 		                  == Styles::AxisTitle::Orientation::vertical
 		            : titleStyle.orientation->factor<double>(
-		                Styles::AxisTitle::Orientation::vertical));
+		                  Styles::AxisTitle::Orientation::vertical));
 
 		auto orientedSize =
 		    fades == ::Anim::second
 		        ? calcOrientation(
-		            titleStyle.orientation->get_or_first(index).value)
+		              titleStyle.orientation->get_or_first(index)
+		                  .value)
 		        : titleStyle.orientation->combine(calcOrientation);
 
 		auto center = offset * (orientedSize / 2.0);
@@ -320,7 +321,7 @@ void DrawAxes::drawDimensionLabel(bool horizontal,
 		            ? labelStyle.side->get_or_first(index).value
 		                  == Styles::AxisLabel::Side::negative
 		            : labelStyle.side->factor<double>(
-		                Styles::AxisLabel::Side::negative);
+		                  Styles::AxisLabel::Side::negative);
 
 		    auto sign = 1 - 2 * under;
 
diff --git a/src/chart/rendering/drawinterlacing.cpp b/src/chart/rendering/drawinterlacing.cpp
@@ -124,9 +124,10 @@ void DrawInterlacing::draw(
 
 		auto axisBottom = axis.origo() + stripWidth;
 
-		auto iMin = axisBottom > 0 ? static_cast<int>(
-		                std::floor(-axis.origo() / (2 * stripWidth)))
-		                           : 0;
+		auto iMin = axisBottom > 0
+		              ? static_cast<int>(std::floor(
+		                    -axis.origo() / (2 * stripWidth)))
+		              : 0;
 
 		if (stripWidth <= 0) return;
 		auto interlaceCount = 0U;
@@ -256,7 +257,7 @@ void DrawInterlacing::drawDataLabel(
 		               ? labelStyle.side->get_or_first(index).value
 		                     == Styles::AxisLabel::Side::negative
 		               : labelStyle.side->factor<double>(
-		                   Styles::AxisLabel::Side::negative);
+		                     Styles::AxisLabel::Side::negative);
 
 		auto &&posDir =
 		    coordSys.convertDirectionAt({refPos, refPos + normal})
diff --git a/src/chart/rendering/markerrenderer.cpp b/src/chart/rendering/markerrenderer.cpp
@@ -342,12 +342,13 @@ std::string MarkerRenderer::getLabelText(
 
 	std::string valueStr;
 	if (labelValue.hasValue()) {
-		auto value = needsInterpolation ? label.combine(
-		                 [](const auto &value)
-		                 {
-			                 return value.value.value_or(0.0);
-		                 })
-		                                : labelValue.value.value();
+		auto value = needsInterpolation
+		               ? label.combine(
+		                     [](const auto &value)
+		                     {
+			                     return value.value.value_or(0.0);
+		                     })
+		               : labelValue.value.value();
 		valueStr = Text::SmartString::fromPhysicalValue(value,
 		    *labelStyle.numberFormat,
 		    static_cast<size_t>(*labelStyle.maxFractionDigits),
@@ -433,8 +434,9 @@ Gfx::Color MarkerRenderer::getSelectedColor(const Gen::Marker &marker,
 	auto markerColor = colorBuilder.render(marker.colorBase);
 
 	return label ? Math::interpolate(markerColor,
-	           rootStyle.plot.marker.label.color->transparent(1.0),
-	           rootStyle.plot.marker.label.color->alpha)
+	                   rootStyle.plot.marker.label.color->transparent(
+	                       1.0),
+	                   rootStyle.plot.marker.label.color->alpha)
 	             : markerColor;
 }
 
diff --git a/src/chart/rendering/markers/abstractmarker.cpp b/src/chart/rendering/markers/abstractmarker.cpp
@@ -7,18 +7,22 @@
 namespace Vizzu::Draw
 {
 
-template<class T, std::size_t I>
+template <class T, std::size_t I>
 std::array<T, I> interpolate(const std::array<T, I> &op0,
-    const std::array<T, I> &op1, double factor)
+    const std::array<T, I> &op1,
+    double factor)
 {
-	return []<std::size_t... Ix>(
-	           const std::array<T, sizeof...(Ix)> &op0,
-	           const std::array<T, sizeof...(Ix)> &op1,
-	           double factor,
-			   std::index_sequence<Ix...>)
+	return
+	    []<std::size_t... Ix>(const std::array<T, sizeof...(Ix)> &op0,
+	        const std::array<T, sizeof...(Ix)> &op1,
+	        double factor,
+	        std::index_sequence<Ix...>)
 	{
 		using Math::interpolate;
-		return std::array<T, sizeof...(Ix)>{interpolate(std::get<Ix>(op0), std::get<Ix>(op1), factor)...};
+		return std::array<T, sizeof...(Ix)>{
+		    interpolate(std::get<Ix>(op0),
+		        std::get<Ix>(op1),
+		        factor)...};
 	}(op0, op1, factor, std::make_index_sequence<I>{});
 }
 
diff --git a/src/chart/rendering/markers/connectingmarker.cpp b/src/chart/rendering/markers/connectingmarker.cpp
@@ -95,8 +95,8 @@ ConnectingMarker::ConnectingMarker(const DrawingContext &ctx,
 			points[3] = prevPos - prevSpacing;
 
 			lineWidth[0] = isLine ? std::max(minWidth,
-			                   maxWidth * prev->sizeFactor,
-			                   less)
+			                            maxWidth * prev->sizeFactor,
+			                            less)
 			                      : 0;
 
 			points[0] =
diff --git a/src/chart/rendering/renderedchart.cpp b/src/chart/rendering/renderedchart.cpp
@@ -55,12 +55,14 @@ bool Marker::bounds(const CoordinateSystem &coordSys,
 		    case circle: {
 			    auto &&rect = Geom::Rect::Boundary(points);
 			    return Geom::Circle(rect.pos + rect.size / 2.0,
-			               rect.size.x / 2.0).distance(point)
+			               rect.size.x / 2.0)
+			               .distance(point)
 			         < 0.1;
 		    }
 		    case line:
-			    return lineToQuad(coordSys)
-			        .distance(coordSys.convert(point)) < 0.1;
+			    return lineToQuad(coordSys).distance(
+			               coordSys.convert(point))
+			         < 0.1;
 		    }
 		    return false;
 	    });
diff --git a/src/dataframe/impl/dataframe.cpp b/src/dataframe/impl/dataframe.cpp
@@ -32,7 +32,7 @@ std::shared_ptr<dataframe_interface> dataframe::copy(
 	    [newly = ptr_t{new (data) dataframe(
 	                       cp ? cp->other
 	                          : unsafe_get<source_type::owning>(
-	                              source),
+	                                source),
 	                       cp && cp->pre_remove ? &*cp->pre_remove
 	                                            : nullptr,
 	                       cp && inherit_sorting && cp->sorted_indices

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ template <typename To> To parse(const std::string &string)`
`43`	`43`	`[]<bool flag = false>()`
`44`	`44`	`{`
`45`	`45`	`static_assert(flag, "no conversion from string");`
`46`		`- }`
`47`		`- ();`
	`46`	`+ }();`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ std::string toString(const From &value)`
`47`	`47`	`[]<bool flag = false>()`
`48`	`48`	`{`
`49`	`49`	`static_assert(flag, "no string conversion");`
`50`		`- }`
`51`		`- ();`
	`50`	`+ }();`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ bool Circle::overlaps(const Circle &c) const`
`34`	`34`	`{`
`35`	`35`	`auto d = c.center - center;`
`36`	`36`	`auto sumRadius = radius + c.radius;`
`37`		`- return Math::AddTolerance(d.sqrAbs())`
`38`		`- < sumRadius * sumRadius;`
	`37`	`+ return Math::AddTolerance(d.sqrAbs()) < sumRadius * sumRadius;`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`Rect Circle::boundary() const`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ struct Line`
`61`	`61`
`62`	`62`	`[[nodiscard]] double distance(const Point &point) const`
`63`	`63`	`{`
`64`		`- if (isPoint())`
`65`		`- return (point - begin).abs();`
	`64`	`+ if (isPoint()) return (point - begin).abs();`
`66`	`65`
`67`	`66`	`auto projection = ((point - begin).dot(getDirection()))`
`68`	`67`	`/ (length() * length());`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ConvexQuad`
`22`	`22`	`double base0Length,`
`23`	`23`	`double base1Length);`
`24`	`24`
`25`		`- [[nodiscard]] double distance(const Point& point) const;`
	`25`	`+ [[nodiscard]] double distance(const Point &point) const;`
`26`	`26`	`};`
`27`	`27`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Triangle`
`15`	`15`
`16`	`16`	`[[nodiscard]] double area() const;`
`17`	`17`
`18`		`- [[nodiscard]] double distance(const Point& point) const;`
	`18`	`+ [[nodiscard]] double distance(const Point &point) const;`
`19`	`19`	`};`
`20`	`20`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,8 @@ namespace Functors`
`535`	`535`	`namespace Composite`
`536`	`536`	`{`
`537`	`537`	`template <class T, class U>`
`538`		`-constexpr inline auto operator>>(U &&arg, const T &)`
`539`		`- -> decltype(T::get(std::forward<U &&>(arg)))`
	`538`	`+constexpr inline auto operator>>(U &&arg,`
	`539`	`+ const T &) -> decltype(T::get(std::forward<U &&>(arg)))`
`540`	`540`	`{`
`541`	`541`	`return T::get(std::forward<U &&>(arg));`
`542`	`542`	`}`