added identify to led layout right click

awawa-dev · Jan 24, 2023 · a3da48e · a3da48e
1 parent e9cbced
commit a3da48e
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 20 deletions.
diff --git a/assets/webconfig/content/light_source.html b/assets/webconfig/content/light_source.html
@@ -595,6 +595,7 @@ <h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_l
 <div class="dropdown-menu dropdown-menu-sm" style="display: none;" id="creator-context-menu">
 	<a class="dropdown-item" href="#" id="CMD_MOVE"><i class="fa fa-arrows fa-fw"></i><span data-i18n="led_editor_context_move">Move</span></a>
 	<a class="dropdown-item" href="#" id="CMD_PROPERTIES"><i class="fa fa-edit fa-fw"></i><span data-i18n="led_editor_context_properties">Properties</span></a>
+	<a class="dropdown-item" href="#" id="CMD_IDENTIFY"><i class="fa fa-eye-slash fa-fw"></i><span data-i18n="led_editor_context_identify">Identify</span></a>
 	<a class="dropdown-item" href="#" id="CMD_ENABLE"><i class="fa fa-lightbulb-o fa-fw"></i><span id="cmd_dis_enable_text" data-i18n="led_editor_context_enable">Enable</span></a>
 	<a class="dropdown-item" href="#" id="CMD_DELETE"><i class="fa fa-remove fa-fw"></i><span data-i18n="led_editor_context_delete">Delete</span></a>
 </div>

diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
@@ -1186,6 +1186,7 @@
   "led_editor_context_move": "Move",
   "led_editor_context_properties": "Properties",
   "led_editor_context_delete": "Delete",
+  "led_editor_context_identify": "Identify",
   "led_editor_context_enable": "Enable",
   "led_editor_context_disable": "Disable",
   "led_editor_context_moving": "Left click the mouse to accept the position",

diff --git a/assets/webconfig/js/hyperhdr.js b/assets/webconfig/js/hyperhdr.js
@@ -447,10 +447,10 @@ function requestPlayEffect(effectName, duration)
 {
 	sendToHyperhdr("effect", "", '"effect":{"name":"' + effectName + '"},"priority":' + window.webPrio + ',"duration":' + validateDuration(duration) + ',"origin":"' + window.webOrigin + '"');
 }
-
-function requestSetColor(r, g, b, duration)
+function requestSetColor(r, g, b, duration,indexOfLed=-1)
 {
-	sendToHyperhdr("color", "", '"color":[' + r + ',' + g + ',' + b + '], "priority":' + window.webPrio + ',"duration":' + validateDuration(duration) + ',"origin":"' + window.webOrigin + '"');
+	let msg=`"color":[${r},${g},${b}],"indexofled":${indexOfLed},"priority":${window.webPrio},"duration":${validateDuration(duration)},"origin":"${window.webOrigin}"`;
+	sendToHyperhdr("color", "", msg);
 }
 
 function requestSetImage(data, duration, name)

diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
@@ -1169,6 +1169,12 @@ $(document).ready(function()
 
 					selectedObject = null;
 				}
+				if (this.id == "CMD_IDENTIFY")
+				{
+					identify(parsedIndex);
+
+					selectedObject = null;
+				}
 				else if (this.id == "CMD_DELETE")
 				{
 					finalLedArray[parsedIndex] = undefined;
@@ -1362,3 +1368,21 @@ $(document).ready(function()
 	$("#leddevices").trigger("change");
 
 });
+
+function identify(index) {
+	// 					// clear current effect, should be called also on exit
+	requestPriorityClear();
+// set color
+	setTimeout(function(){
+		// rgb and duration: 0 = inf.
+		requestSetColor(255, 0, 0,1,index);
+		setTimeout(function () {
+			requestSetColor(0, 255, 0,1,index);
+		},1000);
+		setTimeout(function () {
+			requestSetColor(0, 0, 255,1,index);
+			requestSetComponentState('LEDDEVICE',true);
+		},2000);
+		// turn on led device if disabled
+	}, 100);
+}
diff --git a/include/api/API.h b/include/api/API.h
@@ -76,10 +76,11 @@ class API : public QObject
 	/// @brief Set a single color
 	/// @param[in] priority The priority of the written color
 	/// @param[in] ledColor The color to write to the leds
+    /// @param[in] indexOfLed The index of the led or -1 to write to all
 	/// @param[in] timeout_ms The time the leds are set to the given color [ms]
 	/// @param[in] origin   The setter
 	///
-	void setColor(int priority, const std::vector<uint8_t>& ledColors, int timeout_ms = -1, const QString& origin = "API", hyperhdr::Components callerComp = hyperhdr::COMP_INVALID);
+	void setColor(int priority, const std::vector<uint8_t>& ledColors,int indexOfLed=-1, int timeout_ms = -1, const QString& origin = "API", hyperhdr::Components callerComp = hyperhdr::COMP_INVALID);
 
 	///
 	/// @brief Set a image

diff --git a/include/base/HyperHdrInstance.h b/include/base/HyperHdrInstance.h
@@ -168,11 +168,12 @@ public slots:
 	///
 	/// @param[in] priority The priority of the written color
 	/// @param[in] ledColors The color to write to the leds
+    /// @param[in] indexOfLed The index of the led or -1 to write to all
 	/// @param[in] timeout_ms The time the leds are set to the given color [ms]
 	/// @param[in] origin   The setter
 	/// @param     clearEffect  Should be true when NOT called from an effect
 	///
-	void setColor(int priority, const std::vector<ColorRgb>& ledColors, int timeout_ms = -1, const QString& origin = "System", bool clearEffects = true);
+	void setColor(int priority, const std::vector<ColorRgb>& ledColors,int indexOfLed=-1, int timeout_ms = -1, const QString& origin = "System", bool clearEffects = true);
 
 	///
 	/// @brief Set the given priority to inactive

diff --git a/include/proto-nano-server/ProtoNanoClientConnection.h b/include/proto-nano-server/ProtoNanoClientConnection.h
@@ -75,7 +75,7 @@ class ProtoNanoClientConnection : public QObject
 	///
 	/// @brief Forward requested color
 	///
-	void setGlobalInputColor(int priority, const std::vector<ColorRgb> &ledColor, int timeout_ms, const QString& origin = "ProtoBuffer" ,bool clearEffects = true);
+	void setGlobalInputColor(int priority, const std::vector<ColorRgb> &ledColor,int indexOfLed = -1, int timeout_ms = -1, const QString& origin = "ProtoBuffer" ,bool clearEffects = true);
 
 	///
 	/// @brief Emits whenever the client disconnected

diff --git a/include/utils/GlobalSignals.h b/include/utils/GlobalSignals.h
@@ -81,7 +81,7 @@ class GlobalSignals : public QObject
 	/// @param[in] origin      The setter
 	/// @param     clearEffect Should be true when NOT called from an effect
 	///
-	void setGlobalColor(int priority, const std::vector<ColorRgb>& ledColor, int timeout_ms, const QString& origin = "External", bool clearEffects = true);
+	void setGlobalColor(int priority, const std::vector<ColorRgb>& ledColor,int indexOfLed = -1, int timeout_ms = -1, const QString& origin = "External", bool clearEffects = true);
 
 	///////////////////////////////////////
 	///////////////// FROM ////////////////

diff --git a/sources/api/API.cpp b/sources/api/API.cpp
@@ -96,7 +96,7 @@ void API::init()
 	}
 }
 
-void API::setColor(int priority, const std::vector<uint8_t>& ledColors, int timeout_ms, const QString& origin, hyperhdr::Components callerComp)
+void API::setColor(int priority, const std::vector<uint8_t>& ledColors,int indexOfLed, int timeout_ms, const QString& origin, hyperhdr::Components callerComp)
 {
 	std::vector<ColorRgb> fledColors;
 	if (ledColors.size() % 3 == 0)
@@ -105,7 +105,7 @@ void API::setColor(int priority, const std::vector<uint8_t>& ledColors, int time
 		{
 			fledColors.emplace_back(ColorRgb{ ledColors[i], ledColors[i + 1], ledColors[i + 2] });
 		}
-		QMetaObject::invokeMethod(_hyperhdr, "setColor", Qt::QueuedConnection, Q_ARG(int, priority), Q_ARG(std::vector<ColorRgb>, fledColors), Q_ARG(int, timeout_ms), Q_ARG(QString, origin));
+		QMetaObject::invokeMethod(_hyperhdr, "setColor", Qt::QueuedConnection, Q_ARG(int, priority), Q_ARG(std::vector<ColorRgb>, fledColors),Q_ARG(int,indexOfLed), Q_ARG(int, timeout_ms), Q_ARG(QString, origin));
 	}
 }
 

diff --git a/sources/api/JSONRPC_schema/schema-color.json b/sources/api/JSONRPC_schema/schema-color.json
@@ -16,6 +16,10 @@
 			"maximum" : 253,
 			"required": true
 		},
+		"indexofled": {
+			"type": "integer",
+			"required": false
+		},
 		"duration": {
 			"type": "integer",
 			"required": false

diff --git a/sources/api/JsonAPI.cpp b/sources/api/JsonAPI.cpp
@@ -239,6 +239,7 @@ void JsonAPI::handleColorCommand(const QJsonObject& message, const QString& comm
 	emit forwardJsonMessage(message);
 	int priority = message["priority"].toInt();
 	int duration = message["duration"].toInt(-1);
+	int indexofled = message["indexofled"].toInt(-1);
 	const QString origin = message["origin"].toString("JsonRpc") + "@" + _peerAddress;
 
 	const QJsonArray& jsonColor = message["color"].toArray();
@@ -249,7 +250,7 @@ void JsonAPI::handleColorCommand(const QJsonObject& message, const QString& comm
 		colors.emplace_back(uint8_t(entry.toInt()));
 	}
 
-	API::setColor(priority, colors, duration, origin);
+	API::setColor(priority, colors,indexofled, duration, origin);
 	sendSuccessReply(command, tan);
 }
 

diff --git a/sources/base/HyperHdrInstance.cpp b/sources/base/HyperHdrInstance.cpp
@@ -443,7 +443,7 @@ bool HyperHdrInstance::setInputInactive(quint8 priority)
 	return _muxer.setInputInactive(priority);
 }
 
-void HyperHdrInstance::setColor(int priority, const std::vector<ColorRgb>& ledColors, int timeout_ms, const QString& origin, bool clearEffects)
+void HyperHdrInstance::setColor(int priority, const std::vector<ColorRgb>& ledColors,int indexOfLed, int timeout_ms, const QString& origin, bool clearEffects)
 {
 	if (ledColors.size() == 0)
 		return;
@@ -457,14 +457,16 @@ void HyperHdrInstance::setColor(int priority, const std::vector<ColorRgb>& ledCo
 	// create full led vector from single/multiple colors
 	std::vector<ColorRgb> newLedColors;
 	auto currentCol = ledColors.begin();
+    int itr=0;
+    for (const auto &item: _ledString.leds()){
+        if(itr==indexOfLed){
+            newLedColors.emplace_back(*currentCol);
+        } else{
+            newLedColors.emplace_back(ColorRgb::BLACK);
+        }
+        itr++;
+    }
 
-	while (newLedColors.size() < _ledString.leds().size())
-	{
-		newLedColors.emplace_back(*currentCol);
-
-		if (++currentCol == ledColors.end())
-			currentCol = ledColors.begin();
-	}
 
 	if (getPriorityInfo(priority).componentId != hyperhdr::COMP_COLOR)
 	{

diff --git a/sources/flatbufserver/FlatBufferClient.cpp b/sources/flatbufserver/FlatBufferClient.cpp
@@ -137,7 +137,7 @@ void FlatBufferClient::handleColorCommand(const hyperhdrnet::Color* colorReq)
 	std::vector<ColorRgb> color{ ColorRgb{ uint8_t(qRed(rgbData)), uint8_t(qGreen(rgbData)), uint8_t(qBlue(rgbData)) } };
 
 	// set output
-	emit setGlobalInputColor(_priority, color, colorReq->duration());
+	emit setGlobalInputColor(_priority, color,-1, colorReq->duration());
 
 	// send reply
 	sendSuccessReply();

diff --git a/sources/flatbufserver/FlatBufferClient.h b/sources/flatbufserver/FlatBufferClient.h
@@ -48,7 +48,7 @@ class FlatBufferClient : public QObject
 	///
 	/// @brief Forward requested color
 	///
-	void setGlobalInputColor(int priority, const std::vector<ColorRgb>& ledColor, int timeout_ms, const QString& origin = "FlatBuffer", bool clearEffects = true);
+	void setGlobalInputColor(int priority, const std::vector<ColorRgb>& ledColor,int indexOfLed = -1, int timeout_ms = -1, const QString& origin = "FlatBuffer", bool clearEffects = true);
 
 	///
 	/// @brief Emits whenever the client disconnected