Merge pull request #570 from vizzuhq/remove_this_eq

Remove "*this = " expressions from codebase

Author: schaumb

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - Legend title bottomPadding extended.
+- ColorGradient fromString not increasing position prohibited.
 
 ### Added
 

src/base/anim/duration.cpp

@@ -63,13 +63,13 @@ double Duration::sec() const { return msec() / 1000.0; }
 
 Duration &Duration::operator+=(const Duration &other)
 {
-	*this = *this + other;
+	static_cast<Base &>(*this) += other;
 	return *this;
 }
 
 Duration &Duration::operator-=(const Duration &other)
 {
-	*this = *this - other;
+	static_cast<Base &>(*this) -= other;
 	return *this;
 }
 

src/base/anim/easing.cpp

@@ -16,10 +16,10 @@ Easing::Easing(const std::string &name)
 {
 	if (name.empty()) return;
 
-	auto nameCopy = name;
-	Text::SmartString::trim(nameCopy);
-
-	if (nameCopy == "none") { func = &Easing::none; }
+	if (auto nameCopy = Text::SmartString::trim_view(name);
+	    nameCopy == "none") {
+		func = &Easing::none;
+	}
 	else if (nameCopy == "linear") {
 		func = &Easing::linear;
 	}
@@ -45,7 +45,7 @@ Easing::Easing(const std::string &name)
 		func = EasingGradient::Bezier(Geom::Point{0.42, 0},
 		    Geom::Point{0.58, 1});
 	}
-	else if (const Text::FuncString f(nameCopy, false);
+	else if (const Text::FuncString f(name);
 	         f.getName() == "cubic-bezier") {
 		if (f.getParams().size() != 4)
 			throw std::logic_error("parameter count missmatch");

src/base/anim/easinggradient.cpp

@@ -6,10 +6,6 @@
 
 #include "base/geom/bezier.h"
 #include "base/geom/point.h"
-#include "base/math/segmentedfunc.h"
-#include "base/math/segmentedfunc.tpp"
-
-template struct Math::SegmentedFunction<double, Anim::EasingGradient>;
 
 namespace Anim
 {

src/base/geom/point.h

@@ -113,8 +113,11 @@ struct Point
 
 	Point &operator/=(double divisor)
 	{
-		if (Math::Floating::is_zero(divisor))
-			return *this = Invalid();
+		if (Math::Floating::is_zero(divisor)) {
+			x = NAN;
+			y = NAN;
+			return *this;
+		}
 		x /= divisor;
 		y /= divisor;
 		return *this;
@@ -130,8 +133,11 @@ struct Point
 	Point &operator/=(const Point &other)
 	{
 		using Math::Floating::is_zero;
-		if (is_zero(other.x) || is_zero(other.y))
-			return *this = Invalid();
+		if (is_zero(other.x) || is_zero(other.y)) {
+			x = NAN;
+			y = NAN;
+			return *this;
+		}
 		x /= other.x;
 		y /= other.y;
 		return *this;

src/base/gfx/color.cpp

@@ -22,55 +22,45 @@ Color::operator std::string() const
 	return res;
 }
 
-Color::Color(const std::string &string)
+Color Color::fromString(const std::string &string)
 {
-	if (string.empty()) { *this = Transparent(); }
-	else if (string[0] == '#' && string.size() == 9) {
-		red = Text::Character::hex(&string[1]) / 255.0;
-		green = Text::Character::hex(&string[3]) / 255.0;
-		blue = Text::Character::hex(&string[5]) / 255.0;
-		alpha = Text::Character::hex(&string[7]) / 255.0;
+	if (string.empty()) return Transparent();
+	if (string[0] == '#' && string.size() == 9) {
+		return {Text::Character::hex(&string[1]) / 255.0,
+		    Text::Character::hex(&string[3]) / 255.0,
+		    Text::Character::hex(&string[5]) / 255.0,
+		    Text::Character::hex(&string[7]) / 255.0};
 	}
-	else if (string[0] == '#' && string.size() == 7) {
-		red = Text::Character::hex(&string[1]) / 255.0;
-		green = Text::Character::hex(&string[3]) / 255.0;
-		blue = Text::Character::hex(&string[5]) / 255.0;
-		alpha = 1.0;
+	if (string[0] == '#' && string.size() == 7) {
+		return {Text::Character::hex(&string[1]) / 255.0,
+		    Text::Character::hex(&string[3]) / 255.0,
+		    Text::Character::hex(&string[5]) / 255.0};
 	}
-	else if (string[0] == '#' && string.size() == 4) {
+	if (string[0] == '#' && string.size() == 4) {
 		auto r = Text::Character::fromHex(string[1]);
 		auto g = Text::Character::fromHex(string[2]);
 		auto b = Text::Character::fromHex(string[3]);
-		red = ((r << 4U) + r) / 255.0;
-		green = ((g << 4U) + g) / 255.0;
-		blue = ((b << 4U) + b) / 255.0;
-		alpha = 1.0;
+		return {((r << 4U) + r) / 255.0,
+		    ((g << 4U) + g) / 255.0,
+		    ((b << 4U) + b) / 255.0};
 	}
-	else if (const Text::FuncString f(string, false); !f.isEmpty()) {
+	if (const Text::FuncString f(string); !f.isEmpty()) {
 		using Conv::parse;
 
-		if (f.getName() == "rgb") {
-			auto ps = f.getParams();
-			if (ps.size() != 3)
-				throw std::logic_error("invalid color string");
-			*this = RGBA(parse<uint32_t>(ps.at(0)),
+		auto &&ps = f.getParams();
+		if (f.getName() == "rgb" && ps.size() == 3) {
+			return RGBA(parse<uint32_t>(ps.at(0)),
 			    parse<uint32_t>(ps.at(1)),
 			    parse<uint32_t>(ps.at(2)));
 		}
-		else if (f.getName() == "rgba") {
-			auto ps = f.getParams();
-			if (ps.size() != 4)
-				throw std::logic_error("invalid color string");
-			*this = RGBA(parse<uint32_t>(ps.at(0)),
+		if (f.getName() == "rgba" && ps.size() == 4) {
+			return RGBA(parse<uint32_t>(ps.at(0)),
 			    parse<uint32_t>(ps.at(1)),
 			    parse<uint32_t>(ps.at(2)),
 			    static_cast<uint8_t>(parse<double>(ps.at(3)) * 255));
 		}
-		else
-			throw std::logic_error("invalid color string");
 	}
-	else
-		throw std::logic_error("invalid color string");
+	throw std::logic_error("invalid color string");
 }
 
 Color Color::RGB(uint32_t rgb)

src/base/gfx/color.h

@@ -13,12 +13,12 @@ namespace Gfx
 
 struct Color
 {
-	double red;
-	double green;
-	double blue;
-	double alpha;
+	double red{};
+	double green{};
+	double blue{};
+	double alpha{};
 
-	Color() { red = green = blue = alpha = 0.0; }
+	Color() = default;
 
 	Color(double red,
 	    double green,
@@ -33,7 +33,7 @@ struct Color
 	Color(const Color &) = default;
 	Color &operator=(const Color &) = default;
 
-	explicit Color(const std::string &string);
+	static Color fromString(const std::string &string);
 
 	static Color RGB(uint32_t rgb);
 	static Color RGBA(uint32_t rgba);

src/base/gfx/colorgradient.cpp

@@ -4,31 +4,28 @@
 #include <stdexcept>
 #include <string>
 
-#include "base/math/segmentedfunc.h"
-#include "base/math/segmentedfunc.tpp"
 #include "base/text/smartstring.h"
 
 #include "color.h"
 
-template struct Math::SegmentedFunction<Gfx::Color,
-    Gfx::ColorGradient>;
-
 namespace Gfx
 {
 
 ColorGradient::ColorGradient(const std::string &stoplist)
 {
-	auto stopStrings = Text::SmartString::split(stoplist, ',', true);
-	auto pos = 0.0;
-	for (auto &stopString : stopStrings) {
-		auto parts = Text::SmartString::split(stopString, ' ', true);
-		if (parts.size() == 2) {
-			pos = std::stod(parts[1]);
-			stops.emplace_back(pos, Color(parts[0]));
-		}
-		else
-			throw std::logic_error(
-			    "invalid gradient stop: " + stopString);
+	for (const auto &stopString :
+	    Text::SmartString::split(stoplist, ',', true)) {
+		if (auto &&parts =
+		        Text::SmartString::split(stopString, ' ', true);
+		    parts.size() == 2)
+			if (auto pos = std::stod(parts[1]);
+			    std::isfinite(pos)
+			    && (stops.empty() || pos >= stops.back().pos)) {
+				stops.emplace_back(pos, Color::fromString(parts[0]));
+				continue;
+			}
+		throw std::logic_error(
+		    "invalid gradient stop: " + stopString);
 	}
 }
 

src/base/gfx/colorpalette.cpp

@@ -21,7 +21,7 @@ ColorPalette::ColorPalette(const std::string &string)
 	    Text::SmartString::split(string, ' ', true, "()");
 	colors.reserve(colorList.size());
 	for (const auto &color : colorList) {
-		colors.emplace_back(color);
+		colors.emplace_back(Color::fromString(color));
 	}
 }
 

src/base/gfx/colortransform.cpp

@@ -13,44 +13,31 @@
 namespace Gfx
 {
 
-ColorTransform::ColorTransform(const std::string &code) : code(code)
+ColorTransform ColorTransform::fromString(const std::string &code)
 {
-	Text::SmartString::trim(this->code);
-
-	if (code == "none") {
-		*this = None();
-		return;
-	}
+	if (Text::SmartString::trim_view(code) == "none") return None();
 
 	const Text::FuncString func(code);
 
-	if (func.isEmpty()) return;
+	if (func.isEmpty()) return {};
 
 	if (func.getParams().size() != 1)
 		throw std::logic_error(
 		    "invalid color transform parameter count");
 
-	if (func.getName() == "color") {
-		auto color = Color(func.getParams().at(0));
-		*this = OverrideColor(color);
-	}
-	else if (func.getName() == "lightness") {
-		auto factor = std::stod(func.getParams().at(0));
-		*this = Lightness(factor);
-	}
-	else if (func.getName() == "grayscale") {
-		auto factor = std::stod(func.getParams().at(0));
-		*this = Grayscale(factor);
-	}
-	else if (func.getName() == "opacity") {
-		auto factor = std::stod(func.getParams().at(0));
-		*this = Opacity(factor);
-	}
-	else
-		throw std::logic_error("invalid color transform string");
+	if (func.getName() == "color")
+		return OverrideColor(
+		    Color::fromString(func.getParams().at(0)));
+	if (func.getName() == "lightness")
+		return Lightness(std::stod(func.getParams().at(0)));
+	if (func.getName() == "grayscale")
+		return Grayscale(std::stod(func.getParams().at(0)));
+	if (func.getName() == "opacity")
+		return Opacity(std::stod(func.getParams().at(0)));
+	throw std::logic_error("invalid color transform string");
 }
 
-ColorTransform ColorTransform::OverrideColor(Gfx::Color overrideColor)
+ColorTransform ColorTransform::OverrideColor(Color overrideColor)
 {
 	return {[=](const Color &)
 	    {
@@ -124,7 +111,7 @@ ColorTransform ColorTransform::operator+(
 	    ""};
 }
 
-Gfx::Color ColorTransform::operator()(const Gfx::Color &color) const
+Color ColorTransform::operator()(const Color &color) const
 {
 	return convert ? convert(color) : color;
 }