From 9458be294f588bf76c6cef1fc7302468525701ba Mon Sep 17 00:00:00 2001 From: Norb Date: Sat, 20 Jul 2024 12:37:09 +0200 Subject: [PATCH] add hue saturation and brightness in filter extract --- .../conversion/SimpleConversionFilters.cpp | 23 ++++++++++++++++++- .../conversion/SimpleConversionFilters.h | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.cpp b/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.cpp index 3a397ab75..f59e7fb11 100644 --- a/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.cpp +++ b/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.cpp @@ -82,9 +82,9 @@ Parameter* SimpleConversionFilter::setupSingleParameterInternal(Parameter* sourc addExtraRetargetOptions(); + if (dynamic_cast(retargetP) != nullptr) retargetComponent->addOption("Hue", HUE)->addOption("Saturation", SATURATION)->addOption("Brightness", BRIGHTNESS); if (transferType == EXTRACT) retargetComponent->addOption("Min", MIN)->addOption("Max", MAX)->addOption("Average", AVERAGE)->addOption("Length", LENGTH)->addOption("Area", AREA); - if (useBaseValue) { if (transferType == TARGET) @@ -272,6 +272,27 @@ MappingFilter::ProcessResult SimpleConversionFilter::processSingleParameterInter val = 1; for (int i = 0; i < source->value.size(); i++) val = (float)val * (float)source->value[i]; break; + + case HUE: + { + ColorParameter* colorParam = dynamic_cast(source); + val = colorParam->getColor().getHue(); + break; + } + + case SATURATION: + { + ColorParameter* colorParam = dynamic_cast(source); + val = colorParam->getColor().getSaturation(); + break; + } + + case BRIGHTNESS: + { + ColorParameter* colorParam = dynamic_cast(source); + val = colorParam->getColor().getBrightness(); + break; + } default: if (targetData < source->value.size()) val = source->value[targetData]; diff --git a/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.h b/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.h index 19b9501ec..c12a4d5aa 100644 --- a/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.h +++ b/Source/Common/Processor/Mapping/Filter/filters/conversion/SimpleConversionFilters.h @@ -36,7 +36,7 @@ class SimpleConversionFilter : enum TransferType { DIRECT, EXTRACT, MERGE, TARGET}; TransferType transferType; - enum ExtractOption { MIN = 100, MAX = 101, AVERAGE = 102, LENGTH = 103, AREA = 104 }; + enum ExtractOption { MIN = 100, MAX = 101, AVERAGE = 102, LENGTH = 103, AREA = 104, HUE = 105, SATURATION = 106, BRIGHTNESS = 107 }; virtual void setupParametersInternal(int mutiplexIndex, bool rangeOnly = false) override; virtual Parameter* setupSingleParameterInternal(Parameter* source, int multiplexIndex, bool rangeOnly) override;