frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial commit including a linear color smoother

Browse Source 
Former-commit-id: ffc00087996324f989e56dc5c95ab734c7c86dfa
This commit is contained in:
johan
2013-10-27 18:04:37 +01:00
parent 73243eb593
commit 0b08341ef1
11 changed files with 216 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libsrc/hyperion/Hyperion.cpp
View File

@@ -13,10 +13,12 @@
#include "LedDeviceWs2801.h"
#include "LedDeviceTest.h"
#include "LinearColorSmoothing.h"
#include <utils/ColorTransform.h>
#include <utils/HsvTransform.h>
LedDevice* Hyperion::constructDevice(const Json::Value& deviceConfig)
LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
{
std::cout << "Device configuration: " << deviceConfig << std::endl;
LedDevice* device = nullptr;
@@ -36,6 +38,7 @@ LedDevice* Hyperion::constructDevice(const Json::Value& deviceConfig)
}
else
{
std::cout << "Unable to create device" << std::endl;
// Unknown / Unimplemented device
}
return device;
@@ -59,6 +62,7 @@ ColorTransform* Hyperion::createColorTransform(const Json::Value& colorConfig)
ColorTransform* transform = new ColorTransform(threshold, gamma, blacklevel, whitelevel);
return transform;
}
LedString Hyperion::createLedString(const Json::Value& ledsConfig)
{
LedString ledString;
@@ -89,6 +93,12 @@ LedString Hyperion::createLedString(const Json::Value& ledsConfig)
return ledString;
}
LedDevice * Hyperion::createColorSmoothing(const Json::Value & smoothingConfig, LedDevice * ledDevice)
{
//return new LinearColorSmoothing(ledDevice, 20.0, .3);
return ledDevice;
}
Hyperion::Hyperion(const Json::Value &jsonConfig) :
_ledString(createLedString(jsonConfig["leds"])),
_muxer(_ledString.leds().size()),
@@ -97,11 +107,16 @@ Hyperion::Hyperion(const Json::Value &jsonConfig) :
_greenTransform(createColorTransform(jsonConfig["color"]["green"])),
_blueTransform(createColorTransform(jsonConfig["color"]["blue"])),
_haveBgrOutput(jsonConfig["device"].get("bgr-output", false).asBool()),
_device(constructDevice(jsonConfig["device"])),
_device(createDevice(jsonConfig["device"])),
_timer()
{
// initialize the image processor factory
ImageProcessorFactory::getInstance().init(_ledString, jsonConfig["blackborderdetector"].get("enable", true).asBool());
// initialize the color smoothing filter
_device = createColorSmoothing(jsonConfig["smoothing"], _device);
// setup the timer
_timer.setSingleShot(true);
QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(update()));
@@ -112,6 +127,10 @@ Hyperion::Hyperion(const Json::Value &jsonConfig) :
Hyperion::~Hyperion()
{
// switch off all leds
clearall();
_device->switchOff();
// Delete the Led-String
delete _device;