From ecf62a0b4b7eb037f6b180322480464dca485085 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 18 Oct 2021 00:00:52 +0200 Subject: [PATCH] [DEV] update new lutin interface --- .gitignore | 5 ++ GLD_dollar-bench-corpus.json | 20 ++++++++ GLD_dollar-converter.json | 20 ++++++++ GLD_dollar-data.json | 21 +++++++++ GLD_dollar-generate-form.json | 20 ++++++++ GLD_dollar-test.json | 28 ++++++++++++ GLD_dollar.json | 54 ++++++++++++++++++++++ lutin_dollar-bench-corpus.py | 36 --------------- lutin_dollar-converter.py | 36 --------------- lutin_dollar-data.py | 28 ------------ lutin_dollar-test.py | 39 ---------------- lutin_dollar.py | 63 -------------------------- tool/recorder/GLD_dollar-recorder.json | 56 +++++++++++++++++++++++ tool/recorder/lutin_dollar-recorder.py | 61 ------------------------- 14 files changed, 224 insertions(+), 263 deletions(-) create mode 100644 GLD_dollar-bench-corpus.json create mode 100644 GLD_dollar-converter.json create mode 100644 GLD_dollar-data.json create mode 100644 GLD_dollar-generate-form.json create mode 100644 GLD_dollar-test.json create mode 100644 GLD_dollar.json delete mode 100644 lutin_dollar-bench-corpus.py delete mode 100644 lutin_dollar-converter.py delete mode 100644 lutin_dollar-data.py delete mode 100644 lutin_dollar-test.py delete mode 100644 lutin_dollar.py create mode 100644 tool/recorder/GLD_dollar-recorder.json delete mode 100644 tool/recorder/lutin_dollar-recorder.py diff --git a/.gitignore b/.gitignore index baacc5e..33806bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +__pycache__ +.bck +out +target +build # Compiled Object files *.slo *.lo diff --git a/GLD_dollar-bench-corpus.json b/GLD_dollar-bench-corpus.json new file mode 100644 index 0000000..38c7e81 --- /dev/null +++ b/GLD_dollar-bench-corpus.json @@ -0,0 +1,20 @@ +{ + "type":"BINARY", + "sub-type":"TOOL", + "group-id":"com.atria-soft", + "description":"Bench a corpus with a set of reference files", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "extra-flag":"MEDIUM", + + "source": [ + "tool/bench-corpus/main.cpp" + ], + "dependency": [ + "dollar", + "test-debug" + ] +} \ No newline at end of file diff --git a/GLD_dollar-converter.json b/GLD_dollar-converter.json new file mode 100644 index 0000000..c2ab9f0 --- /dev/null +++ b/GLD_dollar-converter.json @@ -0,0 +1,20 @@ +{ + "type":"BINARY", + "sub-type":"TOOL", + "group-id":"com.atria-soft", + "description":"Dollar converter svg to json and json to SVG", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "extra-flag":"MEDIUM", + + "source": [ + "tool/converter/main.cpp" + ], + "dependency": [ + "dollar", + "test-debug" + ] +} \ No newline at end of file diff --git a/GLD_dollar-data.json b/GLD_dollar-data.json new file mode 100644 index 0000000..894db7e --- /dev/null +++ b/GLD_dollar-data.json @@ -0,0 +1,21 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"dallar test-unit common data", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "extra-flag":"MEDIUM", + + "copy": [ + { + "path":"data/text/*", + "to":"text" + }, { + "path":"data/figure/*", + "to":"figure" + } + ] +} \ No newline at end of file diff --git a/GLD_dollar-generate-form.json b/GLD_dollar-generate-form.json new file mode 100644 index 0000000..fc5bf1c --- /dev/null +++ b/GLD_dollar-generate-form.json @@ -0,0 +1,20 @@ +{ + "type":"BINARY", + "sub-type":"TOOL", + "group-id":"com.atria-soft", + "description":"Dollar generator of all needed form to have the best text recognition", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "extra-flag":"MEDIUM", + + "source": [ + "tool/generate-form/main.cpp" + ], + "dependency": [ + "dollar", + "test-debug" + ] +} \ No newline at end of file diff --git a/GLD_dollar-test.json b/GLD_dollar-test.json new file mode 100644 index 0000000..6ea74e2 --- /dev/null +++ b/GLD_dollar-test.json @@ -0,0 +1,28 @@ +{ + "type":"BINARY", + "sub-type":"TEST", + "group-id":"com.atria-soft", + "description":"dollar test-unit", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "extra-flag":"MEDIUM", + + "source": [ + "test/main.cpp" + ], + "dependency": [ + "dollar", + "dollar-data", + "test-debug", + "etest" + ], + "copy": [ + { + "path":"data/test/*", + "to":"test" + } + ] +} \ No newline at end of file diff --git a/GLD_dollar.json b/GLD_dollar.json new file mode 100644 index 0000000..5311d8b --- /dev/null +++ b/GLD_dollar.json @@ -0,0 +1,54 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"$N gesture recognition", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "extra-flag":"MEDIUM", + + "source": [ + "dollar/debug.cpp", + "dollar/Engine.cpp", + "dollar/EngineN.cpp", + "dollar/EngineP.cpp", + "dollar/EnginePPlus.cpp", + "dollar/Gesture.cpp", + "dollar/GestureN.cpp", + "dollar/GestureP.cpp", + "dollar/GesturePPlus.cpp", + "dollar/Results.cpp", + "dollar/tools.cpp", + "dollar/Rectangle.cpp" + ], + "header": [ + "dollar/debug.hpp", + "dollar/Engine.hpp", + "dollar/EngineN.hpp", + "dollar/EngineP.hpp", + "dollar/EnginePPlus.hpp", + "dollar/Gesture.hpp", + "dollar/GestureN.hpp", + "dollar/GestureP.hpp", + "dollar/GesturePPlus.hpp", + "dollar/Results.hpp", + "dollar/tools.hpp", + "dollar/Rectangle.hpp" + ], + "compilation-version": { + "language": "c++", + "version": 2017 + }, + "dependency": [ + "cxx", + "elog", + "etk", + "ejson", + "esvg", + "ememory" + ] +} + + diff --git a/lutin_dollar-bench-corpus.py b/lutin_dollar-bench-corpus.py deleted file mode 100644 index 84f69fb..0000000 --- a/lutin_dollar-bench-corpus.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TOOL" - -def get_desc(): - return "Bench a corpus with a set of reference files" - -def get_licence(): - return "APACHE-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def configure(target, my_module): - my_module.add_src_file([ - 'tool/bench-corpus/main.cpp' - ]) - my_module.add_depend([ - 'dollar', - 'test-debug', - ]) - return True - diff --git a/lutin_dollar-converter.py b/lutin_dollar-converter.py deleted file mode 100644 index 95c61db..0000000 --- a/lutin_dollar-converter.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TOOL" - -def get_desc(): - return "Dollar converter svg to json and json to SVG" - -def get_licence(): - return "APACHE-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def configure(target, my_module): - my_module.add_src_file([ - 'tool/converter/main.cpp' - ]) - my_module.add_depend([ - 'dollar', - 'test-debug', - ]) - return True - diff --git a/lutin_dollar-data.py b/lutin_dollar-data.py deleted file mode 100644 index 55e47ae..0000000 --- a/lutin_dollar-data.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "DATA" - -def get_desc(): - return "dallar test-unit" - -def get_licence(): - return "APACHE-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def configure(target, my_module): - my_module.copy_path('data/text/*.json', 'text') - my_module.copy_path('data/figure/*.json', 'figure') - return True - diff --git a/lutin_dollar-test.py b/lutin_dollar-test.py deleted file mode 100644 index 74754e3..0000000 --- a/lutin_dollar-test.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TEST" - -def get_desc(): - return "dollar test-unit" - -def get_licence(): - return "APACHE-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def configure(target, my_module): - my_module.add_src_file([ - 'test/main.cpp' - ]) - my_module.add_depend([ - 'dollar', - 'dollar-data', - 'test-debug', - 'etest', - ]) - my_module.copy_path('data/test/*.json', 'test') - return True - diff --git a/lutin_dollar.py b/lutin_dollar.py deleted file mode 100644 index 9031078..0000000 --- a/lutin_dollar.py +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "$N gesture recognition" - -def get_licence(): - return "BSD-3" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def get_version(): - return "version.txt" - -def configure(target, my_module): - my_module.add_extra_flags() - # add the file to compile: - my_module.add_src_file([ - 'dollar/debug.cpp', - 'dollar/Engine.cpp', - 'dollar/EngineN.cpp', - 'dollar/EngineP.cpp', - 'dollar/EnginePPlus.cpp', - 'dollar/Gesture.cpp', - 'dollar/GestureN.cpp', - 'dollar/GestureP.cpp', - 'dollar/GesturePPlus.cpp', - 'dollar/Results.cpp', - 'dollar/tools.cpp', - 'dollar/Rectangle.cpp' - ]) - - my_module.add_header_file([ - 'dollar/*.hpp', - ], - destination_path="dollar") - - # build in C++ mode - my_module.compile_version("c++", 2011) - # add dependency of the generic C++ library: - my_module.add_depend([ - 'cxx', - 'elog', - 'etk', - 'ejson', - 'esvg', - 'ememory', - ]) - return True - - diff --git a/tool/recorder/GLD_dollar-recorder.json b/tool/recorder/GLD_dollar-recorder.json new file mode 100644 index 0000000..47ed3c4 --- /dev/null +++ b/tool/recorder/GLD_dollar-recorder.json @@ -0,0 +1,56 @@ +{ + "type":"BINARY", + "sub-type":"TOOL", + "group-id":"com.atria-soft", + "description":"LGDT tools: Handwriting recorder", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":[0,1,0], + "version-id":1, + "extra-flag":"MEDIUM", + + "source": [ + "appl/Main.cpp", + "appl/debug.cpp", + "appl/Windows.cpp", + "appl/widget/TextAreaRecognition.cpp" + ], + "path":[ + "." + ], + "compilation-version": { + "language": "c++", + "version": 2017 + }, + "dependency": [ + "ewol", + "ejson", + "esvg", + "dollar" + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "copy": [ + { + "path":"data/icon.*", + "to":"" + }, { + "path":"data/freefont/*", + "to":"fonts" + }, { + "path":"data/reference/*", + "to":"reference" + } + ], + "package":{ + "RIGHT": "WRITE_EXTERNAL_STORAGE", + "ICON": "data/icon.png" + } +} \ No newline at end of file diff --git a/tool/recorder/lutin_dollar-recorder.py b/tool/recorder/lutin_dollar-recorder.py deleted file mode 100644 index ea8c900..0000000 --- a/tool/recorder/lutin_dollar-recorder.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools -import os - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TOOL" - -def get_desc(): - return "LGDT tools: Handwriting recorder" - -def get_licence(): - return "PROPRIETARY" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "Edouard DUPIN" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_src_file([ - 'appl/Main.cpp', - 'appl/debug.cpp', - 'appl/Windows.cpp', - 'appl/widget/TextAreaRecognition.cpp', - ]) - my_module.add_depend([ - 'ewol', - 'ejson', - 'esvg', - 'dollar', - #'dollar-data' - ]) - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - my_module.add_path(".") - my_module.set_pkg("VERSION_CODE", 1) - my_module.add_pkg("RIGHT", "WRITE_EXTERNAL_STORAGE") - - my_module.copy_path('data/icon.*','') - my_module.copy_path("data/freefont/*","fonts/") - my_module.copy_path('data/reference/*', "reference") - - my_module.set_pkg("ICON", "data/icon.png") - return True - - - -