Version 1.0.0 (#1)

- Initial version

Author: golluroSICKAG

CHANGELOG.md

@@ -1,14 +1,5 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## Release 0.1.0
+## Release 1.0.0
 - Initial commit
-
-### New features
-- ...
-
-### Improvements
-- ...
-
-### Bugfix
-- ...

CSK_Module_MultiImageEdgeMatcher/pages/pages/CSK_Module_MultiImageEdgeMatcher/CSK_Module_MultiImageEdgeMatcher.css

@@ -5,5 +5,10 @@
   margin: 6px;
 }
 
-.myCustomCssClass_CSK_Module_MultiImageEdgeMatcher {
+.myCustomMinHeight35px_CSK_Module_MultiImageEdgeMatcher {
+  min-height: 35px;
+}
+
+.myCustomMarginLeft30px_CSK_Module_MultiImageEdgeMatcher {
+  margin-left: 30px;
 }

CSK_Module_MultiImageEdgeMatcher/pages/pages/CSK_Module_MultiImageEdgeMatcher/CSK_Module_MultiImageEdgeMatcher.html

@@ -1,3 +1,10 @@
 export function convertToList(value) {
   return JSON.parse(value)
+}
+
+export function changeID(id) {
+  const viewerElement = document.getElementById('Viewer2D1');
+  viewerElement.setAttribute('viewer-id', id);
+  viewerElement.triggerResume();
+  return id;
 }

CSK_Module_MultiImageEdgeMatcher/pages/src/converter.ts

@@ -31,7 +31,7 @@
 -- If app property "LuaLoadAllEngineAPI" is FALSE, use this to load and check for required APIs
 -- This can improve performance of garbage collection
 
--- _G.availableAPIs = require('ImageProcessing/MultiImageEdgeMatcher/helper/checkAPIs') -- can be used to adjust function scope of the module related on available APIs of the device
+_G.availableAPIs = require('ImageProcessing/MultiImageEdgeMatcher/helper/checkAPIs') -- can be used to adjust function scope of the module related on available APIs of the device
 -----------------------------------------------------------
 -- Logger
 _G.logger = Log.SharedLogger.create('ModuleLogger')
@@ -60,30 +60,6 @@ multiImageEdgeMatcherController.setMultiImageEdgeMatcher_Instances_Handle(multiI
 --**********************Start Function Scope *******************************
 --**************************************************************************
 
---[[
---- Function to show how this module could be used
-local function startProcessing()
-
-  CSK_MultiImageEdgeMatcher.setSelectedInstance(1) --> select instance of module
-  CSK_MultiImageEdgeMatcher.doSomething() --> preparation
-
-  -- Option A --> prepare an event to trigger processing via this one
-  --Script.serveEvent("CSK_MultiImageEdgeMatcher.OnNewTestEvent", "MultiImageEdgeMatcher_OnNewTestEvent") --> Create event to listen to and process forwarded object
-  --CSK_MultiImageEdgeMatcher.setRegisterEvent('CSK_MultiImageEdgeMatcher.OnNewTestEvent') --> Register processing to the event
-
-  --Script.notifyEvent('OnNewTestEvent', data)
-
-    -- Option B --> trigger processing via function call
-    local result = CSK_MultiImageEdgeMatcher.processSomething(data)
-
-  end
-end
-
--- Call processing function after persistent data was loaded
---Script.register("CSK_MultiImageEdgeMatcher.OnDataLoadedOnReboot", startProcessing)
-]]
-
---OR
 
 --- Function to react on startup event of the app
 local function main()
@@ -95,11 +71,10 @@ local function main()
   --       event CSK_PersistentData.OnInitialDataLoaded
   --       (see internal variable _G.multiImageEdgeMatcher_Model.parameterLoadOnReboot)
   --       If so, the app will trigger the "OnDataLoadedOnReboot" event if ready after loading parameters
-  --
-  -- Can be used e.g. like this
+  -- Check UI for setup
   ----------------------------------------------------------------------------------------
 
-  --startProcessing() --> see above
+  CSK_MultiImageEdgeMatcher.setSelectedInstance(1) --> select instance of module
   CSK_MultiImageEdgeMatcher.pageCalled() -- Update UI
 
 end

CSK_Module_MultiImageEdgeMatcher/project.mf.xml

@@ -31,13 +31,6 @@ function multiImageEdgeMatcher.create(multiImageEdgeMatcherInstanceNo)
   self.multiImageEdgeMatcherInstanceNoString = tostring(self.multiImageEdgeMatcherInstanceNo) -- Number of this instance as string
   self.helperFuncs = require('ImageProcessing/MultiImageEdgeMatcher/helper/funcs') -- Load helper functions
 
-  -- Optionally check if specific API was loaded via
-  --[[
-  if _G.availableAPIs.specific then
-  -- ... doSomething ...
-  end
-  ]]
-
   -- Create parameters etc. for this module instance
   self.activeInUI = false -- Check if this instance is currently active in UI
 
@@ -52,62 +45,69 @@ function multiImageEdgeMatcher.create(multiImageEdgeMatcherInstanceNo)
   self.parametersName = 'CSK_MultiImageEdgeMatcher_Parameter' .. self.multiImageEdgeMatcherInstanceNoString -- name of parameter dataset to be used for this module
   self.parameterLoadOnReboot = false -- Status if parameter dataset should be loaded on app/device reboot
 
-  --self.object = Image.create() -- Use any AppEngine CROWN
-  --self.counter = 1 -- Short docu of variable
-  --self.varA = 'value' -- Short docu of variable
+  self.tought = false -- Status if matcher was already tought
 
   -- Parameters to be saved permanently if wanted
   self.parameters = {}
-  self.parameters.registeredEvent = '' -- If thread internal function should react on external event, define it here, e.g. 'CSK_OtherModule.OnNewInput'
-  self.parameters.processingFile = 'CSK_MultiImageEdgeMatcher_Processing' -- which file to use for processing (will be started in own thread)
-  --self.parameters.showImage = true -- Short docu of variable
-  --self.parameters.paramA = 'paramA' -- Short docu of variable
-  --self.parameters.paramB = 123 -- Short docu of variable
+  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.internalObject = {} -- optionally
-  --self.parameters.selectedObject = 1 -- Which object is currently selected
-  --[[
-    for i = 1, 10 do
-    local obj = {}
+  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
 
-    obj.objectName = 'Object' .. tostring(i) -- name of the object
-    obj.active = false  -- is this object active
-    -- ...
+  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.
 
-    table.insert(self.parameters.internalObject, obj)
-  end
+  self.parameters.showImage = true -- Show image in UI
 
-  local internalObjectContainer = self.helperFuncs.convertTable2Container(self.parameters.internalObject)
-  ]]
+  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
 
   -- Parameters to give to the processing script
   self.multiImageEdgeMatcherProcessingParams = Container.create()
   self.multiImageEdgeMatcherProcessingParams:add('multiImageEdgeMatcherInstanceNumber', multiImageEdgeMatcherInstanceNo, "INT")
   self.multiImageEdgeMatcherProcessingParams:add('registeredEvent', self.parameters.registeredEvent, "STRING")
-  --self.multiImageEdgeMatcherProcessingParams:add('showImage', self.parameters.showImage, "BOOL")
-  --self.multiImageEdgeMatcherProcessingParams:add('viewerId', 'multiImageEdgeMatcherViewer' .. self.multiImageEdgeMatcherInstanceNoString, "STRING")
-
-  --self.multiImageEdgeMatcherProcessingParams:add('internalObjects', internalObjectContainer, "OBJECT") -- optionally
-  --self.multiImageEdgeMatcherProcessingParams:add('selectedObject', self.parameters.selectedObject, "INT")
+  self.multiImageEdgeMatcherProcessingParams:add('showImage', self.parameters.showImage, "BOOL")
+  self.multiImageEdgeMatcherProcessingParams:add('viewerId', 'multiImageEdgeMatcherViewer' .. self.multiImageEdgeMatcherInstanceNoString, "STRING")
+
+  self.multiImageEdgeMatcherProcessingParams:add('edgeThreshold', self.parameters.edgeThreshold, "INT")
+  self.multiImageEdgeMatcherProcessingParams:add('minScore', self.parameters.minScore, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('downsampleFactor', self.parameters.downsampleFactor, "INT")
+  self.multiImageEdgeMatcherProcessingParams:add('maxMatches', self.parameters.maxMatches, "INT")
+
+  self.multiImageEdgeMatcherProcessingParams:add('backgroundClutter', self.parameters.backgroundClutter, "STRING")
+  self.multiImageEdgeMatcherProcessingParams:add('minSeparation', self.parameters.minSeparation, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('fineSearch', self.parameters.fineSearch, "BOOL")
+  self.multiImageEdgeMatcherProcessingParams:add('rotationRange', self.parameters.rotationRange, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('priorRotationRange', self.parameters.priorRotationRange, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('minScaleRange', self.parameters.minScaleRange, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('maxScaleRange', self.parameters.maxScaleRange, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('priorScale', self.parameters.priorScale, "FLOAT")
+  self.multiImageEdgeMatcherProcessingParams:add('tileCount', self.parameters.tileCount, "INT")
+  self.multiImageEdgeMatcherProcessingParams:add('timeout', self.parameters.timeout, "FLOAT")
+
+  self.multiImageEdgeMatcherProcessingParams:add('resultTransX', self.parameters.resultTransX, "INT")
+  self.multiImageEdgeMatcherProcessingParams:add('resultTransY', self.parameters.resultTransY, "INT")
 
   -- Handle processing
   Script.startScript(self.parameters.processingFile, self.multiImageEdgeMatcherProcessingParams)
 
   return self
 end
 
---[[
---- Some internal code docu for local used function to do something
-function multiImageEdgeMatcher:doSomething()
-  self.object:doSomething()
-end
-
---- Some internal code docu for local used function to do something else
-function multiImageEdgeMatcher:doSomethingElse()
-  self:doSomething() --> access internal function
-end
-]]
-
 return multiImageEdgeMatcher
 
 --*************************************************************************

CSK_Module_MultiImageEdgeMatcher/scripts/CSK_Module_MultiImageEdgeMatcher.lua

@@ -10,11 +10,20 @@ local function loadAPIs()
 
   Container = require 'API.Container'
   Engine = require 'API.Engine'
+  Image = require 'API.Image'
+  Image.Matching = {}
+  Image.Matching.EdgeMatcher = require 'API.Image.Matching.EdgeMatcher'
   Log = require 'API.Log'
   Log.Handler = require 'API.Log.Handler'
   Log.SharedLogger = require 'API.Log.SharedLogger'
   Object = require 'API.Object'
+  Point = require 'API.Point'
+  Shape = require 'API.Shape'
   Timer = require 'API.Timer'
+  Transform = require 'API.Transform'
+  View = require 'API.View'
+  View.ShapeDecoration = require 'API.View.ShapeDecoration'
+  View.TextDecoration = require 'API.View.TextDecoration'
 
   -- Check if related CSK modules are available to be used
   local appList = Engine.listApps()