From 75c5eea0fd4dac499ecdeb2e3418ec77816bb9e4 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Wed, 27 Dec 2023 21:00:30 +0100 Subject: [PATCH] Update RGBChannels --- include/hyperion/ColorAdjustment.h | 16 ++++++++-------- include/utils/hyperion.h | 2 +- libsrc/utils/RgbChannelAdjustment.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hyperion/ColorAdjustment.h b/include/hyperion/ColorAdjustment.h index 3e9b8dc8..2d846fd7 100644 --- a/include/hyperion/ColorAdjustment.h +++ b/include/hyperion/ColorAdjustment.h @@ -16,21 +16,21 @@ public: QString _id; /// The BLACK (RGB-Channel) adjustment - RgbChannelAdjustment _rgbBlackAdjustment; + RgbChannelAdjustment _rgbBlackAdjustment {0, 0, 0, "black"}; /// The WHITE (RGB-Channel) adjustment - RgbChannelAdjustment _rgbWhiteAdjustment; + RgbChannelAdjustment _rgbWhiteAdjustment{255, 255, 255, "white"}; /// The RED (RGB-Channel) adjustment - RgbChannelAdjustment _rgbRedAdjustment; + RgbChannelAdjustment _rgbRedAdjustment {255, 0, 0 , "red"}; /// The GREEN (RGB-Channel) adjustment - RgbChannelAdjustment _rgbGreenAdjustment; + RgbChannelAdjustment _rgbGreenAdjustment {0, 255, 0, "green"}; /// The BLUE (RGB-Channel) adjustment - RgbChannelAdjustment _rgbBlueAdjustment; + RgbChannelAdjustment _rgbBlueAdjustment {0, 0, 255, "blue"}; /// The CYAN (RGB-Channel) adjustment - RgbChannelAdjustment _rgbCyanAdjustment; + RgbChannelAdjustment _rgbCyanAdjustment {0, 255, 255, "cyan"}; /// The MAGENTA (RGB-Channel) adjustment - RgbChannelAdjustment _rgbMagentaAdjustment; + RgbChannelAdjustment _rgbMagentaAdjustment {255, 0, 255, "magenta"}; /// The YELLOW (RGB-Channel) adjustment - RgbChannelAdjustment _rgbYellowAdjustment; + RgbChannelAdjustment _rgbYellowAdjustment {255, 255, 0, "yellow"}; RgbTransform _rgbTransform; OkhsvTransform _okhsvTransform; diff --git a/include/utils/hyperion.h b/include/utils/hyperion.h index 88ebc44e..eeb5be5f 100644 --- a/include/utils/hyperion.h +++ b/include/utils/hyperion.h @@ -96,7 +96,7 @@ namespace hyperion { static_cast(channelConfig[0].toInt(defaultR)), static_cast(channelConfig[1].toInt(defaultG)), static_cast(channelConfig[2].toInt(defaultB)), - "ChannelAdjust_" + channelName.toUpper() + channelName ); } diff --git a/libsrc/utils/RgbChannelAdjustment.cpp b/libsrc/utils/RgbChannelAdjustment.cpp index 35935b8f..2079c7aa 100644 --- a/libsrc/utils/RgbChannelAdjustment.cpp +++ b/libsrc/utils/RgbChannelAdjustment.cpp @@ -7,7 +7,7 @@ RgbChannelAdjustment::RgbChannelAdjustment(QString channelName) RgbChannelAdjustment::RgbChannelAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName ) : _channelName(channelName) - , _log(Logger::getInstance(channelName)) + , _log(Logger::getInstance("CHANNEL_" + channelName.toUpper())) , _brightness(0) { setAdjustment(adjustR, adjustG, adjustB);