Tweaking TunerChangeValue by directly setting reflect value

deltacv · Nov 5, 2024 · 5288d27 · 5288d27
1 parent 35dad1c
commit 5288d27
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/...imPlugin/src/main/kotlin/io/github/deltacv/papervision/plugin/PaperVisionEOCVSimPlugin.kt b/...imPlugin/src/main/kotlin/io/github/deltacv/papervision/plugin/PaperVisionEOCVSimPlugin.kt
@@ -247,16 +247,20 @@ class PaperVisionEOCVSimPlugin : EOCVSimPlugin() {
 
     override fun onEnable() {
         engine.setMessageHandlerOf<TunerChangeValueMessage> {
-            eocvSim.tunerManager.getTunableFieldWithLabel(message.label)?.setFieldValue(message.index, message.value)
-            respond(OkResponse())
+            eocvSim.onMainUpdate.doOnce {
+                eocvSim.tunerManager.getTunableFieldWithLabel(message.label)?.setPipelineFieldValue(message.value)
+                respond(OkResponse())
+            }
         }
 
         engine.setMessageHandlerOf<TunerChangeValuesMessage> {
-            for (i in message.values.indices) {
-                eocvSim.tunerManager.getTunableFieldWithLabel(message.label)?.setFieldValue(i, message.values[i])
-            }
+            eocvSim.onMainUpdate.doOnce {
+                for (i in message.values.indices) {
+                    eocvSim.tunerManager.getTunableFieldWithLabel(message.label)?.setFieldValue(i, message.values[i])
+                }
 
-            respond(OkResponse())
+                respond(OkResponse())
+            }
         }
 
         engine.setMessageHandlerOf<GetInputSourcesMessage> {

diff --git a/PaperVision/src/main/kotlin/io/github/deltacv/papervision/attribute/TypedAttribute.kt b/PaperVision/src/main/kotlin/io/github/deltacv/papervision/attribute/TypedAttribute.kt
@@ -235,7 +235,7 @@ abstract class TypedAttribute(val attributeType: AttributeType) : Attribute() {
             when (value) {
                 is Array<*> -> TunerChangeValuesMessage(label, value)
                 is Iterable<*> -> TunerChangeValuesMessage(label, value.map { it as Any }.toTypedArray())
-                else -> TunerChangeValueMessage(label, 0, value)
+                else -> TunerChangeValueMessage(label, value)
             }
         )
     }

diff --git a/...tlin/io/github/deltacv/papervision/node/vision/classification/FilterContoursByAreaNode.kt b/...tlin/io/github/deltacv/papervision/node/vision/classification/FilterContoursByAreaNode.kt
@@ -30,8 +30,8 @@ class FilterContoursByAreaNode : DrawNode<FilterContoursByAreaNode.Session>() {
 
     val input = ListAttribute(INPUT, PointsAttribute, "$[att_contours]")
 
-    val minArea = DoubleAttribute(INPUT, "$[att_minarea]")
-    val maxArea = DoubleAttribute(INPUT, "$[att_maxarea]")
+    val minArea = IntAttribute(INPUT, "$[att_minarea]")
+    val maxArea = IntAttribute(INPUT, "$[att_maxarea]")
 
     val output = ListAttribute(OUTPUT, PointsAttribute, "$[att_filteredcontours]")
 
@@ -41,7 +41,7 @@ class FilterContoursByAreaNode : DrawNode<FilterContoursByAreaNode.Session>() {
         + minArea
         + maxArea
 
-        maxArea.value.set(100.0)
+        maxArea.value.set(100)
 
         + output.rebuildOnChange()
     }

diff --git a/Shared/src/main/kotlin/io/github/deltacv/papervision/engine/client/message/PrevizMessages.kt b/Shared/src/main/kotlin/io/github/deltacv/papervision/engine/client/message/PrevizMessages.kt
@@ -44,7 +44,6 @@ class PrevizAskNameMessage : PaperVisionEngineMessageBase()
 
 class TunerChangeValueMessage(
     var label: String,
-    var index: Int,
     var value: Any
 ) : PaperVisionEngineMessageBase()