frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

implement adjustable image2ledmaptype for proto (#355)

Browse Source 
add clean of qrc on make clean
This commit is contained in:
redPanther 2016-12-30 13:58:25 +01:00 committed by GitHub
parent 2c61b49b57
commit 8f4341c5c6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -251,6 +251,14 @@ endif ()
# Add the doxygen generation directory # Add the doxygen generation directory
add_subdirectory(doc) add_subdirectory(doc)
# remove generated files on make cleaan too
LIST( APPEND GENERATED_QRC
${CMAKE_BINARY_DIR}/EffectEngine.qrc
${CMAKE_BINARY_DIR}/WebConfig.qrc
${CMAKE_BINARY_DIR}/HyperionConfig.h
)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${GENERATED_QRC}" )
# uninstall target # uninstall target
configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)

3
libsrc/hyperion/schemas/hyperion.schema-2.json
View File

@ -290,16 +290,13 @@
}, },
"hsv" : { "hsv" : {
"type" : "object", "type" : "object",
"required" : false,
"properties" : { "properties" : {
"saturationGain" : { "saturationGain" : {
"type" : "number", "type" : "number",
"required" : false,
"minimum" : 0.0 "minimum" : 0.0
}, },
"valueGain" : { "valueGain" : {
"type" : "number", "type" : "number",
"required" : false,
"minimum" : 0.0 "minimum" : 0.0
} }
}, },

3
libsrc/protoserver/ProtoClientConnection.cpp
View File

@ -31,7 +31,8 @@ ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket)
// connect internal signals and slots // connect internal signals and slots
connect(_socket, SIGNAL(disconnected()), this, SLOT(socketClosed())); connect(_socket, SIGNAL(disconnected()), this, SLOT(socketClosed()));
connect(_socket, SIGNAL(readyRead()), this, SLOT(readData())); connect(_socket, SIGNAL(readyRead()), this, SLOT(readData()));
connect(_hyperion, SIGNAL(imageToLedsMappingChanged(int)), _imageProcessor, SLOT(setLedMappingType(int)));
_priorityChannelName = "proto@"+ _socket->peerAddress().toString().toStdString(); _priorityChannelName = "proto@"+ _socket->peerAddress().toString().toStdString();
} }