From edaaa57372588cd06a7d7d0c2e7e141fafe2eb1d Mon Sep 17 00:00:00 2001 From: Martin Prazak Date: Sun, 19 Apr 2020 16:57:54 +0100 Subject: [PATCH] opencv/multiply renamed to opencv/maths/multiply --- src/plugins/opencv/nodes/{ => maths}/multiply.cpp | 2 +- toolbars/06_opencv/70_inpaint_circle.psw | 4 ++-- toolbars/06_opencv/71_inpaint_mask.psw | 4 ++-- toolbars/06_opencv/72_inpaint_restore.psw | 4 ++-- toolbars/06_opencv/73_laplace_circle.psw | 8 ++++---- toolbars/06_opencv/74_laplace_restore.psw | 4 ++-- .../09_lightfields_depth/01_correspondence_confidence.psw | 2 +- .../09_lightfields_depth/02_correspondence_markov.psw | 2 +- toolbars/09_lightfields_depth/11_defocus_confidence.psw | 2 +- toolbars/09_lightfields_depth/12_defocus_markov.psw | 2 +- .../09_lightfields_depth/32_narrowbase_confidence.psw | 2 +- toolbars/09_lightfields_depth/62_graphcut_separation.psw | 6 +++--- toolbars/09_lightfields_depth/63_graphcut_depth.psw | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) rename src/plugins/opencv/nodes/{ => maths}/multiply.cpp (96%) diff --git a/src/plugins/opencv/nodes/multiply.cpp b/src/plugins/opencv/nodes/maths/multiply.cpp similarity index 96% rename from src/plugins/opencv/nodes/multiply.cpp rename to src/plugins/opencv/nodes/maths/multiply.cpp index 8cc2fd951f6..d23a0775798 100644 --- a/src/plugins/opencv/nodes/multiply.cpp +++ b/src/plugins/opencv/nodes/maths/multiply.cpp @@ -49,6 +49,6 @@ void init(possumwood::Metadata& meta) { meta.setCompute(compute); } -possumwood::NodeImplementation s_impl("opencv/multiply", init); +possumwood::NodeImplementation s_impl("opencv/maths/multiply", init); } diff --git a/toolbars/06_opencv/70_inpaint_circle.psw b/toolbars/06_opencv/70_inpaint_circle.psw index de46cf3547c..9aca42e3392 100644 --- a/toolbars/06_opencv/70_inpaint_circle.psw +++ b/toolbars/06_opencv/70_inpaint_circle.psw @@ -204,7 +204,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { @@ -466,4 +466,4 @@ }, "ui_geometry": "AdnQywADAAAAAAAAAAAAAAAAB38AAAQTAAAAAAAAABQAAASlAAACVQAAAAACAAAAB4AAAAAAAAAAGAAAB38AAAQT", "ui_state": "AAAA/wAAAAD9AAAAAgAAAAAAAAL8AAADbPwCAAAAAfsAAAAKAGcAcgBhAHAAaAEAAAB1AAADbAAAAJgBAAADAAAAAQAAAagAAANs/AIAAAAC+wAAABQAcAByAG8AcABlAHIAdABpAGUAcwEAAAB1AAAB2QAAAHYBAAAD+wAAAAwAZQBkAGkAdABvAHIBAAACTwAAAZIAAACqAQAAAwAAAtoAAANsAAAABAAAAAQAAAAIAAAACPwAAAAA" -} \ No newline at end of file +} diff --git a/toolbars/06_opencv/71_inpaint_mask.psw b/toolbars/06_opencv/71_inpaint_mask.psw index 36e186b5027..efe1059238f 100644 --- a/toolbars/06_opencv/71_inpaint_mask.psw +++ b/toolbars/06_opencv/71_inpaint_mask.psw @@ -196,7 +196,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { @@ -476,4 +476,4 @@ }, "ui_geometry": "AdnQywADAAAAAAAAAAAAAAAAB38AAAQTAAAAAAAAABQAAAQ6AAACVQAAAAACAAAAB4AAAAAAAAAAGAAAB38AAAQT", "ui_state": "AAAA/wAAAAD9AAAAAgAAAAAAAAKRAAADbPwCAAAAAfsAAAAKAGcAcgBhAHAAaAEAAAB1AAADbAAAAJgBAAADAAAAAQAAAagAAANs/AIAAAAC+wAAABQAcAByAG8AcABlAHIAdABpAGUAcwEAAAB1AAAB9wAAAHYBAAAD+wAAAAwAZQBkAGkAdABvAHIBAAACbQAAAXQAAACqAQAAAwAAA0UAAANsAAAABAAAAAQAAAAIAAAACPwAAAAA" -} \ No newline at end of file +} diff --git a/toolbars/06_opencv/72_inpaint_restore.psw b/toolbars/06_opencv/72_inpaint_restore.psw index 8428728b817..91ce9caa0f5 100644 --- a/toolbars/06_opencv/72_inpaint_restore.psw +++ b/toolbars/06_opencv/72_inpaint_restore.psw @@ -278,7 +278,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { @@ -587,4 +587,4 @@ }, "ui_geometry": "AdnQywADAAAAAAAAAAAAAAAAB38AAAQTAAAAAAAAABQAAASlAAACVQAAAAACAAAAB4AAAAAAAAAAGAAAB38AAAQT", "ui_state": "AAAA/wAAAAD9AAAAAgAAAAAAAAGrAAADbPwCAAAAAfsAAAAKAGcAcgBhAHAAaAEAAAB1AAADbAAAAJgBAAADAAAAAQAAAagAAANs/AIAAAAC+wAAABQAcAByAG8AcABlAHIAdABpAGUAcwEAAAB1AAABBQAAAHYBAAAD+wAAAAwAZQBkAGkAdABvAHIBAAABewAAAmYAAACqAQAAAwAABCsAAANsAAAABAAAAAQAAAAIAAAACPwAAAAA" -} \ No newline at end of file +} diff --git a/toolbars/06_opencv/73_laplace_circle.psw b/toolbars/06_opencv/73_laplace_circle.psw index d5e555235ee..db3335ad929 100644 --- a/toolbars/06_opencv/73_laplace_circle.psw +++ b/toolbars/06_opencv/73_laplace_circle.psw @@ -285,7 +285,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "multiply_1": { "blind_data": { @@ -296,7 +296,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "multiply_2": { "blind_data": { @@ -307,7 +307,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { @@ -580,4 +580,4 @@ }, "ui_geometry": "AdnQywADAAAAAAAAAAAAAAAAB38AAAQTAAAAAAAAABQAAAQ6AAACVQAAAAACAAAAB4AAAAAAAAAAGAAAB38AAAQT", "ui_state": "AAAA/wAAAAD9AAAAAgAAAAAAAAKRAAADbPwCAAAAAfsAAAAKAGcAcgBhAHAAaAEAAAB1AAADbAAAAJgBAAADAAAAAQAAAagAAANs/AIAAAAC+wAAABQAcAByAG8AcABlAHIAdABpAGUAcwEAAAB1AAAB1wAAAHYBAAAD+wAAAAwAZQBkAGkAdABvAHIBAAACTQAAAZQAAACqAQAAAwAAA0UAAANsAAAABAAAAAQAAAAIAAAACPwAAAAA" -} \ No newline at end of file +} diff --git a/toolbars/06_opencv/74_laplace_restore.psw b/toolbars/06_opencv/74_laplace_restore.psw index 13e68afc5b4..d7fd85b9eae 100644 --- a/toolbars/06_opencv/74_laplace_restore.psw +++ b/toolbars/06_opencv/74_laplace_restore.psw @@ -320,7 +320,7 @@ } }, "name": "multiply", - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { @@ -629,4 +629,4 @@ }, "ui_geometry": "AdnQywADAAAAAAAAAAAAAAAAB38AAAQTAAAAAAAAABQAAAQ6AAACVQAAAAACAAAAB4AAAAAAAAAAGAAAB38AAAQT", "ui_state": "AAAA/wAAAAD9AAAAAgAAAAAAAAG6AAADbPwCAAAAAfsAAAAKAGcAcgBhAHAAaAEAAAB1AAADbAAAAJgBAAADAAAAAQAAAagAAANs/AIAAAAC+wAAABQAcAByAG8AcABlAHIAdABpAGUAcwAAAAB1AAAC+QAAAHYBAAAD+wAAAAwAZQBkAGkAdABvAHIBAAAAdQAAA2wAAACqAQAAAwAABBwAAANsAAAABAAAAAQAAAAIAAAACPwAAAAA" -} \ No newline at end of file +} diff --git a/toolbars/09_lightfields_depth/01_correspondence_confidence.psw b/toolbars/09_lightfields_depth/01_correspondence_confidence.psw index 15d769cd112..5701770b9ed 100644 --- a/toolbars/09_lightfields_depth/01_correspondence_confidence.psw +++ b/toolbars/09_lightfields_depth/01_correspondence_confidence.psw @@ -445,7 +445,7 @@ "output_type": "8UC3", "scale": 1.0 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { diff --git a/toolbars/09_lightfields_depth/02_correspondence_markov.psw b/toolbars/09_lightfields_depth/02_correspondence_markov.psw index 9380e08b7f3..b41ce11d5e7 100644 --- a/toolbars/09_lightfields_depth/02_correspondence_markov.psw +++ b/toolbars/09_lightfields_depth/02_correspondence_markov.psw @@ -481,7 +481,7 @@ "output_type": "Automatic", "scale": 0.00400000018998981 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { diff --git a/toolbars/09_lightfields_depth/11_defocus_confidence.psw b/toolbars/09_lightfields_depth/11_defocus_confidence.psw index b3225c165ac..cb655c9189a 100644 --- a/toolbars/09_lightfields_depth/11_defocus_confidence.psw +++ b/toolbars/09_lightfields_depth/11_defocus_confidence.psw @@ -437,7 +437,7 @@ "output_type": "8UC3", "scale": 1.0 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { diff --git a/toolbars/09_lightfields_depth/12_defocus_markov.psw b/toolbars/09_lightfields_depth/12_defocus_markov.psw index e799f04a470..23195a8e246 100644 --- a/toolbars/09_lightfields_depth/12_defocus_markov.psw +++ b/toolbars/09_lightfields_depth/12_defocus_markov.psw @@ -497,7 +497,7 @@ "output_type": "8UC3", "scale": 1.0 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { diff --git a/toolbars/09_lightfields_depth/32_narrowbase_confidence.psw b/toolbars/09_lightfields_depth/32_narrowbase_confidence.psw index ed1949a54c8..8fb62d0647a 100644 --- a/toolbars/09_lightfields_depth/32_narrowbase_confidence.psw +++ b/toolbars/09_lightfields_depth/32_narrowbase_confidence.psw @@ -469,7 +469,7 @@ "output_type": "8UC3", "scale": 1.0 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { diff --git a/toolbars/09_lightfields_depth/62_graphcut_separation.psw b/toolbars/09_lightfields_depth/62_graphcut_separation.psw index adfe1b1a089..a2b53ea150d 100644 --- a/toolbars/09_lightfields_depth/62_graphcut_separation.psw +++ b/toolbars/09_lightfields_depth/62_graphcut_separation.psw @@ -426,7 +426,7 @@ "output_type": "Automatic", "scale": 1.0 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "multiply_1": { "blind_data": { @@ -441,7 +441,7 @@ "output_type": "Automatic", "scale": 1.0 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": { @@ -772,4 +772,4 @@ }, "ui_geometry": "AdnQywADAAAAAAAAAAAAAAAAB38AAAQTAAAAcwAAABwAAAd7AAAEDwAAAAACAAAAB4AAAAAAAAAAGAAAB38AAAQT", "ui_state": "AAAA/wAAAAD9AAAAAgAAAAAAAAK0AAADbPwCAAAAAfsAAAAKAGcAcgBhAHAAaAEAAAB1AAADbAAAAJgBAAADAAAAAQAAAagAAANs/AIAAAAC+wAAABQAcAByAG8AcABlAHIAdABpAGUAcwEAAAB1AAACHQAAAHYBAAAD+wAAAAwAZQBkAGkAdABvAHIBAAACkwAAAU4AAACqAQAAAwAAAyIAAANsAAAABAAAAAQAAAAIAAAACPwAAAAA" -} \ No newline at end of file +} diff --git a/toolbars/09_lightfields_depth/63_graphcut_depth.psw b/toolbars/09_lightfields_depth/63_graphcut_depth.psw index 1d93c0271f3..98b27dea065 100644 --- a/toolbars/09_lightfields_depth/63_graphcut_depth.psw +++ b/toolbars/09_lightfields_depth/63_graphcut_depth.psw @@ -570,7 +570,7 @@ "output_type": "Automatic", "scale": 0.00400000018998981 }, - "type": "opencv/multiply" + "type": "opencv/maths/multiply" }, "network_0": { "blind_data": {