diff --git a/.idea/misc.xml b/.idea/misc.xml index caf81ef..4dbf4b1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -43,7 +43,11 @@ + + + + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10223_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10223_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10223_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10497_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10497_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10497_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10777_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10777_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10777_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11117_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11117_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11117_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11406_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11406_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11406_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11745_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11745_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11745_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12033_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12033_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12033_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12369_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12369_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12369_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12735_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12735_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12735_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1284_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1284_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1284_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13007_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13007_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13007_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13574_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13574_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13574_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13975_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13975_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13975_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14295_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14295_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14295_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14482_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14482_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14482_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1588_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1588_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1588_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1876_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1876_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1876_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2158_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2158_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2158_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2500_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2500_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2500_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2835_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2835_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2835_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3189_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3189_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3189_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3517_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3517_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3517_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3869_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3869_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3869_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4195_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4195_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4195_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4484_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4484_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4484_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4809_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4809_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4809_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5147_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5147_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5147_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5484_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5484_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5484_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5846_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5846_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5846_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6013_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6013_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6013_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6177_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6177_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6177_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6832_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6832_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6832_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7193_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7193_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7193_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7562_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7562_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7562_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7847_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7847_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7847_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8178_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8178_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8178_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8534_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8534_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8534_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8534_timing.txt @@ -1,2 +1,4 @@ # C/C++ build system timings +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8865_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8865_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8865_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9258_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9258_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9258_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_941_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_941_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_941_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9597_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9597_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9597_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9861_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9861_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9861_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12369_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12369_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12369_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12735_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12735_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12735_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13007_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13007_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13007_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_6832_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_6832_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_6832_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_8534_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_8534_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_8534_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json index 528a2be..ae23adc 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json @@ -11,11 +11,11 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 399480583 + "memoizedHashCode": -1277826182 }, { "level_": 0, - "message_": "rebuilding JSON D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\\android_gradle_build.json due to:", + "message_": "JSON \u0027D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\\android_gradle_build.json\u0027 was up-to-date", "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", "tag_": "debug|armeabi-v7a", "diagnosticCode_": 0, @@ -25,147 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1289674658 - }, - { - "level_": 0, - "message_": "- expected json D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\\android_gradle_build.json file is not present, will remove stale json folder", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1040373668 - }, - { - "level_": 0, - "message_": "- missing previous command file D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\\metadata_generation_command.txt, will remove stale json folder", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1096317062 - }, - { - "level_": 0, - "message_": "- command changed from previous, will remove stale json folder", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -730638217 - }, - { - "level_": 0, - "message_": "removing stale contents from \u0027D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\u0027", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -584771484 - }, - { - "level_": 0, - "message_": "created folder \u0027D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\u0027", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": 1623250544 - }, - { - "level_": 0, - "message_": "executing cmake Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003darmeabi-v7a\n-DCMAKE_ANDROID_ARCH_ABI\u003darmeabi-v7a\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\armeabi-v7a\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\armeabi-v7a\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1196078929 - }, - { - "level_": 0, - "message_": "Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003darmeabi-v7a\n-DCMAKE_ANDROID_ARCH_ABI\u003darmeabi-v7a\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\armeabi-v7a\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\armeabi-v7a\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1120377746 - }, - { - "level_": 0, - "message_": "Exiting generation of D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\\compile_commands.json.bin normally", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": 2063400582 - }, - { - "level_": 0, - "message_": "done executing cmake", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1042984468 - }, - { - "level_": 0, - "message_": "write command file D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\armeabi-v7a\\metadata_generation_command.txt", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|armeabi-v7a", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1693381162 + "memoizedHashCode": -333854324 }, { "level_": 0, @@ -179,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 895088616 + "memoizedHashCode": -782218149 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12369_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12369_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12369_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12735_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12735_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12735_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13007_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13007_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13007_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13143_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13143_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13143_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_6832_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_6832_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_6832_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_8534_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_8534_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_8534_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json index 58c8551..2e61f9a 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 469605365 + "memoizedHashCode": -879101726 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 130476295 + "memoizedHashCode": -1218230796 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 261494530 + "memoizedHashCode": -1087212561 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12369_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12369_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12369_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12735_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12735_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12735_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13007_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13007_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13007_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_6832_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_6832_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_6832_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_8534_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_8534_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_8534_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json index 9f60a8a..ac585e7 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json @@ -11,11 +11,11 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1313252495 + "memoizedHashCode": -364054270 }, { "level_": 0, - "message_": "rebuilding JSON D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\\android_gradle_build.json due to:", + "message_": "JSON \u0027D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\\android_gradle_build.json\u0027 was up-to-date", "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", "tag_": "debug|x86_64", "diagnosticCode_": 0, @@ -25,147 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 651943450 - }, - { - "level_": 0, - "message_": "- expected json D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\\android_gradle_build.json file is not present, will remove stale json folder", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1442621150 - }, - { - "level_": 0, - "message_": "- missing previous command file D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\\metadata_generation_command.txt, will remove stale json folder", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -609457824 - }, - { - "level_": 0, - "message_": "- command changed from previous, will remove stale json folder", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": 112742554 - }, - { - "level_": 0, - "message_": "removing stale contents from \u0027D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\u0027", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -491469346 - }, - { - "level_": 0, - "message_": "created folder \u0027D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\u0027", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -622497710 - }, - { - "level_": 0, - "message_": "executing cmake Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003dx86_64\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86_64\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\x86_64\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\x86_64\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1051666577 - }, - { - "level_": 0, - "message_": "Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003dx86_64\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86_64\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\x86_64\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\build\\intermediates\\cxx\\Debug\\111w1j12\\obj\\x86_64\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -1992844592 - }, - { - "level_": 0, - "message_": "Exiting generation of D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\\compile_commands.json.bin normally", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": 2130180552 - }, - { - "level_": 0, - "message_": "done executing cmake", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": -199603697 - }, - { - "level_": 0, - "message_": "write command file D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\.cxx\\Debug\\111w1j12\\x86_64\\metadata_generation_command.txt", - "file_": "D:\\QTagger\\a\\QTagger_Android10\\OpenCV\\libcxx_helper\\CMakeLists.txt", - "tag_": "debug|x86_64", - "diagnosticCode_": 0, - "memoizedIsInitialized": 1, - "unknownFields": { - "fields": {}, - "fieldsDescending": {} - }, - "memoizedSize": -1, - "memoizedHashCode": 1228713188 + "memoizedHashCode": -777478940 }, { "level_": 0, @@ -179,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1738469387 + "memoizedHashCode": 61162622 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10060_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10060_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10060_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10343_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10343_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10343_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10626_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10626_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10626_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10965_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10965_timing.txt new file mode 100644 index 0000000..7ea5966 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10965_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11248_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11248_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11248_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1132_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1132_timing.txt new file mode 100644 index 0000000..ffc6c5a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1132_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 22ms +create_cxx_tasks completed in 23ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11583_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11583_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11583_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11866_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11866_timing.txt new file mode 100644 index 0000000..9691afc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11866_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12201_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12201_timing.txt new file mode 100644 index 0000000..f6f2a5b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12201_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13143_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13143_timing.txt new file mode 100644 index 0000000..24616d2 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13143_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 27ms +create_cxx_tasks completed in 29ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13421_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13421_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13421_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13807_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13807_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13807_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14145_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14145_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14145_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1424_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1424_timing.txt new file mode 100644 index 0000000..952fea8 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1424_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 22ms +create_cxx_tasks completed in 22ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14482_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14482_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14482_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1707_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1707_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1707_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2001_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2001_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2001_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2335_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2335_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2335_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2682_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2682_timing.txt new file mode 100644 index 0000000..98b3bbc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2682_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 21ms +create_cxx_tasks completed in 22ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3039_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3039_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3039_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3370_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3370_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3370_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3714_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3714_timing.txt new file mode 100644 index 0000000..11511c1 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3714_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4323_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4323_timing.txt new file mode 100644 index 0000000..ffc6c5a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4323_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 22ms +create_cxx_tasks completed in 23ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4656_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4656_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4656_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4991_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4991_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4991_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5336_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5336_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5336_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5680_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5680_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5680_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6013_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6013_timing.txt new file mode 100644 index 0000000..6d192e6 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6013_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 25ms +create_cxx_tasks completed in 26ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6672_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6672_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6672_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7040_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7040_timing.txt new file mode 100644 index 0000000..695c14b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7040_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7692_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7692_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7692_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_777_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_777_timing.txt new file mode 100644 index 0000000..a9ef5ca --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_777_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 25ms +create_cxx_tasks completed in 26ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8028_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8028_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8028_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8365_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8365_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8365_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8709_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8709_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8709_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9092_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9092_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9092_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9432_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9432_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9432_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9715_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9715_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9715_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1e7511..b9c3a64 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,18 @@ android:theme="@style/Theme.QTagger" android:usesCleartextTraffic="true" tools:targetApi="31"> + + + + + + + + + + @@ -84,13 +96,10 @@ android:exported="false" /> - - + android:exported="false"> - - + diff --git a/app/src/main/java/com/qtagger/Activity/CameraActivity.java b/app/src/main/java/com/qtagger/Activity/CameraActivity.java index 4e663ab..def87f0 100644 --- a/app/src/main/java/com/qtagger/Activity/CameraActivity.java +++ b/app/src/main/java/com/qtagger/Activity/CameraActivity.java @@ -39,6 +39,7 @@ import android.view.View; import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.Toast; @@ -48,6 +49,7 @@ import com.hoho.android.usbserial.driver.UsbSerialDriver; import com.hoho.android.usbserial.driver.UsbSerialPort; import com.hoho.android.usbserial.driver.UsbSerialProber; import com.qtagger.CustomPalette.CameraSurfaceView; +import com.qtagger.CustomPalette.RectangleWeightCapture; import com.qtagger.Data.CustomProber; import com.qtagger.Data.TestEnum; import com.qtagger.Database.ImageFile; @@ -94,6 +96,7 @@ public class CameraActivity extends AppCompatActivity { CameraSurfaceView surfaceView; RelativeLayout pictureLayout; LinearLayout saveLayout; + ProgressBar progressBar; String dbTestType; DataManager dataManager = DataManager.getInstance(); Bitmap resultBitmap,mOrigin; @@ -104,6 +107,7 @@ public class CameraActivity extends AppCompatActivity { private boolean usbChecker = false; private enum Connected { False, Pending, True } private Connected connected = Connected.False; + private boolean serviceChecker = false; SerialService service; boolean isService = false; private boolean hexEnabled = true; @@ -233,6 +237,7 @@ public class CameraActivity extends AppCompatActivity { double df = f; df = df / 10; pkgData = String.format("%.5f", df); + progressBar.setVisibility(View.INVISIBLE); Log.i("jjhTest!!!!!" , String.format("%.5f", df) + " μSv/hr"); } } @@ -353,7 +358,7 @@ public class CameraActivity extends AppCompatActivity { Thread detectThread = new Thread() { public void run() { try { - Thread.sleep(1000); + //Thread.sleep(1000); if(stopFlag) { stopFlag = false; @@ -464,6 +469,8 @@ public class CameraActivity extends AppCompatActivity { boolean octChecker; TessBaseAPI tessBaseAPI; List new_contours; + Button button_weightAlter; + RectangleWeightCapture box; public Mat dot; public String ocr = "d05"; public boolean boxFlag = false; @@ -477,6 +484,14 @@ public class CameraActivity extends AppCompatActivity { dbTestType = intent.getStringExtra("TestType"); pkgData = intent.getStringExtra("PkgData"); + tessBaseAPI = new TessBaseAPI(); + imageView = findViewById(R.id.imageView); + surfaceView = findViewById(R.id.surfaceView); + pictureLayout = findViewById(R.id.layout_picture); + saveLayout = findViewById(R.id.layout_saveChecker); + button_weightAlter = findViewById(R.id.button_weightAlter); + progressBar = findViewById(R.id.capture_loading); + if(dbTestType == null) dbTestType =""; if(pkgData == null) @@ -485,33 +500,16 @@ public class CameraActivity extends AppCompatActivity { if(usbChecker) { usbService(); + progressBar.setVisibility(View.VISIBLE); } - - octChecker = dbTestType.compareTo(TestType.Weight.name()) == 0; - tessBaseAPI = new TessBaseAPI(); - imageView = findViewById(R.id.imageView); - surfaceView = findViewById(R.id.surfaceView); - pictureLayout = findViewById(R.id.layout_picture); - saveLayout = findViewById(R.id.layout_saveChecker); - if(octChecker) { - imageView.setVisibility(View.VISIBLE); - surfaceView.setVisibility(View.GONE); - AssetManager am = mContext.getAssets(); - InputStream inOrigin = null; - try { - inOrigin = am.open("weight06.jpg"); - } catch (IOException e) { - e.printStackTrace(); - } - BitmapFactory.Options optionsOrigin = new BitmapFactory.Options(); - - //origin set - mOrigin = BitmapFactory.decodeStream(inOrigin, null, optionsOrigin); - imageView.setImageBitmap(mOrigin); + button_weightAlter.setVisibility(View.VISIBLE); + box = new RectangleWeightCapture(mContext); + RelativeLayout relativeLayout = findViewById(R.id.relativelayout_View); + relativeLayout.addView(box, new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)); } @@ -519,6 +517,7 @@ public class CameraActivity extends AppCompatActivity { button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + progressBar.setVisibility(View.VISIBLE); capture(); } }); @@ -534,7 +533,7 @@ public class CameraActivity extends AppCompatActivity { @RequiresApi(api = Build.VERSION_CODES.N) @Override public void onClick(View v) { - saveImage(); + saveImageFile(); } }); } @@ -549,15 +548,14 @@ public class CameraActivity extends AppCompatActivity { } else { - saveImage(); + saveImageFile(); } - } return super.onKeyUp(keyCode, event); } - private void saveImage(){ + private void saveImageFile(){ if(resultBitmap != null) { //파일 저장 및 DB입력 및 종료 saveBitmap(resultBitmap, filename); @@ -604,6 +602,11 @@ public class CameraActivity extends AppCompatActivity { surfaceView.setVisibility(View.GONE); pictureLayout.setVisibility(View.GONE); saveLayout.setVisibility(View.VISIBLE); + button_weightAlter.setVisibility(View.INVISIBLE); + if(box != null) + { + box.setVisibility(View.INVISIBLE); + } } else { @@ -611,6 +614,13 @@ public class CameraActivity extends AppCompatActivity { surfaceView.setVisibility(View.VISIBLE); pictureLayout.setVisibility(View.VISIBLE); saveLayout.setVisibility(View.GONE); + if(octChecker) { + button_weightAlter.setVisibility(View.VISIBLE); + } + if(box != null) + { + box.setVisibility(View.VISIBLE); + } } } @@ -618,31 +628,21 @@ public class CameraActivity extends AppCompatActivity { public void capture(){ if(dataManager.selPkg != null) pkgNo = dataManager.selPkg.getPKG_NO(); - - if(octChecker){ - - int width = mOrigin.getWidth(); - int height = mOrigin.getHeight(); - Matrix matrix = new Matrix(); - Bitmap resizedBitmap = Bitmap.createBitmap(mOrigin, 0,0,width,height,matrix,true); - resizedBitmap = resizedBitmap.copy(Bitmap.Config.ARGB_8888,true); - imageAfter(resizedBitmap); - viewToggle(); - + if(usbChecker) {//방사능량 읽어오기 위한 + if(pkgData.isEmpty()) + { + Toast.makeText(mContext, "대기중입니다.", Toast.LENGTH_SHORT).show(); + return; + } + else{ + stopFlag = true; + } } - else { + surfaceView.capture(new Camera.PictureCallback() { @RequiresApi(api = Build.VERSION_CODES.N) @Override public void onPictureTaken(byte[] data, Camera camera) { - if(usbChecker) {//방사능량 읽어오기 위한 - if(!pkgData.isEmpty()) - { - stopFlag = true; - } - } - - BitmapFactory.Options options = new BitmapFactory.Options(); //options.inSampleSize = 8; // 1/8사이즈로 보여주기 @@ -659,7 +659,7 @@ public class CameraActivity extends AppCompatActivity { } }); - } + } @@ -669,8 +669,6 @@ public class CameraActivity extends AppCompatActivity { time = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).format(currentTime); filename = time+ ".jpg"; - Matrix matrix = new Matrix(); - if(octChecker){ mOrigin = bitmap; mOrigin = getRecognitionDigit(); @@ -698,31 +696,13 @@ public class CameraActivity extends AppCompatActivity { String imgTitle = null; if(dbTestType.contains("Surface")) { - if(pkgData.isEmpty()) { - imgTitle = "표면방사선량 값 : 0.04 μSv/hr"; - } - else - { - imgTitle = "표면방사선량 값 : " + pkgData + " μSv/hr"; - } + imgTitle = "표면방사선량 값 : " + pkgData + " μSv/hr"; } else if(dbTestType.contains("M1")){ - if(pkgData.isEmpty()) { - imgTitle = "1m방사선량 값 : 0.04 μSv/hr"; - } - else{ - imgTitle = "1m방사선량 값 : "+pkgData+" μSv/hr"; - } + imgTitle = "1m방사선량 값 : "+pkgData+" μSv/hr"; } else if(dbTestType.compareTo(TestType.Weight.name()) == 0){ - if(pkgData.isEmpty()) - { - imgTitle = "무게 : 10.9 kg"; - } - else - { - imgTitle = "무게 : "+ pkgData+"kg" ; - } + imgTitle = "무게 : "+ pkgData+"kg" ; } else if(dbTestType.compareTo(TestType.Filling.name()) == 0){ @@ -752,10 +732,12 @@ public class CameraActivity extends AppCompatActivity { double aspectRatio = (double) original.getHeight() / (double) original.getWidth(); int targetHeight = (int) (resizeWidth * aspectRatio); Bitmap result = Bitmap.createScaledBitmap(original, resizeWidth, targetHeight, false); - if (result != original) { - original.recycle(); - } - return result; + Bitmap result2 = Bitmap.createBitmap(result.getWidth(),result.getHeight()+180,result.getConfig()); + Canvas canvas = new Canvas(result2); + canvas.drawBitmap(result,0,180,null); + original.recycle(); + result.recycle(); + return result2; } @@ -886,9 +868,8 @@ public class CameraActivity extends AppCompatActivity { tessBaseAPI.setImage(result); Log.i("result text", tessBaseAPI.getUTF8Text()); String str = tessBaseAPI.getUTF8Text(); - //tessBaseAPI.beginDocument(); - str.replace(" ", ""); + str = str.replace(" ", ""); char[] ch = str.toCharArray(); if(ch.length > 0) @@ -932,6 +913,14 @@ public class CameraActivity extends AppCompatActivity { } } + if(!str.isEmpty()) + { + str = str.replace(".",""); + StringBuffer sb = new StringBuffer(str); + sb.insert(str.length()-1,"."); + str = sb.toString(); + } + pkgData = str; } diff --git a/app/src/main/java/com/qtagger/Activity/PermissionChecker.java b/app/src/main/java/com/qtagger/Activity/PermissionChecker.java new file mode 100644 index 0000000..754f4b6 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/PermissionChecker.java @@ -0,0 +1,80 @@ +package com.qtagger.Activity; + +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + +import android.Manifest; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.view.View; + +import com.qtagger.MainActivity; +import com.qtagger.R; +import com.qtagger.test; +import com.qtagger.util.CommonHelper; + +public class PermissionChecker extends AppCompatActivity { + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_permission_checker); + int writePermissionCheck = ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE); + int permissionCheck = ContextCompat.checkSelfPermission(this,Manifest.permission.CAMERA); + + if(writePermissionCheck == PackageManager.PERMISSION_GRANTED && permissionCheck == PackageManager.PERMISSION_GRANTED) + { + startActivity(new Intent(getApplicationContext(), MainActivity.class)); + finish(); + } + + + + findViewById(R.id.button_permissionCheck).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + CommonHelper.CheckCameraPermission(PermissionChecker.this); + } + }); + } + + @Override + public void onRequestPermissionsResult(int requestCode, + String permissions[], int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + + boolean grantDebuedChecker = false; + + for (int grant : grantResults) + { + if(grant == PackageManager.PERMISSION_DENIED) + { + grantDebuedChecker = true; + } + } + if(grantDebuedChecker) + { + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this); + + builder.setTitle("서비스 이용 알림").setMessage("필수 권한을 허용해야\n서비스 정상 이용이 가능합니다.\n권한 요청시 반드시 허용해주세요."); + builder.setPositiveButton("확인", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + android.app.AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + else//권한 전체 부여 성공 + { + startActivity(new Intent(getApplicationContext(), MainActivity.class)); + finish(); + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java index ccec292..f349a75 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java @@ -94,8 +94,8 @@ public class RfidFragment extends Fragment { button_RfidReader = view.findViewById(R.id.button_RfidReader); try { //ATRfidManager.wakeUp(); - //rfidReader.Reset(); - rfidReader.setOperationTime(0); + ApplicationClass.rfidSetOperationTime(); + //rfidReader.setOperationTime(0); int power = rfidReader.getPower(); if(power == -1){ @@ -221,6 +221,7 @@ public class RfidFragment extends Fragment { @Override public void onDestroy() { super.onDestroy(); + /* if(rfidReader.getState() == ConnectionState.Connected) { rfidReader.disconnect(); @@ -228,7 +229,8 @@ public class RfidFragment extends Fragment { if(rfidReader.getAction() != ActionState.Stop) { rfidReader.stop(); - } + rfidReader.removeEventListener(); + }*/ } diff --git a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java index 6c26142..e83320b 100644 --- a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java @@ -2,11 +2,13 @@ package com.qtagger.Activity; import android.Manifest; import android.app.Activity; +import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; import android.view.View; +import android.widget.Toast; import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResultCallback; @@ -56,8 +58,7 @@ public class TestSelectActivity extends AppCompatActivity { dataManager.testEnum = TestEnum.발생지특성규명; //데이터 세팅 dataManager.pkgList = dataManager.dbHelper.getAllORIGIN_CHRCT(); - Intent intent = new Intent(getApplicationContext(), SearchActivity.class); - startActivity(intent); + StartSearchActivity(); } }); @@ -66,9 +67,7 @@ public class TestSelectActivity extends AppCompatActivity { public void onClick(View v) { dataManager.testEnum = TestEnum.예비검사; dataManager.pkgList = dataManager.dbHelper.getAllPREPAR_TEST(); - Intent intent = new Intent(getApplicationContext(), SearchActivity.class); - startActivity(intent); - //CommonHelper.CallCamera( thisActivity,activityResultPicture); + StartSearchActivity(); } }); @@ -79,8 +78,7 @@ public class TestSelectActivity extends AppCompatActivity { public void onClick(View v) { dataManager.testEnum = TestEnum.인수검사; dataManager.pkgList = dataManager.dbHelper.getAllACCEPT_TEST(); - Intent intent = new Intent(getApplicationContext(), SearchActivity.class); - startActivity(intent); + StartSearchActivity(); } }); @@ -89,8 +87,7 @@ public class TestSelectActivity extends AppCompatActivity { public void onClick(View v) { dataManager.testEnum = TestEnum.처분검사; dataManager.pkgList = dataManager.dbHelper.getAllDISPOSAL_TEST(); - Intent intent = new Intent(getApplicationContext(), SearchActivity.class); - startActivity(intent); + StartSearchActivity(); } }); @@ -103,4 +100,34 @@ public class TestSelectActivity extends AppCompatActivity { }); } + + //권한 점검 및 실행 + private void StartSearchActivity(){ + + //연결 안됨 + if(CommonHelper.ft232rChecker(this) == null){ + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this); + + builder.setTitle("미연결 알림").setMessage("USB 연결을 진행해야\n서비스 정상 이용이 가능합니다."); + builder.setPositiveButton("확인", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + android.app.AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + else if(CommonHelper.CheckUsbPermission(this)) + { + Toast.makeText(this, "권한이 없습니다.", Toast.LENGTH_SHORT).show(); + CommonHelper.usbDevicePermission(this); + } + else + { + Intent intent = new Intent(getApplicationContext(), SearchActivity.class); + startActivity(intent); + } + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java b/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java new file mode 100644 index 0000000..335cb58 --- /dev/null +++ b/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java @@ -0,0 +1,74 @@ +package com.qtagger.CustomPalette; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.Point; +import android.view.View; + +public class RectangleWeightCapture extends View { + + private Paint paint = new Paint(); + private Context mContext; + private static Canvas mCanvas; + + public RectangleWeightCapture(Context context) { + super(context); + mContext = context; + } + + @Override + protected void onDraw(Canvas canvas) { // Override the onDraw() Method + super.onDraw(canvas); + this.mCanvas = canvas; + + doRect(canvas); + } + + public void doRect(Canvas canvas) + { + paint.setStyle(Paint.Style.STROKE); + paint.setColor(Color.RED); + paint.setStrokeWidth(3); + + //center + int x0 = (int) (canvas.getWidth() / 2); + int y0 = (int) (canvas.getHeight() / 1.8); + int dx = (int) (canvas.getWidth() / 2.8); + int dy = (int) (canvas.getHeight() / 5.3); + //draw guide box + canvas.drawRect(x0 - dx, y0 - dy, x0 + dx, y0 + dy, paint); + + } + + public static Canvas getCanvas(){ + return mCanvas; + } + + public void doPolygon(Canvas canvas) + { + paint.setStyle(Paint.Style.STROKE); + paint.setColor(Color.RED); + paint.setStrokeWidth(3); + + //센터값 + Point center = new Point(canvas.getWidth() / 2, (canvas.getHeight() / 2)-200); + + //가운데 두개가 위 포인트, 좌우끝이 아래포인트 + int x[] = new int []{0, center.x - 370, center.x + 370, canvas.getWidth()}; // 좌측하단x, 좌측상단x, 우측상단x, 우측하단x + int y[] = new int[]{canvas.getHeight()-600, center.y+170, center.y+170, canvas.getHeight()-600}; // 좌측하단y, 좌측상단y, 우측상단y, 우측하단y + + Path wallpath = new Path(); + wallpath.reset(); // only needed when reusing this path for a new build + wallpath.moveTo(x[0], y[0]); // used for first point + wallpath.lineTo(x[1], y[1]); + wallpath.lineTo(x[2], y[2]); + wallpath.lineTo(x[3], y[3]); + wallpath.lineTo(x[0], y[0]); // there is a setLastPoint action but i found it not to work as expected + + canvas.drawPath(wallpath, paint); + + } +} diff --git a/app/src/main/java/com/qtagger/MainActivity.java b/app/src/main/java/com/qtagger/MainActivity.java index cb917fe..a159286 100644 --- a/app/src/main/java/com/qtagger/MainActivity.java +++ b/app/src/main/java/com/qtagger/MainActivity.java @@ -2,6 +2,7 @@ package com.qtagger; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.net.ConnectivityManager; @@ -54,13 +55,10 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); mSpinner = findViewById(R.id.spinner_account); - CommonHelper.CheckCameraPermission(this); - CommonHelper.CheckUsbDevice(this); + CommonHelper.usbDevicePermission(this); CommonHelper.FolderClear(); dataManager.dbHelper = new DBHelper(getApplicationContext()); - //dataManager.barcodeScanner = ATScanManager.getInstance(); - //테스트용도 나중에 삭제 findViewById(R.id.imageView).setOnClickListener(v -> { Intent intent = new Intent(getApplicationContext(), test.class); @@ -153,4 +151,5 @@ public class MainActivity extends AppCompatActivity { super.onDestroy(); } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/util/ApplicationClass.java b/app/src/main/java/com/qtagger/util/ApplicationClass.java index f8c10e0..b021eb7 100644 --- a/app/src/main/java/com/qtagger/util/ApplicationClass.java +++ b/app/src/main/java/com/qtagger/util/ApplicationClass.java @@ -11,10 +11,12 @@ import com.wsmr.lib.dev.ATRfidManager; import com.wsmr.lib.dev.ATRfidReader; import com.wsmr.lib.dev.ATScanManager; import com.wsmr.lib.dev.ATScanner; +import com.wsmr.lib.dev.rfid.exception.ATRfidReaderException; public class ApplicationClass extends Application implements Application.ActivityLifecycleCallbacks { private static boolean isBackground; + private static boolean firstRfidSettingChecker; private static ATRfidReader atRfidReader; private static ATScanner bacodeScanner; @@ -23,6 +25,7 @@ public class ApplicationClass extends Application implements Application.Activit public void onCreate() { super.onCreate(); isBackground = true; + firstRfidSettingChecker = true; atRfidReader = ATRfidManager.getInstance(); bacodeScanner = ATScanManager.getInstance(); registerActivityLifecycleCallbacks(this); @@ -36,6 +39,18 @@ public class ApplicationClass extends Application implements Application.Activit return bacodeScanner; } + public static void rfidSetOperationTime(){ + if(firstRfidSettingChecker) + { + try { + atRfidReader.setOperationTime(0); + firstRfidSettingChecker = false; + } catch (ATRfidReaderException e) { + e.printStackTrace(); + } + } + } + // 앱이 background일 때 감지 @Override public void onTrimMemory(int level) { diff --git a/app/src/main/java/com/qtagger/util/CommonHelper.java b/app/src/main/java/com/qtagger/util/CommonHelper.java index 2f25793..eaf6e83 100644 --- a/app/src/main/java/com/qtagger/util/CommonHelper.java +++ b/app/src/main/java/com/qtagger/util/CommonHelper.java @@ -2,7 +2,6 @@ package com.qtagger.util; import static android.app.Activity.RESULT_OK; -import static com.qtagger.util.DataManager.CAMERA_PERMISSIONS_REQUEST_CODE; import static com.qtagger.util.DataManager.cameraIntent; import android.Manifest; @@ -44,6 +43,8 @@ public class CommonHelper { public static String DBName = "QTagger.db"; public static String QTagger_Usb_Product_name = "FT232R USB UART"; public static int QTagger_Usb_baudRate = 9600; + public static final int CAMERA_PERMISSIONS_REQUEST_CODE = 100; + public static final int WRITE_EXTERNAL_STORAGE = 101; // 년 기준 private final static double stdrYear = 365.2422; // 시간 기준 @@ -62,31 +63,18 @@ public class CommonHelper { public static boolean CheckCameraPermission(Activity activity_this) { int writePermissionCheck = ContextCompat.checkSelfPermission(activity_this,Manifest.permission.WRITE_EXTERNAL_STORAGE); - if(writePermissionCheck == PackageManager.PERMISSION_DENIED) - { - if (ActivityCompat.shouldShowRequestPermissionRationale(activity_this,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { - //권한 설명 필요 - ActivityCompat.requestPermissions(activity_this,new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, CAMERA_PERMISSIONS_REQUEST_CODE); - } else { - ActivityCompat.requestPermissions(activity_this,new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, CAMERA_PERMISSIONS_REQUEST_CODE); - } - } - int permissionCheck = ContextCompat.checkSelfPermission(activity_this,Manifest.permission.CAMERA); - if (permissionCheck == PackageManager.PERMISSION_DENIED) { - if (ActivityCompat.shouldShowRequestPermissionRationale(activity_this,Manifest.permission.CAMERA)) { - //권한 설명 필요 - ActivityCompat.requestPermissions(activity_this,new String[] {Manifest.permission.CAMERA}, CAMERA_PERMISSIONS_REQUEST_CODE); - } else { - ActivityCompat.requestPermissions(activity_this,new String[] {Manifest.permission.CAMERA}, CAMERA_PERMISSIONS_REQUEST_CODE); - } + + if(writePermissionCheck == PackageManager.PERMISSION_DENIED || permissionCheck == PackageManager.PERMISSION_DENIED) + { + ActivityCompat.shouldShowRequestPermissionRationale(activity_this,Manifest.permission.WRITE_EXTERNAL_STORAGE); + ActivityCompat.requestPermissions(activity_this,new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}, WRITE_EXTERNAL_STORAGE); } - - return permissionCheck==PackageManager.PERMISSION_GRANTED?true:false; + return permissionCheck==PackageManager.PERMISSION_GRANTED && writePermissionCheck == PackageManager.PERMISSION_GRANTED; } - public static void CheckUsbDevice(Context context){ + public static void usbDevicePermission(Context context){ UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); UsbSerialProber usbDefaultProber = UsbSerialProber.getDefaultProber(); for(UsbDevice v : usbManager.getDeviceList().values()) { @@ -102,6 +90,47 @@ public class CommonHelper { } } + public static UsbDevice ft232rChecker(Context context){ + UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); + UsbDevice usbDevice =null; + for(UsbDevice v : usbManager.getDeviceList().values()) { + if(v.getProductName().equals("FT232R USB UART")) + { + usbDevice = v; + break; + } + } + + return usbDevice; + } + + public static boolean CheckUsbPermission(Context context){ + boolean ft232rPermission = false; + + UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); + UsbSerialProber usbDefaultProber = UsbSerialProber.getDefaultProber(); + UsbDevice usbDevice =null; + for(UsbDevice v : usbManager.getDeviceList().values()) { + if(v.getProductName().equals("FT232R USB UART")) + { + usbDevice = v; + break; + } + } + if(usbDevice == null) + { + ft232rPermission = true; + } + else + { + UsbSerialDriver sDriver = usbDefaultProber.probeDevice(usbDevice); + ft232rPermission = usbManager.hasPermission(sDriver.getDevice()); + } + + return ft232rPermission; + } + + public static void CallCamera(Activity activity, ActivityResultLauncher activityResultPicture){ boolean permission = CheckCameraPermission(activity); diff --git a/app/src/main/java/com/qtagger/util/DataManager.java b/app/src/main/java/com/qtagger/util/DataManager.java index 5123f26..3e435de 100644 --- a/app/src/main/java/com/qtagger/util/DataManager.java +++ b/app/src/main/java/com/qtagger/util/DataManager.java @@ -33,7 +33,7 @@ public class DataManager { public static TestEnum testEnum = TestEnum.선택안함; public static Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - public static final int CAMERA_PERMISSIONS_REQUEST_CODE = 100; + public List pkgList; public PKG selPkg; //public Map nuclideDataMap; diff --git a/app/src/main/res/drawable/btn_bg_ex.xml b/app/src/main/res/drawable/btn_bg_ex.xml new file mode 100644 index 0000000..d742e4a --- /dev/null +++ b/app/src/main/res/drawable/btn_bg_ex.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml index a4d4e39..b6e9747 100644 --- a/app/src/main/res/layout/activity_camera.xml +++ b/app/src/main/res/layout/activity_camera.xml @@ -7,19 +7,52 @@ android:orientation="vertical" tools:context=".Activity.CameraActivity"> - - + android:layout_weight="1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file