mirror of
				https://github.com/hyperion-project/hyperion.ng.git
				synced 2025-03-01 10:33:28 +00:00 
			
		
		
		
	implement adjustable image2ledmaptype for proto (#355)
add clean of qrc on make clean
This commit is contained in:
		@@ -251,6 +251,14 @@ endif ()
 | 
			
		||||
# Add the doxygen generation directory
 | 
			
		||||
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
 | 
			
		||||
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)
 | 
			
		||||
 
 | 
			
		||||
@@ -290,16 +290,13 @@
 | 
			
		||||
							},
 | 
			
		||||
							"hsv" : {
 | 
			
		||||
								"type" : "object",
 | 
			
		||||
								"required" : false,
 | 
			
		||||
								"properties" : {
 | 
			
		||||
									"saturationGain" : {
 | 
			
		||||
										"type" : "number",
 | 
			
		||||
										"required" : false,
 | 
			
		||||
										"minimum" : 0.0
 | 
			
		||||
									},
 | 
			
		||||
									"valueGain" : {
 | 
			
		||||
										"type" : "number",
 | 
			
		||||
										"required" : false,
 | 
			
		||||
										"minimum" : 0.0
 | 
			
		||||
									}
 | 
			
		||||
								},
 | 
			
		||||
 
 | 
			
		||||
@@ -31,6 +31,7 @@ ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket)
 | 
			
		||||
	// connect internal signals and slots
 | 
			
		||||
	connect(_socket, SIGNAL(disconnected()), this, SLOT(socketClosed()));
 | 
			
		||||
	connect(_socket, SIGNAL(readyRead()), this, SLOT(readData()));
 | 
			
		||||
	connect(_hyperion, SIGNAL(imageToLedsMappingChanged(int)), _imageProcessor, SLOT(setLedMappingType(int))); 
 | 
			
		||||
 | 
			
		||||
	_priorityChannelName = "proto@"+ _socket->peerAddress().toString().toStdString();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user