diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9c8f8ad..32de682 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/app/src/main/java/com/uns/maincar/gui/MainActivity.java b/app/src/main/java/com/uns/maincar/gui/MainActivity.java
index 3e87c04..ae70171 100644
--- a/app/src/main/java/com/uns/maincar/gui/MainActivity.java
+++ b/app/src/main/java/com/uns/maincar/gui/MainActivity.java
@@ -414,7 +414,7 @@ public class MainActivity extends AppCompatActivity
private void OCRRecognizeText()
{
TextFilter filter = new TextFilter();
- String str = filter.RemoveEmptyCharacter(OCR.DecodeImage(currImage));
+ String str = filter.NoUnderLine(filter.RemoveEmptyCharacter(OCR.DecodeImage(currImage)));
ToastLog("OCR Result: [" + str + "]", false, true);
byte[] b_str;
try
diff --git a/app/src/main/java/com/uns/maincar/tools/TextFilter.java b/app/src/main/java/com/uns/maincar/tools/TextFilter.java
index eb85be7..08d4655 100644
--- a/app/src/main/java/com/uns/maincar/tools/TextFilter.java
+++ b/app/src/main/java/com/uns/maincar/tools/TextFilter.java
@@ -42,4 +42,15 @@ public class TextFilter
}
return result.toString();
}
+
+ public String NoUnderLine(String src)
+ {
+ StringBuilder result = new StringBuilder();
+ for (int i = 0; i < src.length(); i++)
+ {
+ if (src.charAt(i) != '_')
+ result.append(src.charAt(i));
+ }
+ return result.toString();
+ }
}
diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_207_timing.txt b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_207_timing.txt
index 7e75b7a..a61c566 100644
--- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_207_timing.txt
+++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_207_timing.txt
@@ -4,3 +4,6 @@ generate_cxx_metadata
create-invalidation-state 16ms
generate_cxx_metadata completed in 33ms
+# C/C++ build system timings
+generate_cxx_metadata 29ms
+
diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_223_timing.txt b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_223_timing.txt
index 6aa10a4..32b3577 100644
--- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_223_timing.txt
+++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/generate_cxx_metadata_223_timing.txt
@@ -12,3 +12,9 @@ generate_cxx_metadata
[gap of 11ms]
generate_cxx_metadata completed in 71ms
+# C/C++ build system timings
+generate_cxx_metadata
+ [gap of 21ms]
+ create-invalidation-state 15ms
+generate_cxx_metadata completed in 45ms
+
diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json
index b9f52de..3c612e4 100644
--- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json
+++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json
@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 1223644467
+ "memoizedHashCode": 1167752105
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -1996909018
+ "memoizedHashCode": -2052801380
},
{
"level_": 0,
@@ -39,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 96633915
+ "memoizedHashCode": 40741553
}
]
\ No newline at end of file
diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json
index b615dd9..78e7cd1 100644
--- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json
+++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json
@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -76695078
+ "memoizedHashCode": -1827229641
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 1855994637
+ "memoizedHashCode": 105460074
},
{
"level_": 0,
@@ -39,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -1640173296
+ "memoizedHashCode": 904259437
}
]
\ No newline at end of file
diff --git a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json
index e26710b..f68f946 100644
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json
@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -88490274
+ "memoizedHashCode": -1839024837
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -440404838
+ "memoizedHashCode": 2104027895
},
{
"level_": 0,
@@ -39,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -1651968492
+ "memoizedHashCode": 892464241
}
]
\ 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 a81b0cf..cfada46 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": -2095680304
+ "memoizedHashCode": 2143394630
}
]
\ No newline at end of file
diff --git a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt
index 5a3d724..f4a9515 100644
--- a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt
+++ b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt
@@ -1039,3 +1039,16 @@ create_cxx_tasks
create-initial-cxx-model completed in 79ms
create_cxx_tasks completed in 80ms
+# C/C++ build system timings
+create_cxx_tasks
+ create-initial-cxx-model
+ create-module-model
+ create-cmake-model 34ms
+ create-module-model completed in 37ms
+ create-module-model
+ create-cmake-model 35ms
+ create-module-model completed in 36ms
+ [gap of 10ms]
+ create-initial-cxx-model completed in 92ms
+create_cxx_tasks completed in 93ms
+
diff --git a/opencv/build/intermediates/cxx/create_cxx_tasks_523_timing.txt b/opencv/build/intermediates/cxx/create_cxx_tasks_523_timing.txt
index 4483d7d..06702e3 100644
--- a/opencv/build/intermediates/cxx/create_cxx_tasks_523_timing.txt
+++ b/opencv/build/intermediates/cxx/create_cxx_tasks_523_timing.txt
@@ -22,3 +22,15 @@ create_cxx_tasks
create-initial-cxx-model completed in 86ms
create_cxx_tasks completed in 87ms
+# C/C++ build system timings
+create_cxx_tasks
+ create-initial-cxx-model
+ create-module-model
+ create-cmake-model 31ms
+ create-module-model completed in 32ms
+ create-module-model
+ create-cmake-model 33ms
+ create-module-model completed in 34ms
+ create-initial-cxx-model completed in 82ms
+create_cxx_tasks completed in 83ms
+
diff --git a/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log b/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log
index 51945ef..2bc6cad 100644
--- a/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log
+++ b/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log
@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -1253645686
+ "memoizedHashCode": -1309538048
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": -461457583
+ "memoizedHashCode": -517349945
},
{
"level_": 0,
@@ -39,7 +39,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 243003610
+ "memoizedHashCode": 187111248
},
{
"level_": 0,
@@ -53,7 +53,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 2105817680
+ "memoizedHashCode": 2049925318
},
{
"level_": 0,
@@ -67,7 +67,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 1213128098
+ "memoizedHashCode": 1157235736
},
{
"level_": 0,
@@ -81,6 +81,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
- "memoizedHashCode": 1549108317
+ "memoizedHashCode": 1493215955
}
]
\ No newline at end of file