Skip to content
Snippets Groups Projects
Commit 6f8634e8 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Rename enum values

parent 9c79be75
No related branches found
No related tags found
No related merge requests found
......@@ -33,8 +33,8 @@ namespace armarx::aron::cppserializer::serializer
const std::map<typenavigator::ImagePixelType, std::string>
ImageSerializer::pixelTypeMap =
{
{ typenavigator::ImagePixelType::RGB24, "CV_8UC3" },
{ typenavigator::ImagePixelType::DEPTH32, "CV_32FC1"},
{ typenavigator::ImagePixelType::Rgb24, "CV_8UC3" },
{ typenavigator::ImagePixelType::Depth32, "CV_32FC1"},
};
......@@ -96,8 +96,8 @@ case typeConstant : \
typeName = "aron::typenavigator::ImageNavigator::pixelTypeToName( " #typeConstant " )"; \
break;
CASE(::armarx::aron::typenavigator::ImagePixelType::RGB24)
CASE(::armarx::aron::typenavigator::ImagePixelType::DEPTH32)
CASE(::armarx::aron::typenavigator::ImagePixelType::Rgb24)
CASE(::armarx::aron::typenavigator::ImagePixelType::Depth32)
#undef CASE
}
......@@ -147,8 +147,8 @@ case typeConstant : \
block_switch->addLine("arrayType = ::armarx::aron::typenavigator::ImageNavigator::pixelTypeToName(" #typeConstant ");"); \
block_switch->addLine("break;")
CASE(::armarx::aron::typenavigator::ImagePixelType::RGB24);
CASE(::armarx::aron::typenavigator::ImagePixelType::DEPTH32);
CASE(::armarx::aron::typenavigator::ImagePixelType::Rgb24);
CASE(::armarx::aron::typenavigator::ImagePixelType::Depth32);
#undef CASE
......@@ -212,7 +212,7 @@ case typeConstant : \
block_if->addLine("std::vector<int> shape{" + read_start_result_accessor + ".dims.begin(), std::prev(" + read_start_result_accessor + ".dims.end())};");
block_if->addLine("aron::typenavigator::ImagePixelType pixelType = ::armarx::aron::typenavigator::ImageNavigator::pixelTypeFromName(" + read_start_result_accessor + ".type);");
block_if->addLine("::armarx::aron::typenavigator::ImagePixelType pixelType = ::armarx::aron::typenavigator::ImageNavigator::pixelTypeFromName(" + read_start_result_accessor + ".type);");
block_if->addLine("int cvMatType = 0;");
block_if->addLine("switch (pixelType)");
{
......@@ -223,8 +223,8 @@ case typeConstant : \
block_switch->addLine("cvMatType = " + pixelTypeMap.at(typeConstant) + ";"); \
block_switch->addLine("break;")
CASE(::armarx::aron::typenavigator::ImagePixelType::RGB24);
CASE(::armarx::aron::typenavigator::ImagePixelType::DEPTH32);
CASE(::armarx::aron::typenavigator::ImagePixelType::Rgb24);
CASE(::armarx::aron::typenavigator::ImagePixelType::Depth32);
#undef CASE
......
......@@ -34,8 +34,8 @@ namespace armarx::aron::typenavigator
static const simox::meta::EnumNames<ImagePixelType> ImagePixelTypeNames
{
{ ImagePixelType::RGB24, "rgb24" },
{ ImagePixelType::DEPTH32, "depth32" },
{ ImagePixelType::Rgb24, "rgb24" },
{ ImagePixelType::Depth32, "depth32" },
};
......@@ -107,7 +107,7 @@ namespace armarx::aron::typenavigator
{
try
{
return ImagePixelTypeNames.from_name(name);
return ImagePixelTypeNames.from_name(simox::alg::to_lower(name));
}
catch (const simox::meta::error::UnknownEnumValue& e)
{
......
......@@ -33,8 +33,10 @@ namespace armarx::aron::typenavigator
{
enum class ImagePixelType
{
RGB24, // ==> CV_8UC1
DEPTH32, // ==> CV_32FC1
/// 3 (8-bit) byte channels for R, G, and B.
Rgb24, // ==> CV_8UC1
/// 1 (32-bit) float channel for depth.
Depth32, // ==> CV_32FC1
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment