Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Make Color::HexString() constexpr (#5985)

Browse Source 
Related improvements to wpi::ct_string:
* Implicitly convert to std::string
* Add operator== for std::string, std::string_view, and const Char*
This commit is contained in:
Tyler Veness
2023-12-04 21:20:49 -08:00
committed by GitHub
parent 2676b77873
commit 90757b9e90
7 changed files with 105 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wpilibc/src/main/native/cpp/util/Color.cpp
View File

@@ -1,13 +0,0 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#include "frc/util/Color.h"
using namespace frc;
std::string Color::HexString() const {
return fmt::format("#{:02X}{:02X}{:02X}", static_cast<int>(255.0 * red),
static_cast<int>(255.0 * green),
static_cast<int>(255.0 * blue));
}

11
wpilibc/src/main/native/cpp/util/Color8Bit.cpp
View File

@@ -1,11 +0,0 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#include "frc/util/Color8Bit.h"
using namespace frc;
std::string Color8Bit::HexString() const {
return fmt::format("#{:02X}{:02X}{:02X}", red, green, blue);
}

12
wpilibc/src/main/native/include/frc/util/Color.h
View File

@@ -11,6 +11,7 @@
#include <fmt/core.h>
#include <wpi/StringExtras.h>
#include <wpi/ct_string.h>
namespace frc {
@@ -851,7 +852,16 @@ class Color {
*
* @return a string of the format <tt>\#RRGGBB</tt>
*/
std::string HexString() const;
constexpr auto HexString() const {
const int r = 255.0 * red;
const int g = 255.0 * green;
const int b = 255.0 * blue;
return wpi::ct_string<char, std::char_traits<char>, 7>{
{'#', wpi::hexdigit(r / 16), wpi::hexdigit(r % 16),
wpi::hexdigit(g / 16), wpi::hexdigit(g % 16), wpi::hexdigit(b / 16),
wpi::hexdigit(b % 16)}};
}
double red = 0.0;
double green = 0.0;

8
wpilibc/src/main/native/include/frc/util/Color8Bit.h
View File

@@ -11,6 +11,7 @@
#include <fmt/core.h>
#include <wpi/StringExtras.h>
#include <wpi/ct_string.h>
#include "Color.h"
@@ -107,7 +108,12 @@ class Color8Bit {
*
* @return a string of the format <tt>\#RRGGBB</tt>
*/
std::string HexString() const;
constexpr auto HexString() const {
return wpi::ct_string<char, std::char_traits<char>, 7>{
{'#', wpi::hexdigit(red / 16), wpi::hexdigit(red % 16),
wpi::hexdigit(green / 16), wpi::hexdigit(green % 16),
wpi::hexdigit(blue / 16), wpi::hexdigit(blue % 16)}};
}
int red = 0;
int green = 0;

11
wpilibc/src/test/native/cpp/util/Color8BitTest.cpp
View File

@@ -2,6 +2,8 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#include <string>
#include <gtest/gtest.h>
#include "frc/util/Color8Bit.h"
@@ -56,7 +58,12 @@ TEST(Color8BitTest, ImplicitConversionToColor) {
}
TEST(Color8BitTest, ToHexString) {
constexpr frc::Color8Bit color{255, 128, 64};
constexpr frc::Color8Bit color1{255, 128, 64};
EXPECT_EQ("#FF8040", color1.HexString());
EXPECT_EQ("#FF8040", color.HexString());
// Ensure conversion to std::string works
[[maybe_unused]] std::string str = color1.HexString();
frc::Color8Bit color2{255, 128, 64};
EXPECT_EQ("#FF8040", color2.HexString());
}

11
wpilibc/src/test/native/cpp/util/ColorTest.cpp
View File

@@ -2,6 +2,8 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#include <string>
#include <gtest/gtest.h>
#include "frc/util/Color.h"
@@ -56,7 +58,12 @@ TEST(ColorTest, FromHSV) {
}
TEST(ColorTest, ToHexString) {
constexpr frc::Color color{255, 128, 64};
constexpr frc::Color color1{255, 128, 64};
EXPECT_EQ("#FF8040", color1.HexString());
EXPECT_EQ("#FF8040", color.HexString());
// Ensure conversion to std::string works
[[maybe_unused]] std::string str = color1.HexString();
frc::Color color2{255, 128, 64};
EXPECT_EQ("#FF8040", color2.HexString());
}