From fd0d9e505e09dd36554dfb7851209c9fdbc18c76 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1A3P75F\\lee" Date: Wed, 5 Oct 2022 20:34:57 +0900 Subject: [PATCH] =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 17 + .idea/misc.xml | 2 + .../111w1j12/meta/arm64-v8a/build_model.json | 6 +- .../generate_cxx_metadata_10006_timing.txt | 2 + .../generate_cxx_metadata_10012_timing.txt | 2 + .../generate_cxx_metadata_10306_timing.txt | 2 + .../generate_cxx_metadata_10370_timing.txt | 2 + .../generate_cxx_metadata_10431_timing.txt | 2 + .../generate_cxx_metadata_10705_timing.txt | 2 + .../generate_cxx_metadata_10895_timing.txt | 2 + .../generate_cxx_metadata_11080_timing.txt | 2 + .../generate_cxx_metadata_11175_timing.txt | 2 + .../generate_cxx_metadata_11359_timing.txt | 2 + .../generate_cxx_metadata_11733_timing.txt | 2 + .../generate_cxx_metadata_12059_timing.txt | 2 + .../generate_cxx_metadata_1213_timing.txt | 2 + .../generate_cxx_metadata_12409_timing.txt | 2 + .../generate_cxx_metadata_1242_timing.txt | 2 + .../generate_cxx_metadata_1244_timing.txt | 2 + .../generate_cxx_metadata_1248_timing.txt | 2 + .../generate_cxx_metadata_12746_timing.txt | 2 + .../generate_cxx_metadata_13042_timing.txt | 2 + .../generate_cxx_metadata_1330_timing.txt | 2 + .../generate_cxx_metadata_13331_timing.txt | 2 + .../generate_cxx_metadata_13713_timing.txt | 2 + .../generate_cxx_metadata_14000_timing.txt | 2 + .../generate_cxx_metadata_1502_timing.txt | 2 + .../generate_cxx_metadata_1556_timing.txt | 2 + .../generate_cxx_metadata_1564_timing.txt | 2 + .../generate_cxx_metadata_1604_timing.txt | 2 + .../generate_cxx_metadata_1632_timing.txt | 2 + .../generate_cxx_metadata_1828_timing.txt | 2 + .../generate_cxx_metadata_1903_timing.txt | 2 + .../generate_cxx_metadata_1945_timing.txt | 2 + .../generate_cxx_metadata_2019_timing.txt | 2 + .../generate_cxx_metadata_208_timing.txt | 4 + .../generate_cxx_metadata_2133_timing.txt | 2 + .../generate_cxx_metadata_214_timing.txt | 2 + .../generate_cxx_metadata_215_timing.txt | 2 + .../generate_cxx_metadata_2239_timing.txt | 2 + .../generate_cxx_metadata_226_timing.txt | 4 + .../generate_cxx_metadata_2363_timing.txt | 2 + .../generate_cxx_metadata_2450_timing.txt | 2 + .../generate_cxx_metadata_2577_timing.txt | 2 + .../generate_cxx_metadata_2637_timing.txt | 2 + .../generate_cxx_metadata_2812_timing.txt | 2 + .../generate_cxx_metadata_2862_timing.txt | 2 + .../generate_cxx_metadata_3003_timing.txt | 2 + .../generate_cxx_metadata_3035_timing.txt | 2 + .../generate_cxx_metadata_3235_timing.txt | 2 + .../generate_cxx_metadata_3419_timing.txt | 2 + .../generate_cxx_metadata_3485_timing.txt | 2 + .../generate_cxx_metadata_3583_timing.txt | 2 + .../generate_cxx_metadata_3698_timing.txt | 2 + .../generate_cxx_metadata_3834_timing.txt | 2 + .../generate_cxx_metadata_3876_timing.txt | 2 + .../generate_cxx_metadata_3967_timing.txt | 2 + .../generate_cxx_metadata_4177_timing.txt | 2 + .../generate_cxx_metadata_4220_timing.txt | 2 + .../generate_cxx_metadata_4258_timing.txt | 2 + .../generate_cxx_metadata_425_timing.txt | 2 + .../generate_cxx_metadata_4461_timing.txt | 2 + .../generate_cxx_metadata_4562_timing.txt | 2 + .../generate_cxx_metadata_4579_timing.txt | 2 + .../generate_cxx_metadata_4845_timing.txt | 2 + .../generate_cxx_metadata_4918_timing.txt | 2 + .../generate_cxx_metadata_497_timing.txt | 2 + .../generate_cxx_metadata_5137_timing.txt | 2 + .../generate_cxx_metadata_5229_timing.txt | 2 + .../generate_cxx_metadata_5428_timing.txt | 2 + .../generate_cxx_metadata_549_timing.txt | 2 + .../generate_cxx_metadata_5593_timing.txt | 2 + .../generate_cxx_metadata_570_timing.txt | 2 + .../generate_cxx_metadata_5785_timing.txt | 2 + .../generate_cxx_metadata_5858_timing.txt | 2 + .../generate_cxx_metadata_586_timing.txt | 2 + .../generate_cxx_metadata_592_timing.txt | 2 + .../generate_cxx_metadata_5955_timing.txt | 2 + .../generate_cxx_metadata_604_timing.txt | 2 + .../generate_cxx_metadata_6219_timing.txt | 2 + .../generate_cxx_metadata_627_timing.txt | 3 + .../generate_cxx_metadata_6445_timing.txt | 2 + .../generate_cxx_metadata_6563_timing.txt | 2 + .../generate_cxx_metadata_6725_timing.txt | 2 + .../generate_cxx_metadata_6852_timing.txt | 2 + .../generate_cxx_metadata_7033_timing.txt | 2 + .../generate_cxx_metadata_7123_timing.txt | 2 + .../generate_cxx_metadata_7306_timing.txt | 2 + .../generate_cxx_metadata_7461_timing.txt | 2 + .../generate_cxx_metadata_7667_timing.txt | 2 + .../generate_cxx_metadata_7798_timing.txt | 2 + .../generate_cxx_metadata_7949_timing.txt | 2 + .../generate_cxx_metadata_8091_timing.txt | 2 + .../generate_cxx_metadata_8242_timing.txt | 2 + .../generate_cxx_metadata_8385_timing.txt | 2 + .../generate_cxx_metadata_849_timing.txt | 2 + .../generate_cxx_metadata_8524_timing.txt | 2 + .../generate_cxx_metadata_8673_timing.txt | 2 + .../generate_cxx_metadata_8819_timing.txt | 2 + .../generate_cxx_metadata_887_timing.txt | 2 + .../generate_cxx_metadata_8997_timing.txt | 2 + .../generate_cxx_metadata_899_timing.txt | 2 + .../generate_cxx_metadata_9133_timing.txt | 2 + .../generate_cxx_metadata_9342_timing.txt | 2 + .../generate_cxx_metadata_9417_timing.txt | 2 + .../generate_cxx_metadata_953_timing.txt | 2 + .../generate_cxx_metadata_9679_timing.txt | 2 + .../generate_cxx_metadata_9705_timing.txt | 2 + .../generate_cxx_metadata_998_timing.txt | 2 + .../arm64-v8a/metadata_generation_record.json | 6 +- .../generate_cxx_metadata_10705_timing.txt | 2 + .../generate_cxx_metadata_11080_timing.txt | 2 + .../generate_cxx_metadata_12409_timing.txt | 2 + .../generate_cxx_metadata_1248_timing.txt | 2 + .../generate_cxx_metadata_12746_timing.txt | 2 + .../generate_cxx_metadata_13042_timing.txt | 2 + .../generate_cxx_metadata_14000_timing.txt | 2 + .../generate_cxx_metadata_1632_timing.txt | 2 + .../generate_cxx_metadata_208_timing.txt | 2 + .../generate_cxx_metadata_2637_timing.txt | 2 + .../generate_cxx_metadata_570_timing.txt | 2 + .../metadata_generation_record.json | 6 +- .../generate_cxx_metadata_10705_timing.txt | 2 + .../generate_cxx_metadata_11080_timing.txt | 2 + .../generate_cxx_metadata_12409_timing.txt | 2 + .../x86/generate_cxx_metadata_1248_timing.txt | 2 + .../generate_cxx_metadata_12746_timing.txt | 2 + .../generate_cxx_metadata_13042_timing.txt | 2 + .../generate_cxx_metadata_14000_timing.txt | 2 + .../x86/generate_cxx_metadata_1632_timing.txt | 2 + .../x86/generate_cxx_metadata_208_timing.txt | 2 + .../x86/generate_cxx_metadata_2637_timing.txt | 2 + .../x86/generate_cxx_metadata_30_timing.txt | 2 + .../x86/generate_cxx_metadata_570_timing.txt | 2 + .../meta/x86/metadata_generation_record.json | 6 +- .../generate_cxx_metadata_10705_timing.txt | 2 + .../generate_cxx_metadata_11080_timing.txt | 2 + .../generate_cxx_metadata_12409_timing.txt | 2 + .../generate_cxx_metadata_1248_timing.txt | 2 + .../generate_cxx_metadata_12746_timing.txt | 2 + .../generate_cxx_metadata_13042_timing.txt | 2 + .../generate_cxx_metadata_14000_timing.txt | 2 + .../generate_cxx_metadata_1632_timing.txt | 2 + .../generate_cxx_metadata_208_timing.txt | 2 + .../generate_cxx_metadata_2637_timing.txt | 2 + .../generate_cxx_metadata_570_timing.txt | 2 + .../x86_64/metadata_generation_record.json | 6 +- .../cxx/abi_configuration_311k5o12.log | 2 +- .../cxx/create_cxx_tasks_10211_timing.txt | 5 + .../cxx/create_cxx_tasks_10431_timing.txt | 5 + .../cxx/create_cxx_tasks_10548_timing.txt | 5 + .../cxx/create_cxx_tasks_10729_timing.txt | 5 + .../cxx/create_cxx_tasks_1079_timing.txt | 5 + .../cxx/create_cxx_tasks_10924_timing.txt | 5 + .../cxx/create_cxx_tasks_1094_timing.txt | 5 + .../cxx/create_cxx_tasks_11022_timing.txt | 5 + .../cxx/create_cxx_tasks_11213_timing.txt | 5 + .../cxx/create_cxx_tasks_11577_timing.txt | 5 + .../cxx/create_cxx_tasks_1180_timing.txt | 5 + .../cxx/create_cxx_tasks_11910_timing.txt | 5 + .../cxx/create_cxx_tasks_12246_timing.txt | 5 + .../cxx/create_cxx_tasks_12590_timing.txt | 10 + .../cxx/create_cxx_tasks_12879_timing.txt | 5 + .../cxx/create_cxx_tasks_13172_timing.txt | 15 + .../cxx/create_cxx_tasks_1336_timing.txt | 5 + .../cxx/create_cxx_tasks_1387_timing.txt | 5 + .../cxx/create_cxx_tasks_1418_timing.txt | 5 + .../cxx/create_cxx_tasks_1438_timing.txt | 10 + .../cxx/create_cxx_tasks_1472_timing.txt | 5 + .../cxx/create_cxx_tasks_1675_timing.txt | 5 + .../cxx/create_cxx_tasks_1754_timing.txt | 5 + .../cxx/create_cxx_tasks_1863_timing.txt | 10 + .../cxx/create_cxx_tasks_1969_timing.txt | 5 + .../cxx/create_cxx_tasks_2086_timing.txt | 5 + .../cxx/create_cxx_tasks_2302_timing.txt | 5 + .../cxx/create_cxx_tasks_2422_timing.txt | 5 + .../cxx/create_cxx_tasks_2479_timing.txt | 5 + .../cxx/create_cxx_tasks_2645_timing.txt | 5 + .../cxx/create_cxx_tasks_2714_timing.txt | 5 + .../cxx/create_cxx_tasks_2872_timing.txt | 15 + .../cxx/create_cxx_tasks_3003_timing.txt | 5 + .../cxx/create_cxx_tasks_3068_timing.txt | 5 + .../cxx/create_cxx_tasks_30_timing.txt | 65 ++ .../cxx/create_cxx_tasks_3338_timing.txt | 5 + .../cxx/create_cxx_tasks_339_timing.txt | 5 + .../cxx/create_cxx_tasks_3426_timing.txt | 5 + .../cxx/create_cxx_tasks_3671_timing.txt | 5 + .../cxx/create_cxx_tasks_3720_timing.txt | 5 + .../cxx/create_cxx_tasks_3813_timing.txt | 5 + .../cxx/create_cxx_tasks_4014_timing.txt | 5 + .../cxx/create_cxx_tasks_4058_timing.txt | 5 + .../cxx/create_cxx_tasks_4107_timing.txt | 5 + .../cxx/create_cxx_tasks_418_timing.txt | 5 + .../cxx/create_cxx_tasks_422_timing.txt | 5 + .../cxx/create_cxx_tasks_425_timing.txt | 10 + .../cxx/create_cxx_tasks_4297_timing.txt | 5 + .../cxx/create_cxx_tasks_4404_timing.txt | 5 + .../cxx/create_cxx_tasks_4417_timing.txt | 5 + .../cxx/create_cxx_tasks_453_timing.txt | 10 + .../cxx/create_cxx_tasks_459_timing.txt | 5 + .../cxx/create_cxx_tasks_4695_timing.txt | 5 + .../cxx/create_cxx_tasks_4749_timing.txt | 5 + .../cxx/create_cxx_tasks_4987_timing.txt | 5 + .../cxx/create_cxx_tasks_5083_timing.txt | 10 + .../cxx/create_cxx_tasks_5280_timing.txt | 5 + .../cxx/create_cxx_tasks_5618_timing.txt | 5 + .../cxx/create_cxx_tasks_5712_timing.txt | 5 + .../cxx/create_cxx_tasks_5955_timing.txt | 10 + .../cxx/create_cxx_tasks_6066_timing.txt | 10 + .../cxx/create_cxx_tasks_6578_timing.txt | 10 + .../cxx/create_cxx_tasks_6684_timing.txt | 5 + .../cxx/create_cxx_tasks_6976_timing.txt | 5 + .../cxx/create_cxx_tasks_700_timing.txt | 10 + .../cxx/create_cxx_tasks_7160_timing.txt | 5 + .../cxx/create_cxx_tasks_7310_timing.txt | 5 + .../cxx/create_cxx_tasks_739_timing.txt | 5 + .../cxx/create_cxx_tasks_7499_timing.txt | 5 + .../cxx/create_cxx_tasks_752_timing.txt | 10 + .../cxx/create_cxx_tasks_7646_timing.txt | 5 + .../cxx/create_cxx_tasks_7793_timing.txt | 5 + .../cxx/create_cxx_tasks_7939_timing.txt | 10 + .../cxx/create_cxx_tasks_8089_timing.txt | 10 + .../cxx/create_cxx_tasks_842_timing.txt | 5 + .../cxx/create_cxx_tasks_8511_timing.txt | 10 + .../cxx/create_cxx_tasks_8670_timing.txt | 5 + .../cxx/create_cxx_tasks_8965_timing.txt | 5 + .../cxx/create_cxx_tasks_9173_timing.txt | 5 + .../cxx/create_cxx_tasks_9260_timing.txt | 5 + .../cxx/create_cxx_tasks_9522_timing.txt | 5 + .../cxx/create_cxx_tasks_9557_timing.txt | 5 + .../cxx/create_cxx_tasks_9858_timing.txt | 10 + .../cxx/create_cxx_tasks_9863_timing.txt | 5 + .../cxx/ndk_locator_record_g55441w3.log | 12 +- app/src/main/AndroidManifest.xml | 4 +- .../com/qtagger/Activity/CameraActivity.java | 107 ++-- .../qtagger/Activity/PictureInfoActivity.java | 64 +- .../Activity/Search/BarcodeFragment.java | 27 +- .../qtagger/Activity/Search/ListFragment.java | 1 - .../com/qtagger/Activity/SearchActivity.java | 8 +- .../Activity/Test/CaptureFragment.java | 161 +---- .../qtagger/Activity/Test/FillFragment.java | 332 +++++----- .../qtagger/Activity/Test/InfoFragment.java | 581 ++++++++++++------ .../qtagger/Activity/Test/InsertFragment.java | 185 ++++++ .../Activity/Test/PhotographFragment.java | 139 ++++- .../qtagger/Activity/Test/WeightFragment.java | 96 ++- .../com/qtagger/Activity/TestActivity.java | 199 +++++- .../qtagger/Activity/TestSelectActivity.java | 5 - .../CustomPalette/CommonNavigationView.java | 8 +- .../CustomPalette/RectangleWeightCapture.java | 2 + .../java/com/qtagger/Data/CameraInfoSet.java | 27 + .../java/com/qtagger/Database/DBHelper.java | 62 +- .../java/com/qtagger/Database/TestType.java | 25 +- app/src/main/res/drawable-v24/btn_retake.png | Bin 1710 -> 3183 bytes app/src/main/res/drawable-v24/btn_save.png | Bin 1642 -> 3170 bytes app/src/main/res/drawable-v24/img_setup.png | Bin 0 -> 19318 bytes .../main/res/drawable-v24/img_setup_test.png | Bin 0 -> 25096 bytes app/src/main/res/drawable-v24/sub_menu01.png | Bin 1801 -> 1672 bytes app/src/main/res/drawable-v24/sub_menu02.png | Bin 1661 -> 1445 bytes app/src/main/res/drawable-v24/sub_menu03.png | Bin 1518 -> 1383 bytes app/src/main/res/drawable-v24/sub_menu04.png | Bin 1571 -> 1437 bytes .../drawable/default_fragment_background.xml | 2 - app/src/main/res/layout/activity_camera.xml | 63 +- .../main/res/layout/activity_picture_info.xml | 17 +- app/src/main/res/layout/activity_search.xml | 3 +- app/src/main/res/layout/activity_sync.xml | 72 ++- app/src/main/res/layout/activity_test2.xml | 93 +++ .../main/res/layout/activity_test_select.xml | 2 +- app/src/main/res/layout/fragment_barcode.xml | 3 +- app/src/main/res/layout/fragment_capture.xml | 6 +- app/src/main/res/layout/fragment_fill.xml | 127 +--- app/src/main/res/layout/fragment_info.xml | 124 ++-- app/src/main/res/layout/fragment_insert.xml | 69 +++ app/src/main/res/layout/fragment_list.xml | 16 +- .../main/res/layout/fragment_photograph.xml | 73 ++- app/src/main/res/layout/fragment_rfid.xml | 1 + app/src/main/res/layout/fragment_weight2.xml | 95 ++- .../main/res/layout/layout_capture_test.xml | 67 +- app/src/main/res/layout/layout_dialog2.xml | 69 +++ 278 files changed, 2915 insertions(+), 943 deletions(-) create mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10012_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10306_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10370_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10431_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10705_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10895_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11080_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11175_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11359_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11733_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12059_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1213_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12409_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1242_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1244_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1248_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12746_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13042_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1330_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13331_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13713_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14000_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1502_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1556_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1564_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1604_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1632_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1828_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1945_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2019_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_208_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2133_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_214_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2239_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2363_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2450_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2577_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2637_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2812_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2862_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3003_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3035_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3235_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3419_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3485_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3583_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3698_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3834_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3876_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3967_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4177_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4220_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_425_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4461_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4562_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4579_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4845_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4918_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_497_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5137_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5229_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5428_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_549_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5593_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_570_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5785_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5858_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_592_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5955_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_604_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6219_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_627_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6563_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6725_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6852_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7033_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7123_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7306_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7461_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7667_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7798_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7949_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8091_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8242_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8385_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_849_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8524_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8673_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8819_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_887_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8997_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_899_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9133_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9342_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9417_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_953_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9679_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9705_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_998_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_11080_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12409_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1248_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12746_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13042_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_14000_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1632_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_208_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_2637_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_570_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_11080_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12409_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1248_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12746_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13042_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_14000_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1632_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_208_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_2637_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_11080_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12409_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1248_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12746_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13042_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_14000_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1632_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_208_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_2637_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_570_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10431_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10548_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1079_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1094_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11022_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11213_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11577_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1180_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_12246_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_12590_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_13172_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1336_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1438_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1472_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1675_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1754_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1863_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1969_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2086_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2302_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2422_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2479_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2645_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2872_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3003_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3068_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3671_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3720_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3813_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4058_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4404_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4417_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_453_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4987_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5280_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5618_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5712_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5955_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_6066_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_6578_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_6684_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_6976_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7160_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7310_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_739_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_752_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7793_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7939_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_8089_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_842_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_8670_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_8965_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9173_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9260_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9522_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9557_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9858_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9863_timing.txt create mode 100644 app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java create mode 100644 app/src/main/java/com/qtagger/Data/CameraInfoSet.java create mode 100644 app/src/main/res/drawable-v24/img_setup.png create mode 100644 app/src/main/res/drawable-v24/img_setup_test.png create mode 100644 app/src/main/res/layout/fragment_insert.xml create mode 100644 app/src/main/res/layout/layout_dialog2.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..90a65c8 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bf8a0e5..4b7687f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -90,12 +90,14 @@ + + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json index dee0ffa..d63f535 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json @@ -25,7 +25,10 @@ "variantName": "debug", "isDebuggableEnabled": true, "validAbiList": [ - "ARM64_V8A" + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" ], "buildTargetSet": [ "opencv_jni_shared" @@ -125,7 +128,6 @@ "rootBuildGradleFolder": "D:\\QTagger\\a\\QTagger_Android10", "sdkFolder": "C:\\Users\\lee\\AppData\\Local\\Android\\Sdk", "isBuildOnlyTargetAbiEnabled": true, - "ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi", "isCmakeBuildCohabitationEnabled": false, "isPrefabEnabled": false }, diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_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_10012_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10012_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10012_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_10306_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10306_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10306_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_10370_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10370_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10370_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_10431_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10431_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10431_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_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10705_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10705_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_10895_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10895_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10895_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_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11080_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11080_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_11175_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11175_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11175_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_11359_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11359_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11359_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_11733_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11733_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11733_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_12059_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12059_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12059_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_1213_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1213_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1213_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_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12409_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12409_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_1242_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1242_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1242_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_1244_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1244_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1244_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_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1248_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1248_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_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12746_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12746_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_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13042_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13042_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_1330_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1330_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1330_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_13331_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13331_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13331_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_13713_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13713_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13713_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_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14000_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14000_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_1502_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1502_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1502_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_1556_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1556_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1556_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_1564_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1564_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1564_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_1604_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1604_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1604_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_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1632_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1632_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_1828_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1828_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1828_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_1903_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1903_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1903_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1903_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_1945_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1945_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1945_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_2019_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2019_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2019_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_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_208_timing.txt new file mode 100644 index 0000000..ad5cad1 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_208_timing.txt @@ -0,0 +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_2133_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2133_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2133_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_214_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_214_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_214_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_215_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_215_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_215_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_215_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_2239_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2239_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2239_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_226_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_226_timing.txt index 9708df4..1ae655d 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_226_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_226_timing.txt @@ -1,2 +1,6 @@ # C/C++ build system timings +# 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_2363_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2363_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2363_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_2450_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2450_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2450_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_2577_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2577_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2577_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_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2637_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2637_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_2812_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2812_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2812_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_2862_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2862_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2862_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_3003_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3003_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3003_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_3035_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3035_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3035_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_3235_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3235_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3235_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_3419_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3419_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3419_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_3485_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3485_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3485_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_3583_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3583_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3583_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_3698_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3698_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3698_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_3834_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3834_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3834_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_3876_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3876_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3876_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_3967_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3967_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3967_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_4177_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4177_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4177_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_4220_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4220_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4220_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_4258_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_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_425_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_425_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_425_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_4461_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4461_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4461_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_4562_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4562_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4562_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_4579_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4579_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4579_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_4845_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4845_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4845_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_4918_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4918_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4918_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_497_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_497_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_497_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_5137_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5137_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5137_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_5229_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5229_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5229_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_5428_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5428_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5428_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_549_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_549_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_549_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_5593_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5593_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5593_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_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_570_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_570_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_5785_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5785_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5785_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_5858_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5858_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5858_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_586_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_586_timing.txt index ad5cad1..1ae655d 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_586_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_586_timing.txt @@ -2,3 +2,5 @@ # 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_592_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_592_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_592_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_5955_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5955_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5955_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_604_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_604_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_604_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_6219_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6219_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6219_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_627_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_627_timing.txt new file mode 100644 index 0000000..3bd9be9 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_627_timing.txt @@ -0,0 +1,3 @@ +# C/C++ build system timings +generate_cxx_metadata 10ms + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_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_6563_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6563_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6563_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_6725_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6725_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6725_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_6852_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6852_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6852_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_7033_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7033_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7033_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_7123_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7123_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7123_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_7306_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7306_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7306_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_7461_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7461_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7461_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_7667_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7667_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7667_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_7798_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7798_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7798_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_7949_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7949_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7949_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_8091_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8091_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8091_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_8242_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8242_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8242_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_8385_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8385_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8385_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_849_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_849_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_849_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_8524_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8524_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8524_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_8673_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8673_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8673_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_8819_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8819_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8819_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_887_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_887_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_887_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_8997_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8997_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8997_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_899_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_899_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_899_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_9133_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9133_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9133_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_9342_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9342_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9342_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_9417_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9417_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9417_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_953_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_953_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_953_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_9679_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9679_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9679_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_9705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9705_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9705_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_998_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_998_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_998_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json index dc58ea3..1b4103c 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2043322810 + "memoizedHashCode": -1849808738 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1679833128 + "memoizedHashCode": -1486319056 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -940616731 + "memoizedHashCode": -747102659 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_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_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_11080_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_11080_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_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12409_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12409_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_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1248_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1248_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_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12746_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12746_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_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13042_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13042_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_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_14000_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_14000_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_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1632_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1632_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_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_208_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_208_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_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_2637_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_2637_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_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_570_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_570_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 ae23adc..839e073 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,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1277826182 + "memoizedHashCode": -130090758 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -333854324 + "memoizedHashCode": 813881100 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -782218149 + "memoizedHashCode": 365517275 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_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_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_11080_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_11080_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_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12409_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12409_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_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1248_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1248_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_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12746_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12746_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_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13042_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13042_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_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_14000_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_14000_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_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1632_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1632_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_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_208_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_208_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_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_2637_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_2637_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_30_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt index c7df4c6..f5e4ed1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt @@ -8,3 +8,5 @@ generate_cxx_metadata completed in 929ms # C/C++ build system timings +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_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 e899ea8..5aa63c8 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": 75119626 + "memoizedHashCode": 268633698 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -264009444 + "memoizedHashCode": -70495372 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -132991209 + "memoizedHashCode": 60522863 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_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_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_11080_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_11080_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_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12409_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12409_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_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1248_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1248_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_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12746_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12746_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_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13042_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13042_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_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_14000_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_14000_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_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1632_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1632_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_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_208_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_208_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_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_2637_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_2637_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_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_570_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_570_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 ac585e7..f3d85cc 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,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -364054270 + "memoizedHashCode": 783681154 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -777478940 + "memoizedHashCode": 370256484 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 61162622 + "memoizedHashCode": 1208898046 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log b/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log index 1b4a093..1353e4d 100644 --- a/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log +++ b/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log @@ -11,6 +11,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1031842563 + "memoizedHashCode": 1225356635 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_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_10431_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10431_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10431_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_10548_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10548_timing.txt new file mode 100644 index 0000000..1eabc2b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10548_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 13ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_timing.txt new file mode 100644 index 0000000..5215f74 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_timing.txt @@ -0,0 +1,5 @@ +# 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_1079_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1079_timing.txt new file mode 100644 index 0000000..4458b14 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1079_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 22ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_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_1094_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1094_timing.txt new file mode 100644 index 0000000..98b3bbc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1094_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_11022_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11022_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11022_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_11213_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11213_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11213_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_11577_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11577_timing.txt new file mode 100644 index 0000000..5215f74 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11577_timing.txt @@ -0,0 +1,5 @@ +# 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_1180_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1180_timing.txt new file mode 100644 index 0000000..82270ad --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1180_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 31ms +create_cxx_tasks completed in 32ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_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_12246_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12246_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12246_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_12590_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12590_timing.txt new file mode 100644 index 0000000..5996777 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12590_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-ndk-meta-abi-list 13ms + create-module-model completed in 16ms + [gap of 14ms] + create-initial-cxx-model completed in 30ms +create_cxx_tasks completed in 31ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_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_13172_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13172_timing.txt new file mode 100644 index 0000000..2cbb3c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13172_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 16ms +create_cxx_tasks completed in 16ms + +# 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_1336_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1336_timing.txt new file mode 100644 index 0000000..d3502d5 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1336_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 21ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt new file mode 100644 index 0000000..6c2dc5f --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 23ms +create_cxx_tasks completed in 23ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_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_1438_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1438_timing.txt new file mode 100644 index 0000000..954d10e --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1438_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 25ms + +# 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_1472_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1472_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1472_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_1675_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1675_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1675_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_1754_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1754_timing.txt new file mode 100644 index 0000000..952fea8 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1754_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_1863_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1863_timing.txt new file mode 100644 index 0000000..6e7e995 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1863_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 25ms + +# 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_1969_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1969_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1969_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_2086_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2086_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2086_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_2302_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2302_timing.txt new file mode 100644 index 0000000..9691afc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2302_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_2422_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2422_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2422_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_2479_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2479_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2479_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_2645_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2645_timing.txt new file mode 100644 index 0000000..efd7135 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2645_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 24ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2872_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2872_timing.txt new file mode 100644 index 0000000..61c8ba2 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2872_timing.txt @@ -0,0 +1,15 @@ +# 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 19ms +create_cxx_tasks completed in 20ms + +# 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_3003_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3003_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3003_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_3068_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3068_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3068_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_30_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt index 5552de8..93abac3 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt @@ -232,3 +232,68 @@ create_cxx_tasks create-initial-cxx-model 35ms create_cxx_tasks completed in 36ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 34ms +create_cxx_tasks completed in 36ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 15ms] + create-X86_64-model 24ms + [gap of 18ms] + create-initial-cxx-model completed in 57ms +create_cxx_tasks completed in 58ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 22ms + create-module-model completed in 24ms + [gap of 15ms] + create-initial-cxx-model completed in 58ms +create_cxx_tasks completed in 59ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 20ms + create-module-model completed in 23ms + [gap of 15ms] + create-initial-cxx-model completed in 55ms +create_cxx_tasks completed in 56ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 22ms] + create-ARMEABI_V7A-model 21ms + [gap of 11ms] + create-initial-cxx-model completed in 54ms +create_cxx_tasks completed in 55ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 36ms +create_cxx_tasks completed in 37ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 27ms] + create-ARM64_V8A-model 23ms + create-initial-cxx-model completed in 58ms +create_cxx_tasks completed in 60ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 15ms] + create-X86_64-model 25ms + [gap of 18ms] + create-initial-cxx-model completed in 58ms +create_cxx_tasks completed in 60ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_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_339_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_339_timing.txt index deca6ed..a8f1337 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_339_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_339_timing.txt @@ -18,3 +18,8 @@ create_cxx_tasks create-initial-cxx-model 30ms create_cxx_tasks completed in 30ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 34ms +create_cxx_tasks completed in 36ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_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_3671_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3671_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3671_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_3720_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3720_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3720_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_3813_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3813_timing.txt new file mode 100644 index 0000000..d3502d5 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3813_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 21ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_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_4058_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4058_timing.txt new file mode 100644 index 0000000..a8bd042 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4058_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 28ms +create_cxx_tasks completed in 29ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_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_418_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt index 842a4b6..9ae2896 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt @@ -41,3 +41,8 @@ create_cxx_tasks create-initial-cxx-model 32ms create_cxx_tasks completed in 33ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 27ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt index 81efe7d..3a03462 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt @@ -23,3 +23,8 @@ create_cxx_tasks create-initial-cxx-model 40ms create_cxx_tasks completed in 42ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 28ms +create_cxx_tasks completed in 30ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt new file mode 100644 index 0000000..78697cc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 33ms +create_cxx_tasks completed in 34ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 25ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_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_4404_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4404_timing.txt new file mode 100644 index 0000000..9691afc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4404_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_4417_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4417_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4417_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_453_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_453_timing.txt new file mode 100644 index 0000000..a0af67c --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_453_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 28ms +create_cxx_tasks completed in 29ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 23ms +create_cxx_tasks completed in 24ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt new file mode 100644 index 0000000..f4bbc7a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 30ms +create_cxx_tasks completed in 31ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt new file mode 100644 index 0000000..a73219e --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 27ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_timing.txt new file mode 100644 index 0000000..ffc6c5a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_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_4987_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4987_timing.txt new file mode 100644 index 0000000..efd7135 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4987_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 24ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt new file mode 100644 index 0000000..fdd8bff --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 31ms +create_cxx_tasks completed in 32ms + +# 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_5280_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5280_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5280_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5618_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5618_timing.txt new file mode 100644 index 0000000..952fea8 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5618_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_5712_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5712_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5712_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_5955_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5955_timing.txt new file mode 100644 index 0000000..a723377 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5955_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + +# 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_6066_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6066_timing.txt new file mode 100644 index 0000000..a894adf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6066_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 22ms +create_cxx_tasks completed in 23ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6578_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6578_timing.txt new file mode 100644 index 0000000..ba450f6 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6578_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 25ms +create_cxx_tasks completed in 25ms + +# 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_6684_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6684_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6684_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_6976_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6976_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6976_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt index f4bbc7a..bfa88a8 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt @@ -3,3 +3,13 @@ create_cxx_tasks create-initial-cxx-model 30ms create_cxx_tasks completed in 31ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 28ms +create_cxx_tasks completed in 29ms + +# 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_7160_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7160_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7160_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_7310_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7310_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7310_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_739_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_739_timing.txt new file mode 100644 index 0000000..a73219e --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_739_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 27ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_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_752_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_752_timing.txt new file mode 100644 index 0000000..dbde357 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_752_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 25ms +create_cxx_tasks completed in 26ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 23ms +create_cxx_tasks completed in 25ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_timing.txt new file mode 100644 index 0000000..9691afc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_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_7793_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7793_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7793_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_7939_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7939_timing.txt new file mode 100644 index 0000000..635b424 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7939_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + +# 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_8089_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8089_timing.txt new file mode 100644 index 0000000..9766745 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8089_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + +# 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_842_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_842_timing.txt new file mode 100644 index 0000000..957f2ba --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_842_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 25ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt new file mode 100644 index 0000000..bf3535c --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + +# 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_8670_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8670_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8670_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_8965_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8965_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8965_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_9173_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9173_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9173_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_9260_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9260_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9260_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_9522_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9522_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9522_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_9557_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9557_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9557_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_9858_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9858_timing.txt new file mode 100644 index 0000000..329bab9 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9858_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 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9863_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9863_timing.txt new file mode 100644 index 0000000..9691afc --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9863_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/ndk_locator_record_g55441w3.log b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log index ea3a936..a2ffc99 100644 --- a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log +++ b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1873877181 + "memoizedHashCode": 2067391253 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1628902012 + "memoizedHashCode": -1435387940 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -924440819 + "memoizedHashCode": -730926747 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 938373251 + "memoizedHashCode": 1131887323 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1215401099 + "memoizedHashCode": 1408915171 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 381663888 + "memoizedHashCode": 575177960 } ] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b886f14..36f3872 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,12 +25,12 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@drawable/logo" + android:icon="@drawable/img_setup" android:label="@string/app_name" android:largeHeap="true" android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" - android:roundIcon="@drawable/logo" + android:roundIcon="@drawable/img_setup" android:supportsRtl="true" android:theme="@style/Theme.QTagger" android:usesCleartextTraffic="true" diff --git a/app/src/main/java/com/qtagger/Activity/CameraActivity.java b/app/src/main/java/com/qtagger/Activity/CameraActivity.java index a8da3ba..f7fadd5 100644 --- a/app/src/main/java/com/qtagger/Activity/CameraActivity.java +++ b/app/src/main/java/com/qtagger/Activity/CameraActivity.java @@ -3,6 +3,7 @@ package com.qtagger.Activity; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.utils.widget.ImageFilterButton; import androidx.constraintlayout.widget.ConstraintLayout; import android.app.PendingIntent; @@ -42,6 +43,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.RelativeLayout; +import android.widget.TextView; import android.widget.Toast; import com.googlecode.tesseract.android.ResultIterator; @@ -51,6 +53,7 @@ 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.CameraInfoSet; import com.qtagger.Data.CustomProber; import com.qtagger.Data.TestEnum; import com.qtagger.Database.ImageFile; @@ -94,11 +97,13 @@ import java.util.stream.Collectors; public class CameraActivity extends AppCompatActivity { public Context mContext; ImageView imageView; + TextView textView_radValue; CameraSurfaceView surfaceView; - ConstraintLayout layout_top_menu; + ConstraintLayout layout_top_menu,constraintLayout_radValue; RelativeLayout pictureLayout; LinearLayout saveLayout; ProgressBar progressBar; + ImageFilterButton imageFilterButton_Back; String dbTestType; DataManager dataManager = DataManager.getInstance(); Bitmap resultBitmap,mOrigin; @@ -239,6 +244,7 @@ public class CameraActivity extends AppCompatActivity { double df = f; df = df / 10; pkgData = String.format("%.5f", df); + textView_radValue.setText(pkgData + " μSv/hr"); progressBar.setVisibility(View.INVISIBLE); Log.i("jjhTest!!!!!" , String.format("%.5f", df) + " μSv/hr"); } @@ -461,9 +467,6 @@ public class CameraActivity extends AppCompatActivity { detectThread.start(); } - - - //무게 인식 static { System.loadLibrary("native-lib"); @@ -494,6 +497,9 @@ public class CameraActivity extends AppCompatActivity { button_weightAlter = findViewById(R.id.button_weightAlter); progressBar = findViewById(R.id.capture_loading); layout_top_menu = findViewById(R.id.layout_top_menu); + textView_radValue = findViewById(R.id.textView_radValue); + constraintLayout_radValue = findViewById(R.id.constraintLayout_radValue); + imageFilterButton_Back = findViewById(R.id.imageFilterButton_Back); if(dbTestType == null) @@ -505,7 +511,7 @@ public class CameraActivity extends AppCompatActivity { { usbService(); progressBar.setVisibility(View.VISIBLE); - + constraintLayout_radValue.setVisibility(View.VISIBLE); } octChecker = dbTestType.compareTo(TestType.Weight.name()) == 0; @@ -517,6 +523,12 @@ public class CameraActivity extends AppCompatActivity { relativeLayout.addView(box, new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)); } + imageFilterButton_Back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + viewToggle(); + } + }); Button button = findViewById(R.id.button); button.setOnClickListener(new View.OnClickListener() { @@ -533,6 +545,18 @@ public class CameraActivity extends AppCompatActivity { viewToggle(); } }); + findViewById(R.id.button_retake).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + viewToggle(); + } + }); + findViewById(R.id.imageFilterButton_save).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + saveImageFile(); + } + }); findViewById(R.id.button_PictureSave).setOnClickListener(new View.OnClickListener() { @RequiresApi(api = Build.VERSION_CODES.N) @@ -609,6 +633,8 @@ public class CameraActivity extends AppCompatActivity { saveLayout.setVisibility(View.VISIBLE); button_weightAlter.setVisibility(View.INVISIBLE); layout_top_menu.setVisibility(View.VISIBLE); + if(usbChecker) + constraintLayout_radValue.setVisibility(View.INVISIBLE); if(box != null) { box.setVisibility(View.INVISIBLE); @@ -621,6 +647,8 @@ public class CameraActivity extends AppCompatActivity { pictureLayout.setVisibility(View.VISIBLE); saveLayout.setVisibility(View.GONE); layout_top_menu.setVisibility(View.INVISIBLE); + if(usbChecker) + constraintLayout_radValue.setVisibility(View.VISIBLE); if(octChecker) { button_weightAlter.setVisibility(View.VISIBLE); } @@ -679,7 +707,6 @@ public class CameraActivity extends AppCompatActivity { if(octChecker){ mOrigin = bitmap; mOrigin = getRecognitionDigit(); - } if(bitmap.getWidth() > 640) @@ -687,20 +714,28 @@ public class CameraActivity extends AppCompatActivity { bitmap = resizeBitmap(bitmap,640); } - String imgTitle = ""; - String dataTitle = ""; + List infoSets = new ArrayList<>(); + infoSets.add(new CameraInfoSet("포장물 ID",pkgNo)); + if(dbTestType.contains("Surface") || dbTestType.contains("M1")) { - dataTitle = "선량률"; - imgTitle = pkgData + " μSv/hr"; + String testType = dbTestType.replace("Surface_","").replace("M1_","").replace("_","-"); + infoSets.add(new CameraInfoSet("위치",testType)); + infoSets.add(new CameraInfoSet("날짜",time)); + infoSets.add(new CameraInfoSet("선량률",pkgData + " μSv/hr")); } else if(dbTestType.compareTo(TestType.Weight.name()) == 0){ - dataTitle = "무게"; - imgTitle = pkgData+"kg" ; + infoSets.add(new CameraInfoSet("날짜",time)); + infoSets.add(new CameraInfoSet("무게",pkgData + " kg")); } else if(dbTestType.compareTo(TestType.Filling.name()) == 0){ - dataTitle = "채움률"; - imgTitle = pkgData + "%"; + infoSets.add(new CameraInfoSet("날짜",time)); + infoSets.add(new CameraInfoSet("채움률",pkgData + " %")); + } + else if(dbTestType.compareTo(TestType.Nothing.name()) == 0) + { + infoSets.add(new CameraInfoSet("날짜",time)); + infoSets.add(new CameraInfoSet("설명",pkgData)); } @@ -719,20 +754,17 @@ public class CameraActivity extends AppCompatActivity { tPaint.setColor(Color.WHITE); tPaint.setStyle(Paint.Style.FILL); tPaint.setTextAlign(Paint.Align.LEFT); - cs.drawText("포장물 ID",bmpx + 30f,bmpy + 40f,tPaint); - cs.drawText("위치",bmpx + 30f,bmpy + 80f,tPaint); - cs.drawText("날짜",bmpx + 30f,bmpy + 120f,tPaint); - - cs.drawText(dataTitle,bmpx + 30f,bmpy + 160f,tPaint); + for (int i=0;i { - @Override - protected Bitmap doInBackground(Bitmap... bitmap) { - - Bitmap result = getRecognitionDigit(); - - return result; - } - - protected void onPostExecute(Bitmap result) { - //bFlag = true; - - if(result != null) - { - - } - else - { -// Toast.makeText(mContext, "이미지 반환 오류.", Toast.LENGTH_SHORT).show(); - } - } - } - public Bitmap getRecognitionDigit() { Bitmap bitmap = mOrigin; Bitmap result = null; @@ -942,7 +950,6 @@ public class CameraActivity extends AppCompatActivity { } public MatOfPoint2f findBigEdge(Mat src) -// public Mat findBigEdge(Mat src) { Mat gray = new Mat(); Mat binary = new Mat(); diff --git a/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java b/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java index de183cf..9d46de5 100644 --- a/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java +++ b/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java @@ -3,16 +3,25 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; +import android.app.Activity; +import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.view.LayoutInflater; import android.view.View; +import android.widget.Button; import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; +import com.qtagger.CustomPalette.CustomNuclideListItemAdapter; import com.qtagger.Database.ImageFile; +import com.qtagger.Database.TestType; import com.qtagger.R; import com.qtagger.util.DataManager; @@ -26,11 +35,12 @@ public class PictureInfoActivity extends AppCompatActivity { context = this; Intent intent = getIntent(); String dbTestType = intent.getStringExtra("TestType"); + String PkgData = intent.getStringExtra("PkgData"); if(dbTestType == null || dbTestType.isEmpty()) finish(); - ImageFile imageFile = dataManager.dbHelper.selectFile(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label(),dbTestType); + ImageFile imageFile = dataManager.dbHelper.selectFile(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label(),dbTestType,PkgData); if(imageFile == null) finish(); @@ -46,24 +56,58 @@ public class PictureInfoActivity extends AppCompatActivity { finish(); } }); - + + findViewById(R.id.button_retake).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent cameraIntent = new Intent(getApplicationContext(), CameraActivity.class); + cameraIntent.putExtra("TestType", dbTestType); + cameraIntent.putExtra("PkgData",PkgData); + startActivity(cameraIntent); + + finish(); + } + }); + + /* findViewById(R.id.imageFilterButton_delete).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - //삭제 로직 추가 - android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(context); - builder.setTitle("삭제 알림").setMessage("해당파일을 삭제하시겠습니까?"); - builder.setPositiveButton("삭제", new DialogInterface.OnClickListener() { + AlertDialog.Builder builder = new AlertDialog.Builder(context + , R.style.AlertDialogTheme); + + View view = LayoutInflater.from(context).inflate( + R.layout.layout_dialog2, + (LinearLayout) ((Activity)context).findViewById(R.id.layoutDialog)); + + //다이얼로그 텍스트 설정 + builder.setView(view); + + AlertDialog alertDialog = builder.create(); + + view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() { @Override - public void onClick(DialogInterface dialog, int which) { + public void onClick(View v) { + alertDialog.dismiss(); + } + }); + + view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { dataManager.dbHelper.deleteFile(imageFile); finish(); } - }).setNegativeButton("취소",null); - android.app.AlertDialog alertDialog = builder.create(); + }); + + + if (alertDialog.getWindow() != null) { + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0)); + } + alertDialog.show(); } - }); + });*/ } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java index 2eb03a1..1ff2e33 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java @@ -102,7 +102,18 @@ public class BarcodeFragment extends Fragment { && !"NR".equals(barcode) ) { barcodeStr = barcode; - showCustomDialog(); + PKG searchPkg = null; + if (!barcodeStr.isEmpty()) { + + for (PKG pkg : dataManager.pkgList) { + if (pkg.getPKG_NO().compareTo(barcodeStr) == 0) { + searchPkg = pkg; + break; + } + } + } + + showCustomDialog(searchPkg == null); } } }); @@ -126,7 +137,7 @@ public class BarcodeFragment extends Fragment { openDialogChecker = false; } - private void showCustomDialog() { + private void showCustomDialog(boolean insertChecker) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity() , R.style.AlertDialogTheme); @@ -138,9 +149,12 @@ public class BarcodeFragment extends Fragment { builder.setOnKeyListener(new DialogInterface.OnKeyListener() { @Override public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) { - openDialogChecker = true; - alertDialog.dismiss(); - setPkg(); + + if(keyCode == 138) { + openDialogChecker = true; + alertDialog.dismiss(); + setPkg(); + } return false; } }); @@ -148,7 +162,7 @@ public class BarcodeFragment extends Fragment { builder.setView(view); ((TextView) view.findViewById(R.id.textTitle)).setText("Barcode"); ((TextView) view.findViewById(R.id.textMessage)).setText(barcodeStr); - ((Button) view.findViewById(R.id.btnOk)).setText("확인"); + ((Button) view.findViewById(R.id.btnOk)).setText(insertChecker?"추가":"확인"); builder.setOnDismissListener(new DialogInterface.OnDismissListener() { @Override public void onDismiss(DialogInterface dialog) { @@ -210,7 +224,6 @@ public class BarcodeFragment extends Fragment { } } - public void barcodeReadData() { if (barcodeScanner.isDecoding()) { barcodeScanner.stopDecode(); diff --git a/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java b/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java index 428b604..b0a0e75 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java @@ -84,7 +84,6 @@ public class ListFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view =inflater.inflate(R.layout.fragment_list, container, false); - dataManager.pkgList = dataManager.dbHelper.getAllTest(dataManager.testEnum); listPkg = view.findViewById(R.id.list_pkg); /* diff --git a/app/src/main/java/com/qtagger/Activity/SearchActivity.java b/app/src/main/java/com/qtagger/Activity/SearchActivity.java index 5082455..56a1fbd 100644 --- a/app/src/main/java/com/qtagger/Activity/SearchActivity.java +++ b/app/src/main/java/com/qtagger/Activity/SearchActivity.java @@ -5,6 +5,7 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import android.content.Intent; +import android.graphics.Color; import android.graphics.Typeface; import android.os.Bundle; import android.view.KeyEvent; @@ -40,8 +41,7 @@ public class SearchActivity extends AppCompatActivity { drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); navigationView = (NavigationView) findViewById(R.id.navigationView); - - + dataManager.pkgList = dataManager.dbHelper.getAllTest(dataManager.testEnum); rfidFragment = new RfidFragment(); barcodeFragment = new BarcodeFragment(); @@ -87,6 +87,7 @@ public class SearchActivity extends AppCompatActivity { View tabViewChild = vgTab.getChildAt(i); if (tabViewChild instanceof TextView) { ((TextView) tabViewChild).setTextSize(16); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf")); } } @@ -118,6 +119,7 @@ public class SearchActivity extends AppCompatActivity { View tabViewChild = vgTab.getChildAt(i); if (tabViewChild instanceof TextView) { ((TextView) tabViewChild).setTextSize(14); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555")); } } @@ -170,9 +172,11 @@ public class SearchActivity extends AppCompatActivity { if(i==0) { ((TextView) tabViewChild).setTextSize(16); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf")); } else{ ((TextView) tabViewChild).setTextSize(14); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555")); } } } diff --git a/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java b/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java index 7a29cdb..e838250 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java @@ -40,6 +40,7 @@ import android.widget.Toast; import com.qtagger.Activity.AccountList; import com.qtagger.Activity.CameraActivity; import com.qtagger.Activity.PictureInfoActivity; +import com.qtagger.Activity.TestActivity; import com.qtagger.Data.CaptureFragmentEnum; import com.qtagger.Database.ImageFile; import com.qtagger.Database.TestType; @@ -75,13 +76,6 @@ public class CaptureFragment extends Fragment { context = container.getContext(); View view = inflater.inflate(R.layout.fragment_capture, container, false); - /* - View tobacco = view.findViewById(R.id.capture_topBack); - TextView textView = tobacco.findViewById(R.id.capture_title); - textView.setText("TOP-BACK");*/ - - - btnTopFront = view.findViewById(R.id.capture_topFront); btnTopBack = view.findViewById(R.id.capture_topBack); btnTopLeft = view.findViewById(R.id.capture_topLeft); @@ -97,96 +91,7 @@ public class CaptureFragment extends Fragment { btnBottomLeft = view.findViewById(R.id.capture_bottomLeft); btnBottomRight = view.findViewById(R.id.capture_bottomRight); - /* - btnTopFront.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(Top_Front)); - } - }); - btnTopBack.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Top_Back)); - } - }); - - btnTopLeft.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Top_Left)); - } - }); - - btnTopRight.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Top_Right)); - } - }); - - - - - btnMiddleFront.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Middle_Front)); - } - }); - - btnMiddleBack.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Middle_Back)); - } - }); - - btnMiddleLeft.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Middle_Left)); - } - }); - - btnMiddleRight.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Middle_Right)); - } - }); - - - - - btnBottomFront.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Bottom_Front)); - } - }); - - btnBottomBack.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Bottom_Back)); - } - }); - - btnBottomLeft.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Bottom_Left)); - } - }); - - btnBottomRight.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - cameraActivityOpen(Type.getTestType(TestType.Bottom_Right)); - } - });*/ @@ -200,7 +105,7 @@ public class CaptureFragment extends Fragment { TextView textView = view.findViewById(R.id.capture_title); textView.setText(title); } - //item_title + TextView textView = view.findViewById(R.id.item_title); textView.setText(type.label()); @@ -219,35 +124,26 @@ public class CaptureFragment extends Fragment { LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info); linearLayout.setVisibility(View.INVISIBLE); - linearLayout.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // - pictureInfoActivityOpen(Type.getTestType(Top_Front)); - - //Toast.makeText(context, "테스트입니다.", Toast.LENGTH_SHORT).show(); - } - }); } private void allResetView() { - resetView(btnTopFront,"TOP-FRONT", Top_Front); - resetView(btnTopBack,"TOP-BACK" ,Top_Back); - resetView(btnTopLeft,"TOP-LEFT" ,Top_Left); - resetView(btnTopRight,"TOP-RIGHT",Top_Right); + resetView(btnTopFront,"Top-Front", Top_Front); + resetView(btnTopBack,"Top-Back" ,Top_Back); + resetView(btnTopLeft,"Top-Left" ,Top_Left); + resetView(btnTopRight,"Top-Right",Top_Right); - resetView(btnMiddleFront,"MIDDLE-FRONT" ,Middle_Front); - resetView(btnMiddleBack,"MIDDLE-BACK" ,Middle_Back); - resetView(btnMiddleLeft,"MIDDLE-LEFT" ,Middle_Left); - resetView(btnMiddleRight,"MIDDLE-RIGHT",Middle_Right ); + resetView(btnMiddleFront,"Middle-Front" ,Middle_Front); + resetView(btnMiddleBack,"Middle-Back" ,Middle_Back); + resetView(btnMiddleLeft,"Middle-Left" ,Middle_Left); + resetView(btnMiddleRight,"Middle-Right",Middle_Right ); - resetView(btnBottomFront,"BOTTOM-FRONT",Bottom_Front ); - resetView(btnBottomBack,"BOTTOM-BACK" ,Bottom_Back); - resetView(btnBottomLeft,"BOTTOM-LEFT" ,Bottom_Left); - resetView(btnBottomRight,"BOTTOM-RIGHT" ,Bottom_Right); + resetView(btnBottomFront,"Bottom-Front",Bottom_Front ); + resetView(btnBottomBack,"Bottom-Back" ,Bottom_Back); + resetView(btnBottomLeft,"Bottom-Left" ,Bottom_Left); + resetView(btnBottomRight,"Bottom-Right" ,Bottom_Right); } @@ -257,9 +153,26 @@ public class CaptureFragment extends Fragment { ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add); constraintLayout.setVisibility(View.INVISIBLE); + LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info); linearLayout.setVisibility(View.VISIBLE); + linearLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + pictureInfoActivityOpen(file.getType()); + } + }); + + ImageView deleteView = view.findViewById(R.id.imageView_deleteButton); + deleteView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((TestActivity)getActivity()).deleteAlert(file, constraintLayout, linearLayout); + } + }); + + ImageView imageView = view.findViewById(R.id.nuclide_picture); imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath()))); @@ -269,9 +182,6 @@ public class CaptureFragment extends Fragment { TextView textViewData = view.findViewById(R.id.nuclide_data); textViewData.setText(file.getPkgData()+" μ㏜/hr"); - - - } @@ -287,7 +197,6 @@ public class CaptureFragment extends Fragment { List files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label()); - for(ImageFile file : files) { if(file.getType().contains(Type.name())) @@ -295,14 +204,6 @@ public class CaptureFragment extends Fragment { TestType dbType =TestType.getByName(file.getType().replace(Type.name(),"")); View selView = getTestTypeView(dbType); setInfoView(selView,file); - - /* - if(selButton != null) - { - selButton.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath()))); - selButton.setForeground(null); - }*/ - } } } diff --git a/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java b/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java index 9595919..345105f 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java @@ -1,5 +1,7 @@ package com.qtagger.Activity.Test; +import static com.qtagger.Database.TestType.Top_Front; + import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -12,6 +14,7 @@ import android.os.Build; import android.os.Bundle; import androidx.annotation.RequiresApi; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; @@ -23,10 +26,15 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.RadioButton; import android.widget.RadioGroup; +import android.widget.TextView; import com.qtagger.Activity.CameraActivity; +import com.qtagger.Activity.PictureInfoActivity; +import com.qtagger.Activity.TestActivity; import com.qtagger.Data.CaptureFragmentEnum; import com.qtagger.Database.ImageFile; import com.qtagger.Database.TestType; @@ -47,14 +55,10 @@ public class FillFragment extends Fragment { // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; - private int FillValue = -1; - Button foldingButton, btnFilling; - RadioGroup radioGroup; - EditText editText; - RadioButton radioInput; - ImageFile fillingFile = null; DataManager dataManager = DataManager.getInstance(); private Context context; + String otherValue; + View filling_100,filling_75,filling_50,filling_25,filling; // TODO: Rename and change types of parameters @@ -98,221 +102,173 @@ public class FillFragment extends Fragment { View view = inflater.inflate(R.layout.fragment_fill, container, false); context = container.getContext(); - editText = view.findViewById(R.id.editInput); - foldingButton = view.findViewById(R.id.folding_button); - radioGroup = view.findViewById(R.id.radio_fill_value); - radioInput = view.findViewById(R.id.fillInput); - btnFilling = view.findViewById(R.id.fill_Picture); - - btnFilling.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(FillValue == -1) - { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - - builder.setTitle("채움률").setMessage("채움률을 선택해주세요."); - builder.setPositiveButton("확인", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - } - }); - AlertDialog alertDialog = builder.create(); - alertDialog.show(); - } - else - { - Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class); - cameraIntent.putExtra("TestType",TestType.Filling.name()); - cameraIntent.putExtra("PkgData",Integer.toString(FillValue)); - startActivity(cameraIntent); - } - } - }); - view.findViewById(R.id.fill_OK).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(FillValue == -1) - { - foldingButton.setText("채움률 입력해주세요"); - } - else { - foldingButton.setText("채움률 : " + String.valueOf(FillValue) + "%"); - toggleLayout(); - } - } - }); - - if(FillValue == -1) - toggleLayout(); - - view.findViewById(R.id.folding_button).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - toggleLayout(); - } - }); - - RadioGroup radioGroup = view.findViewById(R.id.radio_fill_value); - radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - switch (checkedId){ - case R.id.fill100: - editText.setVisibility(View.GONE); - FillValue = 100; - break; - case R.id.fill75: - editText.setVisibility(View.GONE); - FillValue = 75; - break; - case R.id.fill50: - editText.setVisibility(View.GONE); - FillValue = 50; - break; - case R.id.fill25: - editText.setVisibility(View.GONE); - FillValue = 25; - break; - case R.id.fill0: - editText.setVisibility(View.GONE); - FillValue = 0; - break; - case R.id.fillInput: - editText.setVisibility(View.VISIBLE); - break; - - } - } - }); - - editText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if(editText.getText().toString().isEmpty()) - { - FillValue = -1; - radioInput.setText("직접입력"); - } - else - { - radioInput.setText("직접입력 ("+editText.getText().toString() +"%)" ); - FillValue = Integer.parseInt(editText.getText().toString()); - } - - if(FillValue >100) - { - FillValue = 100; - editText.setText(String.valueOf(FillValue)); - editText.setSelection(3); - } - } - }); - + filling_100 = view.findViewById(R.id.filling_100); + filling_75 = view.findViewById(R.id.filling_75); + filling_50 = view.findViewById(R.id.filling_50); + filling_25 = view.findViewById(R.id.filling_25); + filling = view.findViewById(R.id.filling); return view; } - private void toggleLayout(){ - changeLayout(radioGroup.getVisibility() == View.GONE); - } + private void resetView(View view, String title, int fillValue) + { + if(title != null && !title.isEmpty()) { + TextView textView = view.findViewById(R.id.capture_title); + textView.setText(title); + } + + TextView textView = view.findViewById(R.id.item_title); + textView.setText(""); + //textView_location + TextView textView_location = view.findViewById(R.id.textView_location); + textView_location.setText(""); + + //textView_valueTitle + TextView textView_valueTitle = view.findViewById(R.id.textView_valueTitle); + textView_valueTitle.setText("채움률"); + + + ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add); + constraintLayout.setVisibility(View.VISIBLE); + constraintLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + cameraActivityOpen(fillValue); - private void changeLayout(boolean change){ - if(change) { - foldingButton.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(getActivity(), R.drawable.arrows_left_48), null); - radioGroup.setVisibility(View.VISIBLE); - if(radioGroup.getCheckedRadioButtonId() == R.id.fillInput) - { - editText.setVisibility(View.VISIBLE); } - } - else { - foldingButton.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(getActivity(), R.drawable.arrows_down_48), null); - radioGroup.setVisibility(View.GONE); - editText.setVisibility(View.GONE); - } + }); + + //ImageView imageView = view.findViewById(R.id.imageView_deleteButton); + //imageView.setVisibility(View.INVISIBLE); + + LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info); + linearLayout.setVisibility(View.INVISIBLE); + + linearLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + pictureInfoActivityOpen(fillValue); + } + }); } + + @RequiresApi(api = Build.VERSION_CODES.M) @Override public void onStart() { super.onStart(); + otherValue = null; if(dataManager.selPkg == null) return; - int defaultColor = Color.parseColor("#C8C8C8"); - Drawable defaultDrawable = ContextCompat.getDrawable(context,R.drawable.add_picture_32); - btnFilling.setBackgroundColor(defaultColor); - btnFilling.setForeground(defaultDrawable); + resetView(filling_100,"100%",100); + resetView(filling_75,"75%",75); + resetView(filling_50,"50%",50); + resetView(filling_25,"25%",25); + resetView(filling,"직접입력",-1); + List files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label()); - ImageFile fillFile = null; - changeLayout(true); + for(ImageFile file : files) { - if(file.getType().contains(TestType.Filling.name())) + if(file.getType().compareTo(TestType.Filling.name()) == 0) { - fillFile = file; + //TestType dbType =TestType.getByName(file.getType().replace(Type.name(),"")); + View selView = getTestTypeView(file.getPkgData()); + setInfoView(selView,file); } } - if(fillFile != null) + } + + public void setInfoView(View view, ImageFile file) + { + ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add); + constraintLayout.setVisibility(View.INVISIBLE); + + LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info); + linearLayout.setVisibility(View.VISIBLE); + + ImageView deleteView = view.findViewById(R.id.imageView_deleteButton); + deleteView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((TestActivity)getActivity()).deleteAlert(file, constraintLayout, linearLayout); + } + }); + + ImageView imageView = view.findViewById(R.id.nuclide_picture); + imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath()))); + + + TextView textViewDate = view.findViewById(R.id.nuclide_date); + textViewDate.setText(file.getCreateDate()); + + TextView textViewData = view.findViewById(R.id.nuclide_data); + textViewData.setText(file.getPkgData()+"%"); + } + + public View getTestTypeView(String fillStr) + { + if(fillStr == null || fillStr.isEmpty()) + return null; + + if(fillStr.compareTo("100") == 0) { - btnFilling.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(fillFile.getFilePath()))); - btnFilling.setForeground(null); - FillValue = Integer.parseInt(fillFile.getPkgData()); - foldingButton.setText("채움률 : " + String.valueOf(FillValue) + "%"); - radioGroup.clearCheck(); - setFillingRate(); - changeLayout(false); - fillingFile = fillFile; + return filling_100; + } + else if(fillStr.compareTo("75") == 0) + { + return filling_75; + } + else if(fillStr.compareTo("50") == 0) + { + return filling_50; + } + else if(fillStr.compareTo("25") == 0) + { + return filling_25; + } + else + { + otherValue = fillStr; + return filling; } } - public void setFillingRate(){ - - if(!(FillValue<0 || FillValue>100)) + public void cameraActivityOpen(int fillValue) + { + if(fillValue == -1) { - if(FillValue == 100) - { - radioGroup.check(radioGroup.getChildAt(0).getId()); - } - else if(FillValue == 75) - { - radioGroup.check(radioGroup.getChildAt(1).getId()); - } - else if(FillValue == 50) - { - radioGroup.check(radioGroup.getChildAt(2).getId()); - } - else if(FillValue == 25) - { - radioGroup.check(radioGroup.getChildAt(3).getId()); - } - else if(FillValue == 0) - { - radioGroup.check(radioGroup.getChildAt(4).getId()); - } - else - { - editText.setText(String.valueOf(FillValue)); - radioGroup.check(radioGroup.getChildAt(5).getId()); - } + //InsertFragment 호출 + ((TestActivity)getActivity()).callInsertFragment(TestType.Filling); + } + else + { + Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class); + cameraIntent.putExtra("TestType",TestType.Filling.name()); + cameraIntent.putExtra("PkgData",Integer.toString(fillValue)); + startActivity(cameraIntent); + } + } + private void pictureInfoActivityOpen(int fillValue) + { + String pkgData = fillValue + ""; + if(fillValue == -1 && otherValue != null) + { + pkgData = otherValue; } + Intent intent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class); + intent.putExtra("TestType",TestType.Filling.name()); + intent.putExtra("PkgData",pkgData); + startActivity(intent); } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java b/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java index 30845ff..2a54227 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java @@ -62,8 +62,10 @@ public class InfoFragment extends Fragment { private ViewPager2 sliderViewPager; private int viewpagerWidth, viewpagerheight; private ImageSliderAdapter imageSliderAdapter; - private LinearLayout layoutIndicator,addInfo,nuclideInfo,layout_nuclide,layout_defaultInfo1,layout_defaultInfo2,layout_defaultInfo3; + private LinearLayout layoutIndicator,addInfo,nuclideInfo,layout_nuclide,layout_defaultInfo1,layout_defaultInfo2,layout_defaultInfo3,layout_defaultInfo4; + private TextView TextView_defaultInfo1,TextView_defaultInfo2,TextView_defaultInfo3,TextView_defaultInfo4; + private boolean lastLine = false; private TextView textPictureInfo; Button button_folding_nuclide; @@ -129,6 +131,11 @@ public class InfoFragment extends Fragment { layout_defaultInfo1 = view.findViewById(R.id.layout_defaultInfo1); layout_defaultInfo2 = view.findViewById(R.id.layout_defaultInfo2); layout_defaultInfo3 = view.findViewById(R.id.layout_defaultInfo3); + layout_defaultInfo4 = view.findViewById(R.id.layout_defaultInfo4); + TextView_defaultInfo1 = view.findViewById(R.id.TextView_defaultInfo1); + TextView_defaultInfo2 = view.findViewById(R.id.TextView_defaultInfo2); + TextView_defaultInfo3 = view.findViewById(R.id.TextView_defaultInfo3); + TextView_defaultInfo4 = view.findViewById(R.id.TextView_defaultInfo4); nuclideInfo = view.findViewById(R.id.layout_nuclideInfo); layout_nuclide = view.findViewById(R.id.layout_nuclide); addInfo = view.findViewById(R.id.layout_addInfo); @@ -156,7 +163,8 @@ public class InfoFragment extends Fragment { } private void createInfoView(){ if(dataManager.testEnum == TestEnum.발생지특성규명){ - createInfoTitle(layout_defaultInfo1,"일반 정보"); + //createInfoTitle(layout_defaultInfo1,"일반 정보"); + TextView_defaultInfo1.setText("일반 정보"); connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호")); connectViewMap.put("포장일자",createInfoTextView(layout_defaultInfo1,"포장일자")); connectViewMap.put("발생기관",createInfoTextView(layout_defaultInfo1,"발생기관")); @@ -168,19 +176,21 @@ public class InfoFragment extends Fragment { connectViewMap.put("폐기물종류",createInfoTextView(layout_defaultInfo1,"폐기물종류")); connectViewMap.put("처리 방법",createInfoTextView(layout_defaultInfo1,"처리 방법")); connectViewMap.put("총 중량(kg)",createInfoTextView(layout_defaultInfo1,"총 중량(kg)")); + lastLine = true; connectViewMap.put("내용물 중량(kg)",createInfoTextView(layout_defaultInfo1,"내용물 중량(kg)")); - createInfoTitle(layout_defaultInfo2,"포장물 검사 확인"); + //createInfoTitle(layout_defaultInfo2,"포장물 검사 확인"); + TextView_defaultInfo2.setText("포장물 검사 확인"); connectViewMap.put("판정",createInfoTextView(layout_defaultInfo2,"판정")); connectViewMap.put("특기사항",createInfoTextView(layout_defaultInfo2,"특기사항")); connectViewMap.put("자체검사일자",createInfoTextView(layout_defaultInfo2,"자체검사일자")); connectViewMap.put("검사자",createInfoTextView(layout_defaultInfo2,"검사자")); connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo2,"확인자")); connectViewMap.put("취금",createInfoTextView(layout_defaultInfo2,"유의사항")); + lastLine = true; connectViewMap.put("인도희망일자",createInfoTextView(layout_defaultInfo2,"인도희망일자")); - layout_defaultInfo3.setVisibility(View.GONE); - //createInfoTitle(defaultInfo,"핵종 정보"); + //addInfo connectViewMap.put("임계안전",createInfoTextView(addInfo,"임계안전")); @@ -194,44 +204,45 @@ public class InfoFragment extends Fragment { connectViewMap.put("핵종측정일",createInfoTextView(addInfo,"핵종측정일")); connectViewMap.put("핵종측정자",createInfoTextView(addInfo,"핵종측정자")); connectViewMap.put("핵종평가일",createInfoTextView(addInfo,"핵종평가일")); + lastLine = true; connectViewMap.put("핵종평가자",createInfoTextView(addInfo,"핵종평가자")); - - connectNuclideItemMap.put("Ag-110m",createNuclideItem(nuclideInfo,"Ag-110m")); - connectNuclideItemMap.put("C-14",createNuclideItem(nuclideInfo,"C-14")); - connectNuclideItemMap.put("Ce-144",createNuclideItem(nuclideInfo,"Ce-144")); - connectNuclideItemMap.put("Co-57",createNuclideItem(nuclideInfo,"Co-57")); - connectNuclideItemMap.put("Co-58",createNuclideItem(nuclideInfo,"Co-58")); - connectNuclideItemMap.put("Co-60",createNuclideItem(nuclideInfo,"Co-60")); - connectNuclideItemMap.put("Cr-51",createNuclideItem(nuclideInfo,"Cr-51")); - connectNuclideItemMap.put("Cs-134",createNuclideItem(nuclideInfo,"Cs-134")); - connectNuclideItemMap.put("Cs-137",createNuclideItem(nuclideInfo,"Cs-137")); - connectNuclideItemMap.put("Fe-55",createNuclideItem(nuclideInfo,"Fe-55")); - connectNuclideItemMap.put("Fe-59",createNuclideItem(nuclideInfo,"Fe-59")); - connectNuclideItemMap.put("G-Alpha",createNuclideItem(nuclideInfo,"G-Alpha")); - connectNuclideItemMap.put("H-3",createNuclideItem(nuclideInfo,"H-3")); - connectNuclideItemMap.put("I-129",createNuclideItem(nuclideInfo,"I-129")); - connectNuclideItemMap.put("Mn-54",createNuclideItem(nuclideInfo,"Mn-54")); - connectNuclideItemMap.put("Nb-94",createNuclideItem(nuclideInfo,"Nb-94")); - connectNuclideItemMap.put("Nb-95",createNuclideItem(nuclideInfo,"Nb-95")); - connectNuclideItemMap.put("Ni-59",createNuclideItem(nuclideInfo,"Ni-59")); - connectNuclideItemMap.put("Ni-63",createNuclideItem(nuclideInfo,"Ni-63")); - connectNuclideItemMap.put("Sb-125",createNuclideItem(nuclideInfo,"Sb-125")); - connectNuclideItemMap.put("Sr-90",createNuclideItem(nuclideInfo,"Sr-90")); - connectNuclideItemMap.put("Tc-99",createNuclideItem(nuclideInfo,"Tc-99")); - connectNuclideItemMap.put("Zn-65",createNuclideItem(nuclideInfo,"Zn-65")); - connectNuclideItemMap.put("Zr-95",createNuclideItem(nuclideInfo,"Zr-95")); - - - + //layout_defaultInfo3.setVisibility(View.GONE); + TextView_defaultInfo3.setText("핵종 정보(Bq/g)"); + connectViewMap.put("Ag-110m",createInfoTextView(layout_defaultInfo3,"Ag-110m")); + connectViewMap.put("C-14",createInfoTextView(layout_defaultInfo3,"C-14")); + connectViewMap.put("Ce-144",createInfoTextView(layout_defaultInfo3,"Ce-144")); + connectViewMap.put("Co-57",createInfoTextView(layout_defaultInfo3,"Co-57")); + connectViewMap.put("Co-58",createInfoTextView(layout_defaultInfo3,"Co-58")); + connectViewMap.put("Co-60",createInfoTextView(layout_defaultInfo3,"Co-60")); + connectViewMap.put("Cr-51",createInfoTextView(layout_defaultInfo3,"Cr-51")); + connectViewMap.put("Cs-134",createInfoTextView(layout_defaultInfo3,"Cs-134")); + connectViewMap.put("Cs-137",createInfoTextView(layout_defaultInfo3,"Cs-137")); + connectViewMap.put("Fe-55",createInfoTextView(layout_defaultInfo3,"Fe-55")); + connectViewMap.put("Fe-59",createInfoTextView(layout_defaultInfo3,"Fe-59")); + connectViewMap.put("G-Alpha",createInfoTextView(layout_defaultInfo3,"G-Alpha")); + connectViewMap.put("H-3",createInfoTextView(layout_defaultInfo3,"H-3")); + connectViewMap.put("I-129",createInfoTextView(layout_defaultInfo3,"I-129")); + connectViewMap.put("Mn-54",createInfoTextView(layout_defaultInfo3,"Mn-54")); + connectViewMap.put("Nb-94",createInfoTextView(layout_defaultInfo3,"Nb-94")); + connectViewMap.put("Nb-95",createInfoTextView(layout_defaultInfo3,"Nb-95")); + connectViewMap.put("Ni-59",createInfoTextView(layout_defaultInfo3,"Ni-59")); + connectViewMap.put("Ni-63",createInfoTextView(layout_defaultInfo3,"Ni-63")); + connectViewMap.put("Sb-125",createInfoTextView(layout_defaultInfo3,"Sb-125")); + connectViewMap.put("Sr-90",createInfoTextView(layout_defaultInfo3,"Sr-90")); + connectViewMap.put("Tc-99",createInfoTextView(layout_defaultInfo3,"Tc-99")); + connectViewMap.put("Zn-65",createInfoTextView(layout_defaultInfo3,"Zn-65")); + lastLine = true; + connectViewMap.put("Zr-95",createInfoTextView(layout_defaultInfo3,"Zr-95")); } else if(dataManager.testEnum == TestEnum.인수검사){ - createInfoTitle(layout_defaultInfo1,"일반 정보"); + TextView_defaultInfo1.setText("일반 정보"); connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호")); connectViewMap.put("인수검사 로트번호",createInfoTextView(layout_defaultInfo1,"인수검사 로트번호")); + lastLine = true; connectViewMap.put("검사종류",createInfoTextView(layout_defaultInfo1,"검사종류")); - createInfoTitle(layout_defaultInfo2,"전수 검사"); + TextView_defaultInfo2.setText("전수 검사"); connectViewMap.put("서류검사",createInfoTextView(layout_defaultInfo2,"서류검사")); connectViewMap.put("서류검사 특이사항",createInfoTextView(layout_defaultInfo2,"서류검사 특이사항")); connectViewMap.put("육안검사",createInfoTextView(layout_defaultInfo2,"육안검사")); @@ -241,42 +252,17 @@ public class InfoFragment extends Fragment { connectViewMap.put("총중량(kg)",createInfoTextView(layout_defaultInfo2,"총중량(kg)")); connectViewMap.put("내용물중량(kg)",createInfoTextView(layout_defaultInfo2,"내용물중량(kg)")); connectViewMap.put("검사방법",createInfoTextView(layout_defaultInfo2,"검사방법")); + lastLine = true; connectViewMap.put("파괴/비파괴 내용",createInfoTextView(layout_defaultInfo2,"파괴/비파괴 내용")); - createInfoTitle(layout_defaultInfo3,"인수검사 판정내역"); + TextView_defaultInfo3.setText("인수검사 판정내역"); connectViewMap.put("판정",createInfoTextView(layout_defaultInfo3,"판정")); connectViewMap.put("인수검사일자",createInfoTextView(layout_defaultInfo3,"인수검사일자")); connectViewMap.put("검사자",createInfoTextView(layout_defaultInfo3,"검사자")); connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo3,"확인자")); + lastLine = true; connectViewMap.put("특기사항",createInfoTextView(layout_defaultInfo3,"특기사항")); - connectNuclideItemMap.put("Ag-110m",createNuclideItem(nuclideInfo,"Ag-110m")); - connectNuclideItemMap.put("C-14",createNuclideItem(nuclideInfo,"C-14")); - connectNuclideItemMap.put("Ce-144",createNuclideItem(nuclideInfo,"Ce-144")); - connectNuclideItemMap.put("Co-57",createNuclideItem(nuclideInfo,"Co-57")); - connectNuclideItemMap.put("Co-58",createNuclideItem(nuclideInfo,"Co-58")); - connectNuclideItemMap.put("Co-60",createNuclideItem(nuclideInfo,"Co-60")); - connectNuclideItemMap.put("Cr-51",createNuclideItem(nuclideInfo,"Cr-51")); - connectNuclideItemMap.put("Cs-134",createNuclideItem(nuclideInfo,"Cs-134")); - connectNuclideItemMap.put("Cs-137",createNuclideItem(nuclideInfo,"Cs-137")); - connectNuclideItemMap.put("Eu-152",createNuclideItem(nuclideInfo,"Cs-137")); - connectNuclideItemMap.put("Fe-55",createNuclideItem(nuclideInfo,"Fe-55")); - connectNuclideItemMap.put("Fe-59",createNuclideItem(nuclideInfo,"Fe-59")); - connectNuclideItemMap.put("G-Alpha",createNuclideItem(nuclideInfo,"G-Alpha")); - connectNuclideItemMap.put("H-3",createNuclideItem(nuclideInfo,"H-3")); - connectNuclideItemMap.put("I-129",createNuclideItem(nuclideInfo,"I-129")); - connectNuclideItemMap.put("Mn-54",createNuclideItem(nuclideInfo,"Mn-54")); - connectNuclideItemMap.put("Nb-94",createNuclideItem(nuclideInfo,"Nb-94")); - connectNuclideItemMap.put("Nb-95",createNuclideItem(nuclideInfo,"Nb-95")); - connectNuclideItemMap.put("Ni-59",createNuclideItem(nuclideInfo,"Ni-59")); - connectNuclideItemMap.put("Ni-63",createNuclideItem(nuclideInfo,"Ni-63")); - connectNuclideItemMap.put("Sb-125",createNuclideItem(nuclideInfo,"Sb-125")); - connectNuclideItemMap.put("Sr-90",createNuclideItem(nuclideInfo,"Sr-90")); - connectNuclideItemMap.put("Tc-99",createNuclideItem(nuclideInfo,"Tc-99")); - connectNuclideItemMap.put("Zn-65",createNuclideItem(nuclideInfo,"Zn-65")); - connectNuclideItemMap.put("Zr-95",createNuclideItem(nuclideInfo,"Zr-95")); - - TextView_addInfo.setText("표본 검사"); connectViewMap.put("폐기물 내용물",createInfoTextView(addInfo,"폐기물 내용물")); connectViewMap.put("유리수",createInfoTextView(addInfo,"유리수")); @@ -289,59 +275,101 @@ public class InfoFragment extends Fragment { connectViewMap.put("표면오염도(Bq/cm²)",createInfoTextView(addInfo,"표면오염도(Bq/cm²)")); connectViewMap.put("표면오염도 측정일자",createInfoTextView(addInfo,"표면오염도 측정일자")); connectViewMap.put("총방사능량(MBq)",createInfoTextView(addInfo,"총방사능량(MBq)")); + lastLine = true; connectViewMap.put("핵종분석일",createInfoTextView(addInfo,"핵종분석일")); + TextView_defaultInfo4.setVisibility(View.VISIBLE); + layout_defaultInfo4.setVisibility(View.VISIBLE); + + TextView_defaultInfo4.setText("핵종정보(Bq/g)"); + connectViewMap.put("Ag-110m",createInfoTextView(layout_defaultInfo4,"Ag-110m")); + connectViewMap.put("C-14",createInfoTextView(layout_defaultInfo4,"C-14")); + connectViewMap.put("Ce-144",createInfoTextView(layout_defaultInfo4,"Ce-144")); + connectViewMap.put("Co-57",createInfoTextView(layout_defaultInfo4,"Co-57")); + connectViewMap.put("Co-58",createInfoTextView(layout_defaultInfo4,"Co-58")); + connectViewMap.put("Co-60",createInfoTextView(layout_defaultInfo4,"Co-60")); + connectViewMap.put("Cr-51",createInfoTextView(layout_defaultInfo4,"Cr-51")); + connectViewMap.put("Cs-134",createInfoTextView(layout_defaultInfo4,"Cs-134")); + connectViewMap.put("Cs-137",createInfoTextView(layout_defaultInfo4,"Cs-137")); + connectViewMap.put("Eu-152",createInfoTextView(layout_defaultInfo4,"Cs-137")); + connectViewMap.put("Fe-55",createInfoTextView(layout_defaultInfo4,"Fe-55")); + connectViewMap.put("Fe-59",createInfoTextView(layout_defaultInfo4,"Fe-59")); + connectViewMap.put("G-Alpha",createInfoTextView(layout_defaultInfo4,"G-Alpha")); + connectViewMap.put("H-3",createInfoTextView(layout_defaultInfo4,"H-3")); + connectViewMap.put("I-129",createInfoTextView(layout_defaultInfo4,"I-129")); + connectViewMap.put("Mn-54",createInfoTextView(layout_defaultInfo4,"Mn-54")); + connectViewMap.put("Nb-94",createInfoTextView(layout_defaultInfo4,"Nb-94")); + connectViewMap.put("Nb-95",createInfoTextView(layout_defaultInfo4,"Nb-95")); + connectViewMap.put("Ni-59",createInfoTextView(layout_defaultInfo4,"Ni-59")); + connectViewMap.put("Ni-63",createInfoTextView(layout_defaultInfo4,"Ni-63")); + connectViewMap.put("Sb-125",createInfoTextView(layout_defaultInfo4,"Sb-125")); + connectViewMap.put("Sr-90",createInfoTextView(layout_defaultInfo4,"Sr-90")); + connectViewMap.put("Tc-99",createInfoTextView(layout_defaultInfo4,"Tc-99")); + connectViewMap.put("Zn-65",createInfoTextView(layout_defaultInfo4,"Zn-65")); + lastLine = true; + connectViewMap.put("Zr-95",createInfoTextView(layout_defaultInfo4,"Zr-95")); + + + + } else if(dataManager.testEnum == TestEnum.처분검사){ - //처분검사는 핵종정보, 추가정보가 없음 - layout_nuclide.setVisibility(View.GONE); + TextView_addInfo.setVisibility(View.GONE); addInfo.setVisibility(View.GONE); - createInfoTitle(layout_defaultInfo1,"일반 정보"); + TextView_defaultInfo1.setText("일반 정보"); connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호")); connectViewMap.put("검사종류",createInfoTextView(layout_defaultInfo1,"검사종류")); connectViewMap.put("처분검사관리번호",createInfoTextView(layout_defaultInfo1,"처분검사관리번호")); connectViewMap.put("파괴/비파괴",createInfoTextView(layout_defaultInfo1,"파괴/비파괴")); connectViewMap.put("서류검사",createInfoTextView(layout_defaultInfo1,"서류검사")); + lastLine = true; connectViewMap.put("육안검사",createInfoTextView(layout_defaultInfo1,"육안검사")); - createInfoTitle(layout_defaultInfo2,"핵종분석"); + TextView_defaultInfo2.setText("핵종분석"); connectViewMap.put("핵종분석",createInfoTextView(layout_defaultInfo2,"핵종분석")); connectViewMap.put("핵종분석일자",createInfoTextView(layout_defaultInfo2,"핵종분석일자")); + lastLine = true; connectViewMap.put("X-Ray 검사",createInfoTextView(layout_defaultInfo2,"X-Ray 검사")); - createInfoTitle(layout_defaultInfo3,"처분검사 판정내역"); + TextView_defaultInfo3.setText("처분검사 판정내역"); connectViewMap.put("판정",createInfoTextView(layout_defaultInfo3,"판정")); connectViewMap.put("특기사항",createInfoTextView(layout_defaultInfo3,"특기사항")); connectViewMap.put("처분검사일자",createInfoTextView(layout_defaultInfo3,"처분검사일자")); connectViewMap.put("폐기물 규제 PM",createInfoTextView(layout_defaultInfo3,"폐기물 규제 PM")); + lastLine = true; connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo3,"확인자")); + } else if(dataManager.testEnum == TestEnum.예비검사){ - createInfoTitle(layout_defaultInfo1,"일반 정보"); + TextView_defaultInfo1.setText("일반 정보"); connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호")); connectViewMap.put("예비검사 로트번호",createInfoTextView(layout_defaultInfo1,"예비검사 로트번호")); connectViewMap.put("검사종류",createInfoTextView(layout_defaultInfo1,"검사종류")); connectViewMap.put("테스트1",createInfoTextView(layout_defaultInfo1,"테스트1")); + lastLine = true; connectViewMap.put("테스트2",createInfoTextView(layout_defaultInfo1,"테스트2")); - createInfoTitle(layout_defaultInfo2,"전수 검사"); + TextView_defaultInfo2.setText("전수 검사"); connectViewMap.put("서류검사",createInfoTextView(layout_defaultInfo2,"서류검사")); connectViewMap.put("서류검사 특이사항",createInfoTextView(layout_defaultInfo2,"서류검사 특이사항")); connectViewMap.put("육안검사",createInfoTextView(layout_defaultInfo2,"육안검사")); connectViewMap.put("육안검사특이사항",createInfoTextView(layout_defaultInfo2,"육안검사특이사항")); connectViewMap.put("검사방법",createInfoTextView(layout_defaultInfo2,"검사방법")); + lastLine = true; connectViewMap.put("파괴/비파괴 내용",createInfoTextView(layout_defaultInfo2,"파괴/비파괴 내용")); - createInfoTitle(layout_defaultInfo3,"예비검사 판정내역"); + + TextView_defaultInfo3.setText("예비검사 판정내역"); connectViewMap.put("판정",createInfoTextView(layout_defaultInfo3,"판정")); connectViewMap.put("예비검사일자",createInfoTextView(layout_defaultInfo3,"예비검사일자")); connectViewMap.put("검사자1",createInfoTextView(layout_defaultInfo3,"검사자1")); connectViewMap.put("검사자2",createInfoTextView(layout_defaultInfo3,"검사자2")); + lastLine = true; connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo3,"확인자")); @@ -361,35 +389,42 @@ public class InfoFragment extends Fragment { connectViewMap.put("표면방사선량률",createInfoTextView(addInfo,"표면방사선량률")); connectViewMap.put("표면선량률 측정일자",createInfoTextView(addInfo,"표면선량률 측정일자")); connectViewMap.put("총방사능량",createInfoTextView(addInfo,"총방사능량")); + lastLine = true; connectViewMap.put("핵종분석일",createInfoTextView(addInfo,"핵종분석일")); + //핵종 정보 - connectNuclideItemMap.put("Ag-110m",createNuclideItem(nuclideInfo,"Ag-110m")); - connectNuclideItemMap.put("C-14",createNuclideItem(nuclideInfo,"C-14")); - connectNuclideItemMap.put("Ce-144",createNuclideItem(nuclideInfo,"Ce-144")); - connectNuclideItemMap.put("Co-57",createNuclideItem(nuclideInfo,"Co-57")); - connectNuclideItemMap.put("Co-58",createNuclideItem(nuclideInfo,"Co-58")); - connectNuclideItemMap.put("Co-60",createNuclideItem(nuclideInfo,"Co-60")); - connectNuclideItemMap.put("Cr-51",createNuclideItem(nuclideInfo,"Cr-51")); - connectNuclideItemMap.put("Cs-134",createNuclideItem(nuclideInfo,"Cs-134")); - connectNuclideItemMap.put("Cs-137",createNuclideItem(nuclideInfo,"Cs-137")); - connectNuclideItemMap.put("Eu-152",createNuclideItem(nuclideInfo,"Eu-152")); - connectNuclideItemMap.put("Eu-154",createNuclideItem(nuclideInfo,"Eu-154")); - connectNuclideItemMap.put("Fe-55",createNuclideItem(nuclideInfo,"Fe-55")); - connectNuclideItemMap.put("Fe-59",createNuclideItem(nuclideInfo,"Fe-59")); - connectNuclideItemMap.put("G-Alpha",createNuclideItem(nuclideInfo,"G-Alpha")); - connectNuclideItemMap.put("H-3",createNuclideItem(nuclideInfo,"H-3")); - connectNuclideItemMap.put("I-129",createNuclideItem(nuclideInfo,"I-129")); - connectNuclideItemMap.put("Mn-54",createNuclideItem(nuclideInfo,"Mn-54")); - connectNuclideItemMap.put("Nb-94",createNuclideItem(nuclideInfo,"Nb-94")); - connectNuclideItemMap.put("Nb-95",createNuclideItem(nuclideInfo,"Nb-95")); - connectNuclideItemMap.put("Ni-59",createNuclideItem(nuclideInfo,"Ni-59")); - connectNuclideItemMap.put("Ni-63",createNuclideItem(nuclideInfo,"Ni-63")); - connectNuclideItemMap.put("Sb-125",createNuclideItem(nuclideInfo,"Sb-125")); - connectNuclideItemMap.put("Sr-90",createNuclideItem(nuclideInfo,"Sr-90")); - connectNuclideItemMap.put("Tc-99",createNuclideItem(nuclideInfo,"Tc-99")); - connectNuclideItemMap.put("Zn-65",createNuclideItem(nuclideInfo,"Zn-65")); - connectNuclideItemMap.put("Zr-95",createNuclideItem(nuclideInfo,"Zr-95")); + TextView_defaultInfo4.setVisibility(View.VISIBLE); + layout_defaultInfo4.setVisibility(View.VISIBLE); + TextView_defaultInfo4.setText("핵종정보(Bq/g)"); + + connectViewMap.put("Ag-110m",createInfoTextView(layout_defaultInfo4,"Ag-110m")); + connectViewMap.put("C-14",createInfoTextView(layout_defaultInfo4,"C-14")); + connectViewMap.put("Ce-144",createInfoTextView(layout_defaultInfo4,"Ce-144")); + connectViewMap.put("Co-57",createInfoTextView(layout_defaultInfo4,"Co-57")); + connectViewMap.put("Co-58",createInfoTextView(layout_defaultInfo4,"Co-58")); + connectViewMap.put("Co-60",createInfoTextView(layout_defaultInfo4,"Co-60")); + connectViewMap.put("Cr-51",createInfoTextView(layout_defaultInfo4,"Cr-51")); + connectViewMap.put("Cs-134",createInfoTextView(layout_defaultInfo4,"Cs-134")); + connectViewMap.put("Cs-137",createInfoTextView(layout_defaultInfo4,"Cs-137")); + connectViewMap.put("Eu-152",createInfoTextView(layout_defaultInfo4,"Eu-152")); + connectViewMap.put("Eu-154",createInfoTextView(layout_defaultInfo4,"Eu-154")); + connectViewMap.put("Fe-55",createInfoTextView(layout_defaultInfo4,"Fe-55")); + connectViewMap.put("Fe-59",createInfoTextView(layout_defaultInfo4,"Fe-59")); + connectViewMap.put("G-Alpha",createInfoTextView(layout_defaultInfo4,"G-Alpha")); + connectViewMap.put("H-3",createInfoTextView(layout_defaultInfo4,"H-3")); + connectViewMap.put("I-129",createInfoTextView(layout_defaultInfo4,"I-129")); + connectViewMap.put("Mn-54",createInfoTextView(layout_defaultInfo4,"Mn-54")); + connectViewMap.put("Nb-94",createInfoTextView(layout_defaultInfo4,"Nb-94")); + connectViewMap.put("Nb-95",createInfoTextView(layout_defaultInfo4,"Nb-95")); + connectViewMap.put("Ni-59",createInfoTextView(layout_defaultInfo4,"Ni-59")); + connectViewMap.put("Ni-63",createInfoTextView(layout_defaultInfo4,"Ni-63")); + connectViewMap.put("Sb-125",createInfoTextView(layout_defaultInfo4,"Sb-125")); + connectViewMap.put("Sr-90",createInfoTextView(layout_defaultInfo4,"Sr-90")); + connectViewMap.put("Tc-99",createInfoTextView(layout_defaultInfo4,"Tc-99")); + connectViewMap.put("Zn-65",createInfoTextView(layout_defaultInfo4,"Zn-65")); + lastLine = true; + connectViewMap.put("Zr-95",createInfoTextView(layout_defaultInfo4,"Zr-95")); @@ -402,6 +437,9 @@ public class InfoFragment extends Fragment { @RequiresApi(api = Build.VERSION_CODES.O) private void updateView(){ + + List files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label()); + if(dataManager.testEnum == TestEnum.발생지특성규명) { ORIGIN_CHRCT selPkg = (ORIGIN_CHRCT) dataManager.selPkg; @@ -442,39 +480,75 @@ public class InfoFragment extends Fragment { connectViewMap.get("핵종평가일").setText(selPkg.getORIGIN_PKG_NCLD_EVLTN_DATE()); connectViewMap.get("핵종평가자").setText(selPkg.getORIGIN_PKG_NCLD_EVLTR()); - String inWT = selPkg.getORIGIN_PKG_IN_WT(); - if(inWT != null && !inWT.isEmpty()) - { - inWTMbq = Double.parseDouble(selPkg.getORIGIN_PKG_IN_WT()); + connectViewMap.get("Ag-110m").setText(selPkg.getORIGIN_CHRCT_Ag_110m()); + connectViewMap.get("C-14").setText(selPkg.getORIGIN_CHRCT_C_14()); + connectViewMap.get("Ce-144").setText(selPkg.getORIGIN_CHRCT_Ce_144()); + connectViewMap.get("Co-57").setText(selPkg.getORIGIN_CHRCT_Co_57()); + connectViewMap.get("Co-58").setText(selPkg.getORIGIN_CHRCT_Co_58()); + connectViewMap.get("Co-60").setText(selPkg.getORIGIN_CHRCT_Co_60()); + connectViewMap.get("Cr-51").setText(selPkg.getORIGIN_CHRCT_Cr_51()); + connectViewMap.get("Cs-134").setText(selPkg.getORIGIN_CHRCT_Cs_134()); + connectViewMap.get("Cs-137").setText(selPkg.getORIGIN_CHRCT_Cs_137()); + connectViewMap.get("Fe-55").setText(selPkg.getORIGIN_CHRCT_Fe_55()); + connectViewMap.get("Fe-59").setText(selPkg.getORIGIN_CHRCT_Fe_59()); + connectViewMap.get("G-Alpha").setText(selPkg.getORIGIN_CHRCT_G_Alpha()); + connectViewMap.get("H-3").setText(selPkg.getORIGIN_CHRCT_H_3()); + connectViewMap.get("I-129").setText(selPkg.getORIGIN_CHRCT_I_129()); + connectViewMap.get("Mn-54").setText(selPkg.getORIGIN_CHRCT_Mn_54()); + connectViewMap.get("Nb-94").setText(selPkg.getORIGIN_CHRCT_Nb_94()); + connectViewMap.get("Nb-95").setText(selPkg.getORIGIN_CHRCT_Nb_95()); + connectViewMap.get("Ni-59").setText(selPkg.getORIGIN_CHRCT_Ni_59()); + connectViewMap.get("Ni-63").setText(selPkg.getORIGIN_CHRCT_Ni_63()); + connectViewMap.get("Sb-125").setText(selPkg.getORIGIN_CHRCT_Sb_125()); + connectViewMap.get("Sr-90").setText(selPkg.getORIGIN_CHRCT_Sr_90()); + connectViewMap.get("Tc-99").setText(selPkg.getORIGIN_CHRCT_Tc_99()); + connectViewMap.get("Zn-65").setText(selPkg.getORIGIN_CHRCT_Zn_65()); + connectViewMap.get("Zr-95").setText(selPkg.getORIGIN_CHRCT_Zr_95()); + + double maxValue = -1; + ImageFile surfaceFile = null; + ImageFile weightFile = null; + for (ImageFile imagefile : files) { + if(imagefile.getType().contains("Surface")) + { + double temp = Double.parseDouble(imagefile.getPkgData()); + if(maxValue < temp) + { + maxValue = temp; + surfaceFile = imagefile; + } + } + if(imagefile.getType().compareTo("Weight") == 0) + { + weightFile = imagefile; + } } + if(surfaceFile != null) + { + connectViewMap.get("표면방사선량률").setText(surfaceFile.getPkgData()); + connectViewMap.get("표면방사선량률").setTextColor(Color.parseColor("#408DCF")); + connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate()); + connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF")); + connectViewMap.get("표면선량률 측정자").setText(surfaceFile.getUserId()); + connectViewMap.get("표면선량률 측정자").setTextColor(Color.parseColor("#408DCF")); + } + else + { + connectViewMap.get("표면방사선량률").setTextColor(Color.BLACK); + connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK); + connectViewMap.get("표면선량률 측정자").setTextColor(Color.BLACK); + } - - setNuclideData("Ag-110m",selPkg.getORIGIN_CHRCT_Ag_110m()); - setNuclideData("C-14",selPkg.getORIGIN_CHRCT_C_14()); - setNuclideData("Ce-144",selPkg.getORIGIN_CHRCT_Ce_144()); - setNuclideData("Co-57",selPkg.getORIGIN_CHRCT_Co_57()); - setNuclideData("Co-58",selPkg.getORIGIN_CHRCT_Co_58()); - setNuclideData("Co-60",selPkg.getORIGIN_CHRCT_Co_60()); - setNuclideData("Cr-51",selPkg.getORIGIN_CHRCT_Cr_51()); - setNuclideData("Cs-134",selPkg.getORIGIN_CHRCT_Cs_134()); - setNuclideData("Cs-137",selPkg.getORIGIN_CHRCT_Cs_137()); - setNuclideData("Fe-55",selPkg.getORIGIN_CHRCT_Fe_55()); - setNuclideData("Fe-59",selPkg.getORIGIN_CHRCT_Fe_59()); - setNuclideData("G-Alpha",selPkg.getORIGIN_CHRCT_G_Alpha()); - setNuclideData("H-3",selPkg.getORIGIN_CHRCT_H_3()); - setNuclideData("I-129",selPkg.getORIGIN_CHRCT_I_129()); - setNuclideData("Mn-54",selPkg.getORIGIN_CHRCT_Mn_54()); - setNuclideData("Nb-94",selPkg.getORIGIN_CHRCT_Nb_94()); - setNuclideData("Nb-95",selPkg.getORIGIN_CHRCT_Nb_95()); - setNuclideData("Ni-59",selPkg.getORIGIN_CHRCT_Ni_59()); - setNuclideData("Ni-63",selPkg.getORIGIN_CHRCT_Ni_63()); - setNuclideData("Sb-125",selPkg.getORIGIN_CHRCT_Sb_125()); - setNuclideData("Sr-90",selPkg.getORIGIN_CHRCT_Sr_90()); - setNuclideData("Tc-99",selPkg.getORIGIN_CHRCT_Tc_99()); - setNuclideData("Zn-65",selPkg.getORIGIN_CHRCT_Zn_65()); - setNuclideData("Zr-95",selPkg.getORIGIN_CHRCT_Zr_95()); - + if(weightFile == null) + { + connectViewMap.get("총 중량(kg)").setTextColor(Color.BLACK); + } + else + { + connectViewMap.get("총 중량(kg)").setText(weightFile.getPkgData()); + connectViewMap.get("총 중량(kg)").setTextColor(Color.parseColor("#408DCF")); + } } else if(dataManager.testEnum == TestEnum.인수검사){ ACCEPT_TEST selPkg = (ACCEPT_TEST) dataManager.selPkg; @@ -515,39 +589,75 @@ public class InfoFragment extends Fragment { connectViewMap.get("총방사능량(MBq)").setText(selPkg.getACCEPT_TOT_RD_QTY()); connectViewMap.get("핵종분석일").setText(selPkg.getACCEPT_NUCLIDE_ANALS_DATE()); - String inWT = selPkg.getACCEPT_IN_WT(); - if(inWT != null && !inWT.isEmpty()) - { - inWTMbq = Double.parseDouble(selPkg.getACCEPT_IN_WT()); + + connectViewMap.get("Ag-110m").setText(selPkg.getACCEPT_TEST_Ag_110m()); + connectViewMap.get("C-14").setText(selPkg.getACCEPT_TEST_C_14()); + connectViewMap.get("Ce-144").setText(selPkg.getACCEPT_TEST_Ce_144()); + connectViewMap.get("Co-57").setText(selPkg.getACCEPT_TEST_Co_57()); + connectViewMap.get("Co-58").setText(selPkg.getACCEPT_TEST_Co_58()); + connectViewMap.get("Co-60").setText(selPkg.getACCEPT_TEST_Co_60()); + connectViewMap.get("Cr-51").setText(selPkg.getACCEPT_TEST_Cr_51()); + connectViewMap.get("Cs-134").setText(selPkg.getACCEPT_TEST_Cs_134()); + connectViewMap.get("Cs-137").setText(selPkg.getACCEPT_TEST_Cs_137()); + connectViewMap.get("Eu-152").setText(selPkg.getACCEPT_TEST_Eu_152()); + connectViewMap.get("Fe-55").setText(selPkg.getACCEPT_TEST_Fe_55()); + connectViewMap.get("Fe-59").setText(selPkg.getACCEPT_TEST_Fe_59()); + connectViewMap.get("G-Alpha").setText(selPkg.getACCEPT_TEST_G_Alpha()); + connectViewMap.get("H-3").setText(selPkg.getACCEPT_TEST_H_3()); + connectViewMap.get("I-129").setText(selPkg.getACCEPT_TEST_I_129()); + connectViewMap.get("Mn-54").setText(selPkg.getACCEPT_TEST_Mn_54()); + connectViewMap.get("Nb-94").setText(selPkg.getACCEPT_TEST_Nb_94()); + connectViewMap.get("Nb-95").setText(selPkg.getACCEPT_TEST_Nb_95()); + connectViewMap.get("Ni-59").setText(selPkg.getACCEPT_TEST_Ni_59()); + connectViewMap.get("Ni-63").setText(selPkg.getACCEPT_TEST_Ni_63()); + connectViewMap.get("Sb-125").setText(selPkg.getACCEPT_TEST_Sb_125()); + connectViewMap.get("Sr-90").setText(selPkg.getACCEPT_TEST_Sr_90()); + connectViewMap.get("Tc-99").setText(selPkg.getACCEPT_TEST_Tc_99()); + connectViewMap.get("Zn-65").setText(selPkg.getACCEPT_TEST_Zn_65()); + connectViewMap.get("Zr-95").setText(selPkg.getACCEPT_TEST_Zr_95()); + + + double maxValue = -1; + ImageFile surfaceFile = null; + ImageFile weightFile = null; + for (ImageFile imagefile : files) { + if(imagefile.getType().contains("Surface")) + { + double temp = Double.parseDouble(imagefile.getPkgData()); + if(maxValue < temp) + { + maxValue = temp; + surfaceFile = imagefile; + } + } + if(imagefile.getType().compareTo("Weight") == 0) + { + weightFile = imagefile; + } } + if(surfaceFile != null) + { + connectViewMap.get("표면방사선량률(mSv/hr)").setText(surfaceFile.getPkgData()); + connectViewMap.get("표면방사선량률(mSv/hr)").setTextColor(Color.parseColor("#408DCF")); + connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate()); + connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF")); + } + else + { + connectViewMap.get("표면방사선량률(mSv/hr)").setTextColor(Color.BLACK); + connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK); + } - setNuclideData("Ag-110m",selPkg.getACCEPT_TEST_Ag_110m()); - setNuclideData("C-14",selPkg.getACCEPT_TEST_C_14()); - setNuclideData("Ce-144",selPkg.getACCEPT_TEST_Ce_144()); - setNuclideData("Co-57",selPkg.getACCEPT_TEST_Co_57()); - setNuclideData("Co-58",selPkg.getACCEPT_TEST_Co_58()); - setNuclideData("Co-60",selPkg.getACCEPT_TEST_Co_60()); - setNuclideData("Cr-51",selPkg.getACCEPT_TEST_Cr_51()); - setNuclideData("Cs-134",selPkg.getACCEPT_TEST_Cs_134()); - setNuclideData("Cs-137",selPkg.getACCEPT_TEST_Cs_137()); - setNuclideData("Eu-152",selPkg.getACCEPT_TEST_Eu_152()); - setNuclideData("Fe-55",selPkg.getACCEPT_TEST_Fe_55()); - setNuclideData("Fe-59",selPkg.getACCEPT_TEST_Fe_59()); - setNuclideData("G-Alpha",selPkg.getACCEPT_TEST_G_Alpha()); - setNuclideData("H-3",selPkg.getACCEPT_TEST_H_3()); - setNuclideData("I-129",selPkg.getACCEPT_TEST_I_129()); - setNuclideData("Mn-54",selPkg.getACCEPT_TEST_Mn_54()); - setNuclideData("Nb-94",selPkg.getACCEPT_TEST_Nb_94()); - setNuclideData("Nb-95",selPkg.getACCEPT_TEST_Nb_95()); - setNuclideData("Ni-59",selPkg.getACCEPT_TEST_Ni_59()); - setNuclideData("Ni-63",selPkg.getACCEPT_TEST_Ni_63()); - setNuclideData("Sb-125",selPkg.getACCEPT_TEST_Sb_125()); - setNuclideData("Sr-90",selPkg.getACCEPT_TEST_Sr_90()); - setNuclideData("Tc-99",selPkg.getACCEPT_TEST_Tc_99()); - setNuclideData("Zn-65",selPkg.getACCEPT_TEST_Zn_65()); - setNuclideData("Zr-95",selPkg.getACCEPT_TEST_Zr_95()); - + if(weightFile == null) + { + connectViewMap.get("총중량(kg)").setTextColor(Color.BLACK); + } + else + { + connectViewMap.get("총중량(kg)").setText(weightFile.getPkgData()); + connectViewMap.get("총중량(kg)").setTextColor(Color.parseColor("#408DCF")); + } } else if(dataManager.testEnum == TestEnum.처분검사){ @@ -615,40 +725,91 @@ public class InfoFragment extends Fragment { connectViewMap.get("핵종분석일").setText(selPkg.getPREPAR_NUCLIDE_ANALS_DATE()); - String inWT = selPkg.getPREPAR_IN_WT(); - if(inWT != null && !inWT.isEmpty()) - { - inWTMbq = Double.parseDouble(selPkg.getPREPAR_IN_WT()); + connectViewMap.get("Ag-110m").setText(selPkg.getPREPAR_TEST_Ag_110m()); + connectViewMap.get("C-14").setText(selPkg.getPREPAR_TEST_C_14()); + connectViewMap.get("Ce-144").setText(selPkg.getPREPAR_TEST_Ce_144()); + connectViewMap.get("Co-57").setText(selPkg.getPREPAR_TEST_Co_57()); + connectViewMap.get("Co-58").setText(selPkg.getPREPAR_TEST_Co_58()); + connectViewMap.get("Co-60").setText(selPkg.getPREPAR_TEST_Co_60()); + connectViewMap.get("Cr-51").setText(selPkg.getPREPAR_TEST_Cr_51()); + connectViewMap.get("Cs-134").setText(selPkg.getPREPAR_TEST_Cs_134()); + connectViewMap.get("Cs-137").setText(selPkg.getPREPAR_TEST_Cs_137()); + connectViewMap.get("Eu-152").setText(selPkg.getPREPAR_TEST_Eu_152()); + connectViewMap.get("Eu-154").setText(selPkg.getPREPAR_TEST_Eu_154()); + connectViewMap.get("Fe-55").setText(selPkg.getPREPAR_TEST_Fe_55()); + connectViewMap.get("Fe-59").setText(selPkg.getPREPAR_TEST_Fe_59()); + connectViewMap.get("G-Alpha").setText(selPkg.getPREPAR_TEST_G_Alpha()); + connectViewMap.get("H-3").setText(selPkg.getPREPAR_TEST_H_3()); + connectViewMap.get("I-129").setText(selPkg.getPREPAR_TEST_I_129()); + connectViewMap.get("Mn-54").setText(selPkg.getPREPAR_TEST_Mn_54()); + connectViewMap.get("Nb-94").setText(selPkg.getPREPAR_TEST_Nb_94()); + connectViewMap.get("Nb-95").setText(selPkg.getPREPAR_TEST_Nb_95()); + connectViewMap.get("Ni-59").setText(selPkg.getPREPAR_TEST_Ni_59()); + connectViewMap.get("Ni-63").setText(selPkg.getPREPAR_TEST_Ni_63()); + connectViewMap.get("Sb-125").setText(selPkg.getPREPAR_TEST_Sb_125()); + connectViewMap.get("Sr-90").setText(selPkg.getPREPAR_TEST_Sr_90()); + connectViewMap.get("Tc-99").setText(selPkg.getPREPAR_TEST_Tc_99()); + connectViewMap.get("Zn-65").setText(selPkg.getPREPAR_TEST_Zn_65()); + connectViewMap.get("Zr-95").setText(selPkg.getPREPAR_TEST_Zr_95()); + + + double maxValue = -1; + ImageFile surfaceFile = null; + ImageFile weightFile = null; + ImageFile fillFile = null; + for (ImageFile imagefile : files) { + if(imagefile.getType().contains("Surface")) + { + double temp = Double.parseDouble(imagefile.getPkgData()); + if(maxValue < temp) + { + maxValue = temp; + surfaceFile = imagefile; + } + } + if(imagefile.getType().compareTo("Weight") == 0) + { + weightFile = imagefile; + } + if(fillFile.getType().compareTo("Filling") == 0) + { + fillFile = imagefile; + } } - setNuclideData("Ag-110m",selPkg.getPREPAR_TEST_Ag_110m()); - setNuclideData("C-14",selPkg.getPREPAR_TEST_C_14()); - setNuclideData("Ce-144",selPkg.getPREPAR_TEST_Ce_144()); - setNuclideData("Co-57",selPkg.getPREPAR_TEST_Co_57()); - setNuclideData("Co-58",selPkg.getPREPAR_TEST_Co_58()); - setNuclideData("Co-60",selPkg.getPREPAR_TEST_Co_60()); - setNuclideData("Cr-51",selPkg.getPREPAR_TEST_Cr_51()); - setNuclideData("Cs-134",selPkg.getPREPAR_TEST_Cs_134()); - setNuclideData("Cs-137",selPkg.getPREPAR_TEST_Cs_137()); - setNuclideData("Eu-152",selPkg.getPREPAR_TEST_Eu_152()); - setNuclideData("Eu-154",selPkg.getPREPAR_TEST_Eu_154()); - setNuclideData("Fe-55",selPkg.getPREPAR_TEST_Fe_55()); - setNuclideData("Fe-59",selPkg.getPREPAR_TEST_Fe_59()); - setNuclideData("G-Alpha",selPkg.getPREPAR_TEST_G_Alpha()); - setNuclideData("H-3",selPkg.getPREPAR_TEST_H_3()); - setNuclideData("I-129",selPkg.getPREPAR_TEST_I_129()); - setNuclideData("Mn-54",selPkg.getPREPAR_TEST_Mn_54()); - setNuclideData("Nb-94",selPkg.getPREPAR_TEST_Nb_94()); - setNuclideData("Nb-95",selPkg.getPREPAR_TEST_Nb_95()); - setNuclideData("Ni-59",selPkg.getPREPAR_TEST_Ni_59()); - setNuclideData("Ni-63",selPkg.getPREPAR_TEST_Ni_63()); - setNuclideData("Sb-125",selPkg.getPREPAR_TEST_Sb_125()); - setNuclideData("Sr-90",selPkg.getPREPAR_TEST_Sr_90()); - setNuclideData("Tc-99",selPkg.getPREPAR_TEST_Tc_99()); - setNuclideData("Zn-65",selPkg.getPREPAR_TEST_Zn_65()); - setNuclideData("Zr-95",selPkg.getPREPAR_TEST_Zr_95()); + if(surfaceFile != null) + { + connectViewMap.get("표면방사선량률").setText(surfaceFile.getPkgData()); + connectViewMap.get("표면방사선량률").setTextColor(Color.parseColor("#408DCF")); + connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate()); + connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF")); + } + else + { + connectViewMap.get("표면방사선량률").setTextColor(Color.BLACK); + connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK); + } + if(weightFile == null) + { + connectViewMap.get("총중량(kg)").setTextColor(Color.BLACK); + } + else + { + connectViewMap.get("총중량(kg)").setText(weightFile.getPkgData()); + connectViewMap.get("총중량(kg)").setTextColor(Color.parseColor("#408DCF")); + } + /* + if(fillFile == null) + { + connectViewMap.get("채움률(%)").setTextColor(Color.BLACK); + } + else + { + connectViewMap.get("채움률(%)").setText(weightFile.getPkgData()); + connectViewMap.get("채움률(%)").setTextColor(Color.parseColor("#408DCF")); + }*/ } } @@ -672,13 +833,25 @@ public class InfoFragment extends Fragment { LinearLayout.LayoutParams.MATCH_PARENT, inttodp(1)); View view = new View(context); - view.setBackgroundColor(Color.BLACK); + view.setBackgroundColor(Color.parseColor("#f3f3f3")); view.setLayoutParams(viewLayout); linearLayout.addView(editText); linearLayout.addView(view); } + public View createLine(){ + + LinearLayout.LayoutParams viewLayout = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + inttodp(1)); + View view = new View(context); + view.setBackgroundColor(Color.parseColor("#f3f3f3")); + view.setLayoutParams(viewLayout); + return view; + + } + public TextView createInfoTextView(LinearLayout linearLayout, String title){ LinearLayout t1 = new LinearLayout(context); @@ -696,11 +869,11 @@ public class InfoFragment extends Fragment { TextView editText = new TextView(context); editText.setText(title); editText.setGravity(Gravity.LEFT); - editText.setTextColor(Color.BLACK); - editText.setPadding(inttodp(10),0,0,0); - editText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16); + //editText.setTextColor(Color.BLACK); + editText.setPadding(inttodp(20),inttodp(5),0,inttodp(5)); + //editText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16); editText.setLayoutParams(titleParam); - editText.setBackgroundResource(R.drawable.table_item_background); + //editText.setBackgroundResource(R.drawable.table_item_background); LinearLayout.LayoutParams infoTextParam = new LinearLayout.LayoutParams( 0, @@ -708,20 +881,26 @@ public class InfoFragment extends Fragment { infoTextParam.weight = 1; TextView infoText = new TextView(context); - infoText.setText(dataManager.selPkg.getPKG_NO()); + //infoText.setText(dataManager.selPkg.getPKG_NO()); infoText.setGravity(Gravity.LEFT); infoText.setTextColor(Color.BLACK); - infoText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16); - editText.setPadding(inttodp(10),0,inttodp(10),0); + //infoText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16); + infoText.setPadding(inttodp(10),inttodp(5),inttodp(10),inttodp(5)); infoText.setLayoutParams(infoTextParam); infoText.setText(""); - infoText.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END); - infoText.setBackgroundResource(R.drawable.table_item_background); + //infoText.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END); + infoText.setTypeface(null,Typeface.BOLD); + //infoText.setBackgroundResource(R.drawable.table_item_background); t1.addView(editText); t1.addView(infoText); linearLayout.addView(t1); + if(!lastLine) { + linearLayout.addView(createLine()); + } + else + lastLine = false; return infoText; } @@ -810,11 +989,13 @@ public class InfoFragment extends Fragment { if(dataManager.selPkg == null) return; - viewpagerWidth = sliderViewPager.getWidth(); - viewpagerheight = sliderViewPager.getHeight(); updateView(); + /* + viewpagerWidth = sliderViewPager.getWidth(); + viewpagerheight = sliderViewPager.getHeight(); + imageSliderAdapter = new ImageSliderAdapter(context, null); sliderViewPager.setOffscreenPageLimit(1); @@ -847,7 +1028,7 @@ public class InfoFragment extends Fragment { } } } - setupIndicators(imageSliderAdapter.getItemCount()); + setupIndicators(imageSliderAdapter.getItemCount());*/ } private void setupIndicators(int count) { diff --git a/app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java b/app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java new file mode 100644 index 0000000..b6f85ae --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java @@ -0,0 +1,185 @@ +package com.qtagger.Activity.Test; + +import android.content.Intent; +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.text.Editable; +import android.text.InputType; +import android.text.TextWatcher; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.TextView; + +import com.qtagger.Activity.CameraActivity; +import com.qtagger.Activity.TestActivity; +import com.qtagger.Database.TestType; +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link InsertFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class InsertFragment extends Fragment { + + //채움률, 사진촬영만 씀 + public TestType type; + + EditText editText_value; + Button button_Picture; + TextView textView_title; + ImageView itemButton; + + + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + public InsertFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment InsertFragment. + */ + // TODO: Rename and change types and number of parameters + public static InsertFragment newInstance(String param1, String param2) { + InsertFragment fragment = new InsertFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_insert, container, false); + + editText_value = view.findViewById(R.id.editText_value); + button_Picture = view.findViewById(R.id.button_Picture); + textView_title = view.findViewById(R.id.textView_title); + itemButton = view.findViewById(R.id.itemButton); + + + button_Picture.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + String pkgData = editText_value.getText().toString(); + + //카메라 오픈 + if(type == TestType.Filling) + { + if(pkgData.isEmpty()) + return; + } + + Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class); + cameraIntent.putExtra("TestType",type.name()); + cameraIntent.putExtra("PkgData",pkgData); + startActivity(cameraIntent); + + ((TestActivity)getActivity()).resetFragment(); + + } + }); + + itemButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((TestActivity)getActivity()).resetFragment(); + } + }); + + editText_value.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + @Override + public void afterTextChanged(Editable s) { + if(type == TestType.Nothing) + return; + + String str = editText_value.getText().toString(); + if(str == null || str.isEmpty()) + return; + + + double FillValue = Double.parseDouble(editText_value.getText().toString()); + if(FillValue >100) + { + FillValue = 100; + editText_value.setText(String.valueOf(FillValue)); + editText_value.setSelection(3); + } + } + }); + + + return view; + } + + + @Override + public void onStart() { + super.onStart(); + + if(type == null) + { + return; + } + editText_value.setText(""); + + if(type == TestType.Filling)//숫자만 입력 + { + editText_value.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL); + textView_title.setText("직접 입력"); + editText_value.setHint("채움률을 입력해주세요."); + + } + else if(type == TestType.Nothing) + { + editText_value.setInputType(InputType.TYPE_CLASS_TEXT); + textView_title.setText("사진 설명 입력"); + editText_value.setHint("설명을 입력해주세요."); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + type = null; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java index 8e7f5c5..cf63071 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java @@ -3,9 +3,13 @@ package com.qtagger.Activity.Test; import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_OK; +import android.app.AlertDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; @@ -15,6 +19,7 @@ import androidx.activity.result.ActivityResultCallback; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.RequiresApi; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; import android.provider.MediaStore; @@ -23,22 +28,32 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TableLayout; +import android.widget.TextView; import android.widget.Toast; import com.qtagger.Activity.CameraActivity; +import com.qtagger.Activity.PictureInfoActivity; +import com.qtagger.Activity.TestActivity; +import com.qtagger.Database.ImageFile; import com.qtagger.Database.TestType; import com.qtagger.R; import com.qtagger.util.CommonHelper; import com.qtagger.util.DataManager; +import java.util.ArrayList; +import java.util.List; + /** * A simple {@link Fragment} subclass. * Use the {@link PhotographFragment#newInstance} factory method to * create an instance of this fragment. */ public class PhotographFragment extends Fragment { - View view; - Button pictureAdd; + LinearLayout linearLayout_pictureList; + Context context; private DataManager dataManager = DataManager.getInstance(); private static final int Image_Capture_Code = 1; // TODO: Rename parameter arguments, choose names that match @@ -84,21 +99,18 @@ public class PhotographFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_photograph, container, false); + View view = inflater.inflate(R.layout.fragment_photograph, container, false); + context = container.getContext(); - //button_img_add - pictureAdd = view.findViewById(R.id.button_img_add); + linearLayout_pictureList = view.findViewById(R.id.linearLayout_pictureList); - pictureAdd.setOnClickListener(new View.OnClickListener() { + view.findViewById(R.id.capture_add).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class); - startActivity(cameraIntent); - + ((TestActivity)getActivity()).callInsertFragment(TestType.Nothing); } }); - - // Inflate the layout for this fragment + return view; } @@ -107,5 +119,110 @@ public class PhotographFragment extends Fragment { super.onStart(); if(dataManager.selPkg == null) return; + + resetView(); + } + + public void resetView() + { + linearLayout_pictureList.removeAllViews(); + + List files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label()); + for(ImageFile file : files) + { + if(file.getType().compareTo(TestType.Nothing.name()) == 0) + { + LinearLayout linearLayout = new LinearLayout(context); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT); + linearLayout.setLayoutParams(params); + + linearLayout_pictureList.addView(linearLayout); + + LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View imageView = inflater.inflate(R.layout.layout_capture_test, linearLayout, true); + setInfoView(imageView,file); + } + } + } + + + public void setInfoView(View view, ImageFile file) + { + TextView textView = view.findViewById(R.id.item_title); + textView.setText(""); + //textView_location + TextView textView_location = view.findViewById(R.id.textView_location); + textView_location.setText(""); + + //textView_valueTitle + TextView textView_valueTitle = view.findViewById(R.id.textView_valueTitle); + textView_valueTitle.setText("설명"); + + + ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add); + constraintLayout.setVisibility(View.INVISIBLE); + + LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info); + linearLayout.setVisibility(View.VISIBLE); + + linearLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class); + intent.putExtra("TestType",file.getType()); + intent.putExtra("PkgData",file.getPkgData()); + startActivity(intent); + } + }); + + ImageView deleteView = view.findViewById(R.id.imageView_deleteButton); + deleteView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + AlertDialog.Builder builder = new AlertDialog.Builder(context + , R.style.AlertDialogTheme); + + View view = LayoutInflater.from(context).inflate( + R.layout.layout_dialog2, + (LinearLayout) getActivity().findViewById(R.id.layoutDialog)); + + //다이얼로그 텍스트 설정 + builder.setView(view); + + AlertDialog alertDialog = builder.create(); + + view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + alertDialog.dismiss(); + } + }); + + view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dataManager.dbHelper.deleteFile(file); + resetView(); + alertDialog.dismiss(); + } + }); + + if (alertDialog.getWindow() != null) { + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0)); + } + + alertDialog.show(); + } + }); + + ImageView imageView = view.findViewById(R.id.nuclide_picture); + imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath()))); + + + TextView textViewDate = view.findViewById(R.id.nuclide_date); + textViewDate.setText(file.getCreateDate()); + + TextView textViewData = view.findViewById(R.id.nuclide_data); + textViewData.setText(file.getPkgData()+""); } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java b/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java index 26549c6..a7b3ab8 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java @@ -1,10 +1,12 @@ package com.qtagger.Activity.Test; +import android.app.AlertDialog; import android.content.Context; import android.content.Intent; import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; @@ -17,8 +19,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TableLayout; +import android.widget.TextView; import com.qtagger.Activity.CameraActivity; +import com.qtagger.Activity.PictureInfoActivity; import com.qtagger.Database.ImageFile; import com.qtagger.Database.TestType; import com.qtagger.R; @@ -35,7 +42,12 @@ public class WeightFragment extends Fragment { DataManager dataManager = DataManager.getInstance(); Button weightButton; + TableLayout tableLayout_data; + TextView textView_weightValue,textView_weightDate; + ImageView imageView_deleteButton; private Context context; + + ImageFile fillFile; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -82,12 +94,26 @@ public class WeightFragment extends Fragment { View view = inflater.inflate(R.layout.fragment_weight2, container, false); context = container.getContext(); weightButton =view.findViewById(R.id.weight_Picture); + tableLayout_data = view.findViewById(R.id.tableLayout_data); + textView_weightValue = view.findViewById(R.id.textView_weightValue); + textView_weightDate = view.findViewById(R.id.textView_weightDate); + imageView_deleteButton = view.findViewById(R.id.imageView_deleteButton); + weightButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class); - cameraIntent.putExtra("TestType",TestType.Weight.name()); - startActivity(cameraIntent); + if(fillFile == null) { + + Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class); + cameraIntent.putExtra("TestType", TestType.Weight.name()); + startActivity(cameraIntent); + } + else + { + Intent cameraIntent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class); + cameraIntent.putExtra("TestType",fillFile.getType()); + startActivity(cameraIntent); + } } }); //weight_Picture @@ -95,20 +121,28 @@ public class WeightFragment extends Fragment { return view; } + @RequiresApi(api = Build.VERSION_CODES.M) + private void viewDefaultSetting() + { + imageView_deleteButton.setVisibility(View.GONE); + tableLayout_data.setVisibility(View.GONE); + Drawable buttonBackground = ContextCompat.getDrawable(context,R.drawable.listview_background); + Drawable defaultDrawable = ContextCompat.getDrawable(context,R.drawable.img_cam02); + weightButton.setBackground(buttonBackground); + weightButton.setForeground(defaultDrawable); + } + @RequiresApi(api = Build.VERSION_CODES.M) @Override public void onStart() { super.onStart(); if(dataManager.selPkg == null) return; + fillFile = null; - int defaultColor = Color.parseColor("#C8C8C8"); - Drawable defaultDrawable = ContextCompat.getDrawable(context,R.drawable.add_picture_32); - weightButton.setBackgroundColor(defaultColor); - weightButton.setForeground(defaultDrawable); + viewDefaultSetting(); List files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label()); - ImageFile fillFile = null; for(ImageFile file : files) { if(file.getType().contains(TestType.Weight.name())) @@ -121,6 +155,52 @@ public class WeightFragment extends Fragment { { weightButton.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(fillFile.getFilePath()))); weightButton.setForeground(null); + + tableLayout_data.setVisibility(View.VISIBLE); + imageView_deleteButton.setVisibility(View.VISIBLE); + + textView_weightValue.setText(fillFile.getPkgData() + " kg"); + textView_weightDate.setText(fillFile.getCreateDate()); + + imageView_deleteButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + AlertDialog.Builder builder = new AlertDialog.Builder(context + , R.style.AlertDialogTheme); + + View view = LayoutInflater.from(context).inflate( + R.layout.layout_dialog2, + (LinearLayout) getActivity().findViewById(R.id.layoutDialog)); + + //다이얼로그 텍스트 설정 + builder.setView(view); + + AlertDialog alertDialog = builder.create(); + + view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + alertDialog.dismiss(); + } + }); + + view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dataManager.dbHelper.deleteFile(fillFile); + viewDefaultSetting(); + alertDialog.dismiss(); + } + }); + + if (alertDialog.getWindow() != null) { + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0)); + } + + alertDialog.show(); + } + }); + } diff --git a/app/src/main/java/com/qtagger/Activity/TestActivity.java b/app/src/main/java/com/qtagger/Activity/TestActivity.java index 64f4217..5fe7a41 100644 --- a/app/src/main/java/com/qtagger/Activity/TestActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestActivity.java @@ -1,13 +1,18 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; +import android.app.Activity; +import android.app.AlertDialog; import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbDeviceConnection; import android.hardware.usb.UsbManager; @@ -17,8 +22,10 @@ import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.util.Log; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; import android.widget.TextView; import com.google.android.material.tabs.TabLayout; import com.hoho.android.usbserial.driver.UsbSerialDriver; @@ -27,11 +34,14 @@ import com.hoho.android.usbserial.driver.UsbSerialProber; import com.qtagger.Activity.Test.CaptureFragment; import com.qtagger.Activity.Test.FillFragment; import com.qtagger.Activity.Test.InfoFragment; +import com.qtagger.Activity.Test.InsertFragment; import com.qtagger.Activity.Test.PhotographFragment; import com.qtagger.Activity.Test.WeightFragment; import com.qtagger.Data.CaptureFragmentEnum; import com.qtagger.Data.CustomProber; import com.qtagger.Data.TestEnum; +import com.qtagger.Database.ImageFile; +import com.qtagger.Database.TestType; import com.qtagger.R; import com.qtagger.util.CommonHelper; import com.qtagger.util.Constants; @@ -43,10 +53,11 @@ import com.qtagger.util.TextUtil; public class TestActivity extends AppCompatActivity { - Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment; + Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment, insertFragment; TextView textViewRadiation; TabLayout tabs; DataManager dataManager = DataManager.getInstance(); + LinearLayout Linearlayout_origin,Linearlayout_prepar,Linearlayout_accept,Linearlayout_disposal; @Override protected void onCreate(Bundle savedInstanceState) { @@ -59,8 +70,40 @@ public class TestActivity extends AppCompatActivity { fillFragment = new FillFragment(); pictureFragment = new PhotographFragment(); infoFragment = new InfoFragment(); + insertFragment = new InsertFragment(); textViewRadiation = findViewById(R.id.textViewRadiation); + Linearlayout_origin = findViewById(R.id.Linearlayout_origin); + Linearlayout_prepar = findViewById(R.id.Linearlayout_prepar); + Linearlayout_accept = findViewById(R.id.Linearlayout_accept); + Linearlayout_disposal = findViewById(R.id.Linearlayout_disposal); + + Linearlayout_origin.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + changeTestEnum(TestEnum.발생지특성규명); + } + }); + Linearlayout_prepar.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + changeTestEnum(TestEnum.예비검사); + } + }); + Linearlayout_accept.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + changeTestEnum(TestEnum.인수검사); + } + }); + Linearlayout_disposal.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + changeTestEnum(TestEnum.처분검사); + } + }); + + findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -85,7 +128,6 @@ public class TestActivity extends AppCompatActivity { } }); - //기본 탭 세팅 getSupportFragmentManager().beginTransaction().add(R.id.frame,surfaceFragment).commit(); @@ -115,33 +157,11 @@ public class TestActivity extends AppCompatActivity { View tabViewChild = vgTab.getChildAt(i); if (tabViewChild instanceof TextView) { ((TextView) tabViewChild).setTextSize(16); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf")); } } - Fragment selected = null; - dataManager.testTabPosition = position; - if(position == 0){ - selected = surfaceFragment; - }else if (position == 1){ - selected = m1Fragment; - } - else if (position == 2){ - selected = weightFragment; - } - else if (position == 3){ - selected = fillFragment; - } - else if (position == 4){ - selected = pictureFragment; - } - else if (position == 5){ - selected = infoFragment; - } - - - if(selected != null) { - getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit(); - } + setFragment(position); } @Override @@ -153,6 +173,7 @@ public class TestActivity extends AppCompatActivity { View tabViewChild = vgTab.getChildAt(i); if (tabViewChild instanceof TextView) { ((TextView) tabViewChild).setTextSize(14); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555")); } } } @@ -162,11 +183,36 @@ public class TestActivity extends AppCompatActivity { } }); - - - } + private void setFragment(int position){ + Fragment selected = null; + dataManager.testTabPosition = position; + if(position == 0){ + selected = surfaceFragment; + }else if (position == 1){ + selected = m1Fragment; + } + else if (position == 2){ + selected = weightFragment; + } + else if (position == 3){ + selected = fillFragment; + } + else if (position == 4){ + selected = pictureFragment; + } + else if (position == 5){ + selected = infoFragment; + } + + + if(selected != null) { + getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit(); + } + } + + @Override protected void onStart() { super.onStart(); @@ -176,6 +222,8 @@ public class TestActivity extends AppCompatActivity { return; } + testEnumButtonBackgroundChange(); + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); for (int i = 0; i < tabs.getTabCount(); i++) { TabLayout.Tab tab = tabs.getTabAt(i); @@ -188,9 +236,11 @@ public class TestActivity extends AppCompatActivity { if(i==0) { ((TextView) tabViewChild).setTextSize(16); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf")); } else{ ((TextView) tabViewChild).setTextSize(14); + ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555")); } } } @@ -212,10 +262,101 @@ public class TestActivity extends AppCompatActivity { } } + public void testEnumButtonBackgroundChange() + { + Linearlayout_origin.setBackgroundColor(Color.TRANSPARENT); + Linearlayout_prepar.setBackgroundColor(Color.TRANSPARENT); + Linearlayout_accept.setBackgroundColor(Color.TRANSPARENT); + Linearlayout_disposal.setBackgroundColor(Color.TRANSPARENT); + + + if(dataManager.testEnum == TestEnum.발생지특성규명) + { + Linearlayout_origin.setBackgroundColor(Color.parseColor("#3dbcc8")); + } + else if(dataManager.testEnum == TestEnum.예비검사) + { + Linearlayout_prepar.setBackgroundColor(Color.parseColor("#8ac460")); + } + else if(dataManager.testEnum == TestEnum.인수검사) + { + Linearlayout_accept.setBackgroundColor(Color.parseColor("#7c92c8")); + } + else if(dataManager.testEnum == TestEnum.처분검사) + { + Linearlayout_disposal.setBackgroundColor(Color.parseColor("#b99838")); + } + + + } + + public void changeTestEnum(TestEnum testenum) + { + if(dataManager.testEnum == testenum) + return; + + dataManager.testEnum = testenum; + Intent intent = new Intent(getApplicationContext(), SearchActivity.class); + startActivity(intent); + finish(); + + } + + public void resetFragment(){ + if(dataManager.testTabPosition != -1) + { + setFragment(dataManager.testTabPosition); + } + } + + public void callInsertFragment(TestType type) + { + ((InsertFragment)insertFragment).type = type; + getSupportFragmentManager().beginTransaction().replace(R.id.frame, insertFragment).commit(); + } + @Override protected void onResume() { super.onResume(); } + public void deleteAlert(ImageFile imageFile, ConstraintLayout constraintLayout,LinearLayout linearLayout) + { + AlertDialog.Builder builder = new AlertDialog.Builder(this + , R.style.AlertDialogTheme); + + View view = LayoutInflater.from(this).inflate( + R.layout.layout_dialog2, + (LinearLayout) findViewById(R.id.layoutDialog)); + + //다이얼로그 텍스트 설정 + builder.setView(view); + + AlertDialog alertDialog = builder.create(); + + view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + alertDialog.dismiss(); + } + }); + + view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dataManager.dbHelper.deleteFile(imageFile); + constraintLayout.setVisibility(View.VISIBLE); + linearLayout.setVisibility(View.INVISIBLE); + alertDialog.dismiss(); + } + }); + + if (alertDialog.getWindow() != null) { + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0)); + } + + alertDialog.show(); + } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java index a49187f..1efcb63 100644 --- a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java @@ -73,8 +73,6 @@ public class TestSelectActivity extends AppCompatActivity { @Override public void onClick(View v) { dataManager.testEnum = TestEnum.발생지특성규명; - //데이터 세팅 - dataManager.pkgList = dataManager.dbHelper.getAllORIGIN_CHRCT(); StartSearchActivity(); } }); @@ -83,7 +81,6 @@ public class TestSelectActivity extends AppCompatActivity { @Override public void onClick(View v) { dataManager.testEnum = TestEnum.예비검사; - dataManager.pkgList = dataManager.dbHelper.getAllPREPAR_TEST(); StartSearchActivity(); } }); @@ -94,7 +91,6 @@ public class TestSelectActivity extends AppCompatActivity { @Override public void onClick(View v) { dataManager.testEnum = TestEnum.인수검사; - dataManager.pkgList = dataManager.dbHelper.getAllACCEPT_TEST(); StartSearchActivity(); } }); @@ -103,7 +99,6 @@ public class TestSelectActivity extends AppCompatActivity { @Override public void onClick(View v) { dataManager.testEnum = TestEnum.처분검사; - dataManager.pkgList = dataManager.dbHelper.getAllDISPOSAL_TEST(); StartSearchActivity(); } }); diff --git a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java index d5b3ab0..b78e7d2 100644 --- a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java +++ b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java @@ -21,6 +21,7 @@ import com.qtagger.Activity.MoreActivity; import com.qtagger.Activity.SyncActivity; import com.qtagger.Data.TestEnum; import com.qtagger.Database.AccountData; +import com.qtagger.MainActivity; import com.qtagger.R; import com.qtagger.util.DataManager; @@ -139,10 +140,15 @@ public class CommonNavigationView { drawerLayout.closeDrawer(navigationView,true); } }); + activity.findViewById(R.id.button_Close).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - drawerLayout.closeDrawer(navigationView,true); + + Intent intent = new Intent(activity.getApplicationContext(), MainActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + activity.startActivity(intent); + //drawerLayout.closeDrawer(navigationView,true); } }); diff --git a/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java b/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java index 335cb58..0f6091d 100644 --- a/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java +++ b/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java @@ -3,6 +3,7 @@ package com.qtagger.CustomPalette; import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.DashPathEffect; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Point; @@ -32,6 +33,7 @@ public class RectangleWeightCapture extends View { paint.setStyle(Paint.Style.STROKE); paint.setColor(Color.RED); paint.setStrokeWidth(3); + paint.setPathEffect(new DashPathEffect(new float[]{5,5},1)); //center int x0 = (int) (canvas.getWidth() / 2); diff --git a/app/src/main/java/com/qtagger/Data/CameraInfoSet.java b/app/src/main/java/com/qtagger/Data/CameraInfoSet.java new file mode 100644 index 0000000..59cc672 --- /dev/null +++ b/app/src/main/java/com/qtagger/Data/CameraInfoSet.java @@ -0,0 +1,27 @@ +package com.qtagger.Data; + +public class CameraInfoSet { + String title; + String data; + + public CameraInfoSet(String title, String data) { + this.title = title; + this.data = data; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } +} diff --git a/app/src/main/java/com/qtagger/Database/DBHelper.java b/app/src/main/java/com/qtagger/Database/DBHelper.java index b4d60a7..cd0f30b 100644 --- a/app/src/main/java/com/qtagger/Database/DBHelper.java +++ b/app/src/main/java/com/qtagger/Database/DBHelper.java @@ -339,40 +339,58 @@ public class DBHelper extends SQLiteOpenHelper { db = getWritableDatabase(); + boolean pkgDataChecker = false; + + if (f.getType().compareTo(TestType.Nothing.name()) == 0 || f.getType().compareTo(TestType.Filling.name()) == 0) { + pkgDataChecker = true; + } List selectData = new ArrayList<>(); - String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'"; + String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo() + "' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType() + "'"; + if (pkgDataChecker) { + selQuery += " AND PkgData = '" + f.getPkgData() + "'"; + } //기존에 데이터가 있는지 확인 - Cursor cs = db.rawQuery(selQuery,null); - while (cs.moveToNext()){ - selectData.add(new ImageFile(cs.getString(0),cs.getString(1),cs.getString(2),cs.getString(3),cs.getString(4) - ,cs.getString(5),cs.getString(6),cs.getString(7))); + Cursor cs = db.rawQuery(selQuery, null); + while (cs.moveToNext()) { + selectData.add(new ImageFile(cs.getString(0), cs.getString(1), cs.getString(2), cs.getString(3), cs.getString(4) + , cs.getString(5), cs.getString(6), cs.getString(7))); } //있으면 이미지 삭제 - if(selectData.size() != 0) - { - for (ImageFile imagefile: + if (selectData.size() != 0) { + for (ImageFile imagefile : selectData) { File file = new File(imagefile.getFilePath()); - if(file.exists()) + if (file.exists()) file.delete(); } } //db데이터 삭제 - db.execSQL("DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'"); + String deleteQuery = "DELETE from File where PKGNo ='" + f.getPkgNo() + "' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType() + "'"; + if (pkgDataChecker) { + deleteQuery += " AND PkgData = '" + f.getPkgData() + "'"; + } + + db.execSQL(deleteQuery); //새로운 데이터 추가 - db.execSQL("Insert or replace into File (PkgNo , TestEnum ,Type ,CreateDate ,PkgData,UserId ,FilePath ,FileName) VALUES('"+f.getPkgNo()+"','"+f.getTestEnum()+"','"+f.getType()+"','"+f.getCreateDate()+"','"+f.getPkgData()+"','"+f.getUserId()+"','"+f.getFilePath()+"','"+f.getFileName()+"')"); + db.execSQL("Insert or replace into File (PkgNo , TestEnum ,Type ,CreateDate ,PkgData,UserId ,FilePath ,FileName) VALUES('" + f.getPkgNo() + "','" + f.getTestEnum() + "','" + f.getType() + "','" + f.getCreateDate() + "','" + f.getPkgData() + "','" + f.getUserId() + "','" + f.getFilePath() + "','" + f.getFileName() + "')"); db.close(); } public void deleteFile(ImageFile f) { db = getWritableDatabase(); + boolean pictureChecker = (f.getType().compareTo(TestType.Nothing.name()) == 0) || (f.getType().compareTo(TestType.Filling.name()) == 0); List selectData = new ArrayList<>(); String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'"; - //기존에 데이터가 있는지 확인 + if(pictureChecker) + { + selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum()+ "' AND PkgData = '" + f.getPkgData() + "' AND Type = '" + f.getType()+"'"; + } + + //기존에 데이터가 있는지 확인 Cursor cs = db.rawQuery(selQuery,null); while (cs.moveToNext()){ selectData.add(new ImageFile(cs.getString(0),cs.getString(1),cs.getString(2),cs.getString(3),cs.getString(4) @@ -388,8 +406,15 @@ public class DBHelper extends SQLiteOpenHelper { file.delete(); } } + + String deleteQuery ="DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'"; + if(pictureChecker) + { + deleteQuery = "DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum()+ "' AND PkgData = '" + f.getPkgData() + "' AND Type = '" + f.getType()+"'"; + } + //db데이터 삭제 - db.execSQL("DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'"); + db.execSQL(deleteQuery); db.close(); } @@ -406,10 +431,17 @@ public class DBHelper extends SQLiteOpenHelper { } - public ImageFile selectFile(String PkgNo, String TestEnum,String type ) + public ImageFile selectFile(String PkgNo, String TestEnum,String type,String PkgData ) { ImageFile imageFile = null; - String selQuery = "Select * From File Where PkgNo ='" + PkgNo+"' AND TestEnum = '" + TestEnum + "' AND Type = '" + type+"'"; + String selQuery = ""; + if(PkgData == null) { + selQuery = "Select * From File Where PkgNo ='" + PkgNo + "' AND TestEnum = '" + TestEnum + "' AND Type = '" + type + "'"; + } + else + { + selQuery = "Select * From File Where PkgNo ='" + PkgNo + "' AND TestEnum = '" + TestEnum+ "' AND PkgData = '" + PkgData + "' AND Type = '" + type + "'"; + } db = getWritableDatabase(); Cursor cs = db.rawQuery(selQuery,null); while (cs.moveToNext()){ diff --git a/app/src/main/java/com/qtagger/Database/TestType.java b/app/src/main/java/com/qtagger/Database/TestType.java index 8624888..cdd0933 100644 --- a/app/src/main/java/com/qtagger/Database/TestType.java +++ b/app/src/main/java/com/qtagger/Database/TestType.java @@ -1,20 +1,20 @@ package com.qtagger.Database; public enum TestType { - Top_Front("TOP - FRONT"), - Top_Back("TOP - BACK"), - Top_Left("TOP - LEFT"), - Top_Right("TOP - RIGHT"), + Top_Front("Top-Front"), + Top_Back("Top-Back"), + Top_Left("Top-Left"), + Top_Right("Top-Right"), - Middle_Front("MIDDLE - FRONT"), - Middle_Back("MIDDLE - BACK"), - Middle_Left("MIDDLE - LEFT"), - Middle_Right("MIDDLE - RIGHT"), + Middle_Front("Middle-Front"), + Middle_Back("Middle-Back"), + Middle_Left("Middle-Left"), + Middle_Right("Middle-Right"), - Bottom_Front("BOTTOM - FRONT"), - Bottom_Back("BOTTOM - BACK"), - Bottom_Left("BOTTOM - LEFT"), - Bottom_Right("BOTTOM - RIGHT"), + Bottom_Front("Bottom-Front"), + Bottom_Back("Bottom-Back"), + Bottom_Left("Bottom-Left"), + Bottom_Right("Bottom-Right"), Filling("Filling"), Weight("Weight"), @@ -29,6 +29,7 @@ public enum TestType { this.label = label; } + public static TestType getByName(String Name){ if(Name.compareTo(Top_Front.name()) == 0) diff --git a/app/src/main/res/drawable-v24/btn_retake.png b/app/src/main/res/drawable-v24/btn_retake.png index 51fdb59248e1aec1f78331f03be93a0d3fad248f..cd04ebd7a6fe323c6498ab1c99f861018ae059a8 100644 GIT binary patch literal 3183 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 VT;8mKFM$96002ovPDHLkV1f*V_Ba3l literal 1710 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 E0`8N4M*si- diff --git a/app/src/main/res/drawable-v24/img_setup.png b/app/src/main/res/drawable-v24/img_setup.png new file mode 100644 index 0000000000000000000000000000000000000000..c2f2705854fb1c9c929b049a58c082e307d1d6bc GIT binary patch literal 19318 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 u9DN>BTMr)`8+9Mg^onP&y4lTDnB(5>!Ayx`&x> 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 z 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 A=>Px# diff --git a/app/src/main/res/drawable-v24/sub_menu02.png b/app/src/main/res/drawable-v24/sub_menu02.png index 85844db08d57c20aa9584c0af282d0181d262185..b64a2ea78a5977894093eb508be8c662776cbf61 100644 GIT binary patch delta 617 zcmey%vy^*7G?To6v5}#xxv`0{xtpP(tBa$#k+GAJtBaY1sfm+;ne*f-CRwN&Bb;is zF(oKCn;0888Cw`wSeO{Nx)>TdI++{0IhtCU8JilKyO=voHe;@gnPb zQgJKk&;S4ShaH&I+8EiKPcc4q_%q+jLLf~;nKP4N$%Khsa_zHC9|Rt7YKofB{hnzf zi@<-i1=A!uDmiAjZen(Dn8`KIu1lXKf%B1wK=I_vgZv6+Zr?S99;l13Uh&CLS>Aa0 zNR|rIAGPH&2F#D#F9a-Lsc&YG=CigJ)atl*QDOU9rbq8DT-d5Ig)JiUK|`iP4a2L3 zf+H`WzHR1)m;$1FZ@2yw<5x8i^ zj2)~0`b+32E6OggV2BoJ2zu?6u|byYQLe)smZ!~4-{eeqUpO7T=lHdQsZd3ro-rx^ z(P{5DdhCtw9riGJp5f{E-0*`*;5*aDGL!k+7(T{tS#h}S{NrvW0lPNW9^vkT1_@2B zf5mP1Dmu;_4-@*7DEOO?_Z^Rlp}se zsf;!wOM;BRA|eV}UJ4upsU9lp(IA2df?lHf1Lnb?sE25IYC(gxHz6uoEGi-j)3QM; z%iHI`cj|JubLTFEL_hd2&hMTx=X=imEysl8I7P#0#YMwx|CE4M7yu`KCVkNS`&Ug2 z1Rx1RP#ti*9}SSreIFTc_x)172~sgmd;-+N`YA`9x^08ES_V47aL*~kMg0b^h* zRK$#}FK_`qTmBYU1nHc^eg&5x2@himsM2B!6nJ^f7O)ED!LyhG${?%P^&yOavv42Y zKySpw$LR#F7h2p)KqFj#g?Df{qJY&f0@ei?YzuIt+C=EZhyu#>?ti#^CVN)G3@Cw_ z@Z3wl-?DqqBXKKqx^u${m<)TMR`WXH6uby9_m0SkxtZ@3_}L-Y4EtaZjzJ}C2{5+} zw(IX9*zebjjBl)tYn01>M1q$>4NQT9uIDA1Q|j@%O{y=Zp`C$$llhv_Uij(!u{J1$ z8khw;;4wVW*c8;NSsi!HGmY!0MM4BgNCXD8{i7efiAcOrxg=B z6~R-r;B;7{cre|6ZKFObHKsvAea)*KXOv*G_?CXH`(+(?3FBv zHL3pFX4-vwlu8)ZUcz_}{|z{wF9_$W3z~BIHsZpQbfq&+S#dXP7IZ1#Iy~-kLCvJ> zas`3RSXh`CxVjh`Iy#vfyE&R#ni-oKn!A`gO*Uh$t6wA)`j~-%ak{6A zV@SoVq(A@v+aGpdQfp&mYre$ze`Sk!pb%3}$blkeS=Q*zz#|>1;(ywIHHdc92c9(S z*`X5gAtOn3$xM%e33oJpxU1gh=6{uQ!f8=ez^@$)N9K4eWa-ipEn3{w%46&0aHj8x zf>>1>gXO*_M})c*s{dco=B$A-&xW6#D)H=m`^bNpSZ|htV3RL_DQE@iAR=+Pxv*{;SZyyzWJ)o0|E|*|1UIQ z7n&`@!^FNIM_D7DJ63k3;s(Z!`wu2OW`6Y4VUOIa=m5bt3`Z_H>|qHHne>XGo;Bmv z0nsPd7f#b>dBmci$NETb&&!TefecKa7re>RuxFSrmu1<&zN$=VN__K@?@G2ZALKpX zhM3fbe|VX?(8;r$sY9N*P%LWR^2pQ{o+k^IN-JAV6JEt#C$#Xt;+875NV|!1f+n;2 zcOG|l$XA?VwqVJQv_pz)s|@UfFWmND`PA%(mD>A;8S^>*igyNlZn~0YxpON2)!9$4 iWK81!cTUrxfssMh^%L8Py(UErK;Y@>=d#Wzp$PyBu-ZQW delta 693 zcmaFP^^SW(6qACJg^QW1nX9w0tFft}p{t9di>ZmLi?fM^v#FVrshiv6Dkd42A}5@R zwlO6rm>C&a7`Pal8Mzv}y1Ez|TDZ9wyEs`mnOayHyO=qdO*Uh$tN%BNe-Q%%lbolE zV@SoVC)fQwL;__Fe7qa;CzvyvUGemd14sA{RTXLnZ2P8Ax-#s`HN%Ol{(=>gIefkZ zTufX!nR}j13kR#9%dWsL>|KXgOJ54a{$bXNF5xKuWA{T>=d^TMTKcxw7YEs6?%$qy ze~PWwv34*;>-6(1(L?I58Ev= zlAiw|+Wf-$lT6NO3wZCh%r4^+u6R#5Y;L-dc3(ObU2v*J$4{y|2`W z*>*>k;j?C)%iMchm=@2N())7nY?Ck9Sq*uQ>nocqdme9-xN!H*YtiOVLPfqE^9Lg-I4&*#L%gXWW>1nf%*xs42AZ(A$(X_XXGEqiF&ZVDT zUeAdVwd9XECXiMjXFW+Xa<_PaaD$ds|Hj7U6>Y{pUVMvKcdo_TBJty0i(9GcJtua) zUoU>UaJr10(VBbwp-K84YrlVKKPk2EmPN{wJNNEraepfanRX=Cd-k;J|NmY8*vP=l Y@PXN`|FM-#1_Kayy85}Sb4q9e0M)KD?EnA( diff --git a/app/src/main/res/drawable-v24/sub_menu04.png b/app/src/main/res/drawable-v24/sub_menu04.png index 05a61d0fec9cabc8e01bcabae2cd98819c78005e..f95b3a25728fe6e3106c59d99e94b1868d64f883 100644 GIT binary patch delta 611 zcmZ3?Gnacq6qACZvzeQPrK^dFvALU}p{t99rLl{Xxr>>Fv!S_*iIKtNDkd42B4eD2 zwlO6rIGY$7IT>3RSXh`CxVjh`Iy#vfyE&R#ni-n{jWTzdY{pzy-(~TVje&vjtfz}( zNX4xu)AxEYJBqX#yB(R&5+dRv*txbNUm>h%+au;15jSq!{{5MyQREg^(+{?+g-vs# zA~Uxb&TtXwyr`09BmDkU$_+_lYiXvchskQQcN?p3{(eWbr&umCb&G41OnuM+!v|d7 z6E@vs`j)x5d;&wy3l_}+*ZTX{S-Dqo>~)>-?04M<7QF*g=3JLM^lW9knfS!%MSh+i z%J*3?x>qz;wg;{2n0f1^b>2QsFR`E7AF${&BuOxBN-%xUdDSgkoTtJ2baliGy@IU* z+=p2W130wezH?l26t$7|2!1!MyK2Ai4My(-IUeahf7#RyNL4UMACya~ZB?t+tyvrP zZIf%=`tAKSAA5EmH(OhJCE;IxgXpda%gz^`j#oa$wAL{FGJlBly~d3VU%zlJnx>bq zin}U9W=TtUz_*1i*B-B1UluFB;*vyuk@6+36V`bXSh^Lw-|li2{JSXosO2ujjOc0A z$4n#`cQ5;s#`!_)Y=fe&@#AIXjT(pCvvRiA&YJDo*e7MRwEQo_orc2MQY$XZ;D~5> zeyN84%q_9RqZ>JrySAR*#&qOkS+m~BNm(wc+gs8O&oR*#>OIzOa^B-}c4}-qqs@|M mNm1>ySvJ)Fe*VR~fsx^4;GMM12PXVr00K`}KbLh*2~7Yf9%LNr4|LN_)=MnpnHFh)W%lePk2AT}~GI50#rHZnysMMXq0 zF*rsA7v3c|F`3LF;A6(z;%>3rP-+OP?ab34;J!3=JI>$ekKohRuC4au*2j1d3 z4yMj=)a*@mWxu84V<0S6`@AYC{$oQSrOik)a#@vf}e6pPdrHjm|kZwF-IJQ%J z(-f6q2`pfnye@=1z!yV%OUMRQ9+to>R7I$PqM<#n4&%jFP8L%Q*xZY-tY&Hvq+L=OGvja!6L(VY?I^75#`(~@QU ziS}l!S+J2$~xUW_o)+$7WR1$IQJfzP(@^QnNWC)eVak+&Dj{q=)k^+Tp<#`*7m c9sd+y0Li9W&bdPb_W%F@07*qoM6N<$g8$uGo&W#< diff --git a/app/src/main/res/drawable/default_fragment_background.xml b/app/src/main/res/drawable/default_fragment_background.xml index 167812f..049706f 100644 --- a/app/src/main/res/drawable/default_fragment_background.xml +++ b/app/src/main/res/drawable/default_fragment_background.xml @@ -10,7 +10,5 @@ android:bottomRightRadius="12dp" android:topLeftRadius="12dp" android:topRightRadius="12dp" /> - \ 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 216d5de..4f86c64 100644 --- a/app/src/main/res/layout/activity_camera.xml +++ b/app/src/main/res/layout/activity_camera.xml @@ -43,13 +43,48 @@ android:visibility="invisible" tools:ignore="RtlCompat" /> + + + + + + + + + + android:visibility="invisible"> + + + + + diff --git a/app/src/main/res/layout/activity_picture_info.xml b/app/src/main/res/layout/activity_picture_info.xml index 0d9eb3a..4e9c64f 100644 --- a/app/src/main/res/layout/activity_picture_info.xml +++ b/app/src/main/res/layout/activity_picture_info.xml @@ -36,20 +36,29 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 54269b9..877a234 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -61,6 +61,7 @@ + android:text="포장물 선택" /> + android:layout_height="65dp" + android:background="@color/defaultColor"> + + app:layout_constraintTop_toTopOf="parent" /> - - + - + + + android:src="@drawable/download_32" /> @@ -103,7 +104,99 @@ android:id="@+id/frame" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_weight="1" android:background="#F5F5F5" /> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_test_select.xml b/app/src/main/res/layout/activity_test_select.xml index b42523d..3c46968 100644 --- a/app/src/main/res/layout/activity_test_select.xml +++ b/app/src/main/res/layout/activity_test_select.xml @@ -62,7 +62,7 @@ android:id="@+id/linearlayout1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="28dp" + android:layout_marginTop="100dp" app:layout_constraintTop_toBottomOf="@+id/view2"> diff --git a/app/src/main/res/layout/fragment_capture.xml b/app/src/main/res/layout/fragment_capture.xml index 7bdd09a..108fb16 100644 --- a/app/src/main/res/layout/fragment_capture.xml +++ b/app/src/main/res/layout/fragment_capture.xml @@ -23,7 +23,7 @@ + + android:layout_height="match_parent"> + + android:orientation="vertical" + android:paddingBottom="10dp"> - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center" + android:layout_marginTop="24dp" + android:layout_marginBottom="5dp" + android:text="채움률을 선택해 주세요." /> + + + + + diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml index 87f5238..9d45c3f 100644 --- a/app/src/main/res/layout/fragment_info.xml +++ b/app/src/main/res/layout/fragment_info.xml @@ -10,6 +10,7 @@ @@ -19,70 +20,116 @@ android:layout_height="match_parent" android:orientation="vertical"> + + - + + - - - - + android:layout_marginLeft="30dp" + android:layout_marginTop="10dp" + android:text="방사선적 특성" + android:textColor="@color/defaultTitleColor" + android:textSize="18sp"/> + + + + - - - - - + + + diff --git a/app/src/main/res/layout/fragment_insert.xml b/app/src/main/res/layout/fragment_insert.xml new file mode 100644 index 0000000..07f8bd9 --- /dev/null +++ b/app/src/main/res/layout/fragment_insert.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml index 0a827fe..3610890 100644 --- a/app/src/main/res/layout/fragment_list.xml +++ b/app/src/main/res/layout/fragment_list.xml @@ -18,18 +18,16 @@ android:layout_width="match_parent" android:layout_height="40dp" android:layout_marginStart="20dp" - android:layout_marginTop="20dp" + android:layout_marginTop="15dp" android:layout_marginEnd="20dp" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingBottom="2dp" - android:background="@drawable/searchview_background" - android:iconifiedByDefault="true" - android:queryHint="포장물 번호 검색" android:layoutDirection="rtl" + android:background="@drawable/searchview_background" + android:queryHint="포장물 번호 검색" app:defaultQueryHint="포장물 번호 검색" - - app:iconifiedByDefault="false" + app:iconifiedByDefault="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -37,14 +35,14 @@ + android:layout_height="match_parent" + android:background="@color/defaultBackgroundColor" + > + android:layout_marginTop="24dp" + android:layout_marginBottom="5dp" + android:text="추가 버튼을 눌러 주세요." + android:gravity="center"/> - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + - diff --git a/app/src/main/res/layout/fragment_rfid.xml b/app/src/main/res/layout/fragment_rfid.xml index 056c1db..489933c 100644 --- a/app/src/main/res/layout/fragment_rfid.xml +++ b/app/src/main/res/layout/fragment_rfid.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/default_fragment_background" + android:paddingBottom="5dp" tools:context=".Activity.Search.RfidFragment"> + + + android:paddingLeft="10dp" + android:text="전자저울 인디케이터를 촬영해주세요" /> - + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/layout_capture_test.xml b/app/src/main/res/layout/layout_capture_test.xml index d3f58ab..3e6cca1 100644 --- a/app/src/main/res/layout/layout_capture_test.xml +++ b/app/src/main/res/layout/layout_capture_test.xml @@ -4,7 +4,7 @@ + android:background="@android:color/transparent" + android:visibility="visible"> - - + android:layout_height="30dp" /> + @@ -99,33 +100,49 @@ android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical"> - + + + + + + + + + android:text="Title" + android:textSize="13sp" + android:textColor="#333333" /> + android:text="Date" + android:textSize="13sp" + android:textColor="#333333" /> - - + android:text="Data" + android:textSize="13sp" + android:textColor="#333333" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_dialog2.xml b/app/src/main/res/layout/layout_dialog2.xml new file mode 100644 index 0000000..a8f31ff --- /dev/null +++ b/app/src/main/res/layout/layout_dialog2.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file