Release 2.1.0 (#4)

golluroSICKAG · web-flow · commit 44d6be1ab556 · 2025-07-28T09:42:26.000+02:00
# Release 2.1.0

## New features
- Check if persistent data to load provides all relevant parameters. Otherwise add default values

## Improvements
- Better instance handling regarding FlowConfig

## Bugfix
- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
- UI differs if deployed via Appstudio or VS Code AppSpace SDK
- Fullscreen icon of iFrame was visible
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Release 2.1.0
+
+### New features
+- Check if persistent data to load provides all relevant parameters. Otherwise add default values
+
+### Improvements
+- Better instance handling regarding FlowConfig
+
+### Bugfix
+- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
+- UI differs if deployed via Appstudio or VS Code AppSpace SDK
+- Fullscreen icon of iFrame was visible
+
 ## Release 2.0.1
 
 ### Bugfix
diff --git a/CSK_Module_MultiImageEdgeMatcher/pages/pages/CSK_Module_MultiImageEdgeMatcher/CSK_Module_MultiImageEdgeMatcher.css b/CSK_Module_MultiImageEdgeMatcher/pages/pages/CSK_Module_MultiImageEdgeMatcher/CSK_Module_MultiImageEdgeMatcher.css
@@ -116,5 +116,5 @@
 
 .myCustomButton_CSK_Module_MultiImageEdgeMatcher {
   border-radius: 30px;
-  padding-right: 0px;
+  padding: 11px;
 }
diff --git a/CSK_Module_MultiImageEdgeMatcher/pages/pages/CSK_Module_MultiImageEdgeMatcher/CSK_Module_MultiImageEdgeMatcher.html b/CSK_Module_MultiImageEdgeMatcher/pages/pages/CSK_Module_MultiImageEdgeMatcher/CSK_Module_MultiImageEdgeMatcher.html
@@ -6,13 +6,12 @@
         <layout-row id="RowLayout44">
             <layout-column id="ColumnLayout61" style="align-items: stretch">
                 <layout-row id="RowLayout01" style="align-items: baseline">
-                    <davinci-value-display id="VD_Title" class="myCustomLabel_CSK_Module_MultiImageEdgeMatcher"
-                        value="Image EdgeMatcher">
-                    </davinci-value-display>
+                    <h1 id="Heading_Title" class="myCustomLabel_CSK_Module_MultiImageEdgeMatcher">
+                        Image EdgeMatcher
+                    </h1>
                     <davinci-value-display id="VD_Version">
-                        <crown-edpws-binding property="value" name="CSK_MultiImageEdgeMatcher/OnNewStatusModuleVersion"
-                            update-on-resume>
-                        </crown-edpws-binding>
+                        <crown-on property="value" crown-event="CSK_MultiImageEdgeMatcher/OnNewStatusModuleVersion">
+                        </crown-on>
                     </davinci-value-display>
                 </layout-row>
             </layout-column>
@@ -59,17 +58,18 @@
                                                     style="align-items: center; justify-content: center">
                                                     <davinci-button id="Button_AddInstance"
                                                         class="myCustomButton_CSK_Module_MultiImageEdgeMatcher"
-                                                        type="outline" icon-position="append" icon="content/add">
+                                                        type="outline">
+                                                        <davinci-icon icon="content/add"></davinci-icon>
                                                         <span></span>
                                                         <crown-binding event="submit"
                                                             name="CSK_MultiImageEdgeMatcher/addInstance" auto-commit>
                                                         </crown-binding>
                                                     </davinci-button>
                                                     <davinci-button id="Button_ResetInstances"
                                                         class="myCustomButton_CSK_Module_MultiImageEdgeMatcher"
-                                                        type="outline" icon-position="append"
-                                                        title="Reset insances to single instance. Reload app after reseting."
-                                                        icon="action/delete">
+                                                        type="outline"
+                                                        title="Reset insances to single instance. Reload app after reseting.">
+                                                        <davinci-icon icon="action/delete"></davinci-icon>
                                                         <span></span>
                                                         <crown-binding event="submit"
                                                             name="CSK_MultiImageEdgeMatcher/resetInstances" auto-commit>
@@ -117,9 +117,9 @@
                                                             style="justify-content: center; align-items: center">
                                                             <davinci-button id="B_LoadConfig"
                                                                 class="myCustomButton_CSK_Module_MultiImageEdgeMatcher"
-                                                                type="outline" icon-position="append"
-                                                                title="Load configured parameters from CSK_PersistentData module."
-                                                                icon="action/history">
+                                                                type="outline"
+                                                                title="Load configured parameters from CSK_PersistentData module.">
+                                                                <davinci-icon icon="action/history"></davinci-icon>
                                                                 <span></span>
                                                                 <crown-binding event="submit"
                                                                     name="CSK_MultiImageEdgeMatcher/loadParameters"
@@ -133,9 +133,9 @@
                                                             </davinci-button>
                                                             <davinci-button id="B_SaveConfig"
                                                                 class="myCustomButton_CSK_Module_MultiImageEdgeMatcher"
-                                                                type="outline" icon-position="append"
-                                                                title="Save current configured parameters of this module within CSK_PersistentData module."
-                                                                icon="content/save">
+                                                                type="outline"
+                                                                title="Save current configured parameters of this module within CSK_PersistentData module.">
+                                                                <davinci-icon icon="content/save"></davinci-icon>
                                                                 <span></span>
                                                                 <crown-binding event="submit"
                                                                     name="CSK_MultiImageEdgeMatcher/sendParameters"
@@ -268,18 +268,16 @@
                                             <layout-column id="ColumnLayout23" style="align-items: stretch">
                                                 <layout-row id="RowLayout25" style="justify-content: flex-end">
                                                     <davinci-value-display id="VD_FoundValidMatchesValue">
-                                                        <crown-edpws-binding property="value"
-                                                            name="CSK_MultiImageEdgeMatcher/OnNewStatusFoundValidMatches"
-                                                            update-on-resume>
-                                                        </crown-edpws-binding>
+                                                        <crown-on property="value"
+                                                            crown-event="CSK_MultiImageEdgeMatcher/OnNewStatusFoundValidMatches">
+                                                        </crown-on>
                                                     </davinci-value-display>
                                                     <davinci-value-display id="VD_Seperator" value="/">
                                                     </davinci-value-display>
                                                     <davinci-value-display id="VD_FoundMatchesValue">
-                                                        <crown-edpws-binding property="value"
-                                                            name="CSK_MultiImageEdgeMatcher/OnNewStatusFoundMatches"
-                                                            update-on-resume>
-                                                        </crown-edpws-binding>
+                                                        <crown-on property="value"
+                                                            crown-event="CSK_MultiImageEdgeMatcher/OnNewStatusFoundMatches">
+                                                        </crown-on>
                                                     </davinci-value-display>
                                                 </layout-row>
                                             </layout-column>
@@ -295,10 +293,9 @@
                                             <layout-column id="ColumnLayout25" style="align-items: stretch">
                                                 <layout-row id="RowLayout39" style="justify-content: flex-end">
                                                     <davinci-value-display id="VD_ScoreValue">
-                                                        <crown-edpws-binding property="value"
-                                                            name="CSK_MultiImageEdgeMatcher/OnNewStatusMatchScoreResult"
-                                                            update-on-resume>
-                                                        </crown-edpws-binding>
+                                                        <crown-on property="value"
+                                                            crown-event="CSK_MultiImageEdgeMatcher/OnNewStatusMatchScoreResult">
+                                                        </crown-on>
                                                     </davinci-value-display>
                                                 </layout-row>
                                             </layout-column>
@@ -380,8 +377,9 @@
                                                                         style="align-items: stretch">
                                                                         <davinci-button id="Button_Teach"
                                                                             class="myCustomButton_CSK_Module_MultiImageEdgeMatcher"
-                                                                            type="outline" icon-position="append" toggle
-                                                                            icon="content/select_all">
+                                                                            type="outline" toggle>
+                                                                            <davinci-icon icon="content/select_all">
+                                                                            </davinci-icon>
                                                                             <span>Teach</span>
                                                                             <crown-binding event="change"
                                                                                 name="CSK_MultiImageEdgeMatcher/setTeachMode"
diff --git a/CSK_Module_MultiImageEdgeMatcher/pages/src/converter.ts b/CSK_Module_MultiImageEdgeMatcher/pages/src/converter.ts
@@ -12,6 +12,14 @@ export function changeID(id) {
 export function changeStyle(theme) {
   const style: HTMLStyleElement = document.createElement('style');
   style.id ='blub'
+
+  const toggleSW = document.querySelectorAll("davinci-toggle-switch")
+  toggleSW.forEach((userItem) => {
+    const shadowToggle = userItem.shadowRoot
+    const finalToggleSW = shadowToggle?.querySelector('div')
+    finalToggleSW?.classList.add('hasIcon')
+  });
+
   if (theme == 'CSK_Style'){
     var headerToolbar = `.sopasjs-ui-header-toolbar-wrapper { background-color: #FFFFFF; }`
     var uiHeader = `.sopasjs-ui-header>.app-logo { margin-right:0px; }`
diff --git a/CSK_Module_MultiImageEdgeMatcher/pages/src/index.ts b/CSK_Module_MultiImageEdgeMatcher/pages/src/index.ts
@@ -12,6 +12,10 @@ document.addEventListener('sopasjs-ready', () => {
   page_Setup.remove();
 
   setTimeout(() => {
+    const element = document.querySelector("div.sjs-wrapper > div > div.sjs-fullscreen-toggle")
+    if(element) {
+      element.parentElement.removeChild(element)
+    }
     document.title = 'CSK_Module_MultiImageEdgeMatcher'
   }, 500);
 })
diff --git a/CSK_Module_MultiImageEdgeMatcher/project.mf.xml b/CSK_Module_MultiImageEdgeMatcher/project.mf.xml
@@ -470,7 +470,7 @@ Setting this parameter will invalidate any previous teach call!</desc>
             </crown>
         </crown>
         <meta key="author">SICK AG</meta>
-        <meta key="version">2.0.1</meta>
+        <meta key="version">2.1.0</meta>
         <meta key="priority">low</meta>
         <meta key="copy-protected">false</meta>
         <meta key="read-protected">false</meta>
diff --git a/CSK_Module_MultiImageEdgeMatcher/scripts/CSK_Module_MultiImageEdgeMatcher.lua b/CSK_Module_MultiImageEdgeMatcher/scripts/CSK_Module_MultiImageEdgeMatcher.lua
@@ -50,10 +50,9 @@ local multiImageEdgeMatcher_Instances = {} -- Handle all instances
 local multiImageEdgeMatcherController = require('ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Controller')
 
 if _G.availableAPIs.default and _G.availableAPIs.specific then
-  local setInstanceHandle = require('ImageProcessing/MultiImageEdgeMatcher/FlowConfig/MultiImageEdgeMatcher_FlowConfig')
+  require('ImageProcessing/MultiImageEdgeMatcher/FlowConfig/MultiImageEdgeMatcher_FlowConfig')
   table.insert(multiImageEdgeMatcher_Instances, multiImageEdgeMatcher_Model.create(1)) -- Create at least 1 instance
   multiImageEdgeMatcherController.setMultiImageEdgeMatcher_Instances_Handle(multiImageEdgeMatcher_Instances) -- share handle of instances
-  setInstanceHandle(multiImageEdgeMatcher_Instances)
 else
   _G.logger:warning("CSK_MultiImageEdgeMatcher: Relevant CROWN(s) not available on device. Module is not supported...")
 end
diff --git a/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/FlowConfig/MultiImageEdgeMatcher_FlowConfig.lua b/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/FlowConfig/MultiImageEdgeMatcher_FlowConfig.lua
@@ -14,19 +14,7 @@ local multiImageEdgeMatcher_Instances
 --- Function to react if FlowConfig was updated
 local function handleOnClearOldFlow()
   if _G.availableAPIs.default and _G.availableAPIs.specific then
-    for i = 1, #multiImageEdgeMatcher_Instances do
-      if multiImageEdgeMatcher_Instances[i].parameters.flowConfigPriority then
-        CSK_MultiImageEdgeMatcher.clearFlowConfigRelevantConfiguration()
-        break
-      end
-    end
+    CSK_MultiImageEdgeMatcher.clearFlowConfigRelevantConfiguration()
   end
 end
 Script.register('CSK_FlowConfig.OnClearOldFlow', handleOnClearOldFlow)
-
---- Function to get access to the multiImageEdgeMatcher_Instances
----@param handle handle Handle of multiImageEdgeMatcher_Instances object
-local function setMultiImageEdgeMatcher_Instances_Handle(handle)
-  multiImageEdgeMatcher_Instances = handle
-end
-return setMultiImageEdgeMatcher_Instances_Handle
diff --git a/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Controller.lua b/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Controller.lua
@@ -496,9 +496,11 @@ Script.serveFunction('CSK_MultiImageEdgeMatcher.getStatusModuleActive', getStatu
 
 local function clearFlowConfigRelevantConfiguration()
   for i = 1, #multiImageEdgeMatcher_Instances do
-    multiImageEdgeMatcher_Instances[i].parameters.registeredEvent = ''
-    Script.notifyEvent('MultiImageEdgeMatcher_OnNewProcessingParameter', i, 'deregisterFromEvent', '')
-    Script.notifyEvent('MultiImageEdgeMatcher_OnNewStatusRegisteredEvent', '')
+    if multiImageEdgeMatcher_Instances[i].parameters.flowConfigPriority then
+      multiImageEdgeMatcher_Instances[i].parameters.registeredEvent = ''
+      Script.notifyEvent('MultiImageEdgeMatcher_OnNewProcessingParameter', i, 'deregisterFromEvent', '')
+      Script.notifyEvent('MultiImageEdgeMatcher_OnNewStatusRegisteredEvent', '')
+    end
   end
 end
 Script.serveFunction('CSK_MultiImageEdgeMatcher.clearFlowConfigRelevantConfiguration', clearFlowConfigRelevantConfiguration)
@@ -549,6 +551,9 @@ local function loadParameters()
       _G.logger:info(nameOfModule .. ": Loaded parameters for multiImageEdgeMatcherObject " .. tostring(selectedInstance) .. " from CSK_PersistentData module.")
 
       multiImageEdgeMatcher_Instances[selectedInstance].parameters = helperFuncs.convertContainer2Table(data)
+
+      multiImageEdgeMatcher_Instances[selectedInstance].parameters = helperFuncs.checkParameters(multiImageEdgeMatcher_Instances[selectedInstance].parameters, helperFuncs.defaultParameters.getParameters())
+
       local serMatcher = Object.serialize(multiImageEdgeMatcher_Instances[selectedInstance].parameters.matcher, 'JSON')
       local newMatcher = Object.deserialize(serMatcher, 'JSON')
       multiImageEdgeMatcher_Instances[selectedInstance].parameters.matcher = newMatcher
@@ -635,7 +640,11 @@ Script.register("CSK_PersistentData.OnInitialDataLoaded", handleOnInitialDataLoa
 
 local function resetModule()
   if _G.availableAPIs.default and _G.availableAPIs.specific then
-    clearFlowConfigRelevantConfiguration()
+    for i = 1, #multiImageEdgeMatcher_Instances do
+      multiImageEdgeMatcher_Instances[i].parameters.registeredEvent = ''
+      Script.notifyEvent('MultiImageEdgeMatcher_OnNewProcessingParameter', i, 'deregisterFromEvent', '')
+      Script.notifyEvent('MultiImageEdgeMatcher_OnNewStatusRegisteredEvent', '')
+    end
     pageCalled()
   end
 end
diff --git a/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Model.lua b/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Model.lua
@@ -59,33 +59,7 @@ function multiImageEdgeMatcher.create(multiImageEdgeMatcherInstanceNo)
 
   -- Parameters to be saved permanently if wanted
   self.parameters = {}
-  self.parameters.flowConfigPriority = CSK_FlowConfig ~= nil or false -- Status if FlowConfig should have priority for FlowConfig relevant configurations
-  self.parameters.registeredEvent = '' -- Event to register for new images to process, like 'CSK_ImagePlayer.OnNewImage'
-  self.parameters.processingFile = 'CSK_MultiImageEdgeMatcher_Processing' -- Which file to use for processing (will be started in own thread)
-
-  self.parameters.showImage = true -- Show image in UI viewer
-
-  self.parameters.matcher = Image.Matching.EdgeMatcher.create() -- EdgeMatcher handle
-  self.parameters.edgeThreshold = 30 -- EdgeMatcher edge threshold
-  self.parameters.minScore = 0.8 -- Minimum score to count as a found object
-  self.parameters.downsampleFactor = 2 -- EdgeMatcher downsample factor. ReTeach EdgeMatcher if setting this value.
-  self.parameters.maxMatches = 1 -- Maximum amount of matches to accept
-
-  self.parameters.backgroundClutter = 'HIGH' -- Level the live images supplied to the match function are expected to contain non-object edges
-  self.parameters.fineSearch = true -- Status if fine sarch shuld be performed 
-  self.parameters.minSeparation = 50.0 -- Minimum separation between the centers of object matches in image world units (typically millimeters) taking the image pixel size into account.
-  self.parameters.rotationRange = 180 -- Angle in degrees, the maximum deviation from the original object orientation to search for.
-  self.parameters.priorRotationRange = 0.0 -- Optional prior orientation in radians. If specified, the orientation search range is centered around this orientation
-  self.parameters.minScaleRange = 1.0 -- The smallest scale factor to search for. Lower limit is 0.8
-  self.parameters.maxScaleRange = 1.0 -- The largest scale factor to search for. Upper limit is 1.2
-  self.parameters.priorScale = 1.0 -- Optional prior scale factor. Set to the expected scale of the object to find, relative to the size of the teach object. E.g. 1.25 if the object to find is 25% larger than the teach object. Min: 0.1. Max: 10
-  self.parameters.tileCount = 0 -- Number of tile images to split into. 0 gives automatic selection. 1 disables tiling
-  self.parameters.timeout = 5 -- Abort the match call if the match time exceeds set number of seconds.
-
-  self.parameters.showImage = true -- Show image in UI
-
-  self.parameters.resultTransX = 320 -- Pixel to translate the found result position in x
-  self.parameters.resultTransY = 240 -- Pixel to translate the found result position in y
+  self.parameters = self.helperFuncs.defaultParameters.getParameters() -- Load default parameters
 
   -- Parameters to give to the processing script
   self.multiImageEdgeMatcherProcessingParams = Container.create()
diff --git a/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Parameters.lua b/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/MultiImageEdgeMatcher_Parameters.lua
diff --git a/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/helper/funcs.lua b/CSK_Module_MultiImageEdgeMatcher/scripts/ImageProcessing/MultiImageEdgeMatcher/helper/funcs.lua
diff --git a/README.md b/README.md
diff --git a/docu/CSK_Module_MultiImageEdgeMatcher.html b/docu/CSK_Module_MultiImageEdgeMatcher.html

Original file line number	Diff line number	Diff line change
`@@ -116,5 +116,5 @@`
`116`	`116`
`117`	`117`	`.myCustomButton_CSK_Module_MultiImageEdgeMatcher {`
`118`	`118`	`border-radius: 30px;`
`119`		`- padding-right: 0px;`
	`119`	`+ padding: 11px;`
`120`	`120`	`}`