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

JsonCpp to QTJson (Part 3) (#257)

Browse Source 
* Update BlackBorderProcessor.h

* Update Hyperion.h

* Update ImageProcessor.h

* Update ImageProcessorFactory.h

* Update LedString.h

* Update BlackBorderProcessor.cpp

* Update ImageProcessor.cpp

* Update ImageProcessorFactory.cpp

* Update Hyperion.cpp

* Update hyperiond.cpp

* Update TestImage2LedsMap.cpp

* Update TestBlackBorderProcessor.cpp

* Update Hyperion.cpp

* Update Hyperion.cpp
This commit is contained in:
Paulchen Panther
2016-09-25 21:59:31 +02:00
committed by redPanther
parent d6a34edfb2
commit f146894799
12 changed files with 212 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/TestBlackBorderProcessor.cpp
View File

@@ -47,7 +47,7 @@ int main()
// unsigned unknownCnt = 600;
unsigned borderCnt = 50;
// unsigned blurCnt = 0;
Json::Value config;
QJsonObject config;
// BlackBorderProcessor processor(unknownCnt, borderCnt, blurCnt, 3, config);
BlackBorderProcessor processor(config);

14
test/TestImage2LedsMap.cpp
View File

@@ -1,7 +1,7 @@
// Utils includes
#include <utils/Image.h>
#include <utils/jsonschema/JsonFactory.h>
#include <utils/jsonschema/QJsonFactory.h>
// Hyperion includes
#include <hyperion/Hyperion.h>
@@ -11,19 +11,19 @@ using namespace hyperion;
int main()
{
std::string homeDir = getenv("RASPILIGHT_HOME");
QString homeDir = getenv("RASPILIGHT_HOME");
const std::string schemaFile = homeDir + "/hyperion.schema.json";
const std::string configFile = homeDir + "/hyperion.config.json";
const QString schemaFile = homeDir + "/hyperion.schema.json";
const QString configFile = homeDir + "/hyperion.config.json";
Json::Value config;
if (JsonFactory::load(schemaFile, configFile, config) < 0)
QJsonObject config;
if (QJsonFactory::load(schemaFile, configFile, config) < 0)
{
std::cerr << "UNABLE TO LOAD CONFIGURATION" << std::endl;
return -1;
}
const LedString ledString = Hyperion::createLedString(config["leds"], Hyperion::createColorOrder(config["device"]));
const LedString ledString = Hyperion::createLedString(config["leds"], Hyperion::createColorOrder(config["device"].toObject()));
const ColorRgb testColor = {64, 123, 12};