From e8a3c4fb08ccb9861c81a2c8601e8b170b5d713c Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 2 Jul 2015 15:48:44 -0400 Subject: [PATCH] Removed results_character_details flag --- config/openalpr.conf.in | 2 -- src/openalpr/alpr_impl.cpp | 25 +++++++++++-------------- src/openalpr/config.cpp | 2 -- src/openalpr/config.h | 2 -- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/config/openalpr.conf.in b/config/openalpr.conf.in index 43156df..36800f2 100644 --- a/config/openalpr.conf.in +++ b/config/openalpr.conf.in @@ -59,8 +59,6 @@ postprocess_confidence_skip_level = 80 postprocess_min_characters = 4 postprocess_max_characters = 8 -; Return detailed results for each character -results_character_details = 0 debug_general = 0 debug_timing = 0 diff --git a/src/openalpr/alpr_impl.cpp b/src/openalpr/alpr_impl.cpp index c1211e3..6834dc0 100644 --- a/src/openalpr/alpr_impl.cpp +++ b/src/openalpr/alpr_impl.cpp @@ -208,22 +208,19 @@ namespace alpr aplate.overall_confidence = ppResults[pp].totalscore; aplate.matches_template = ppResults[pp].matchesTemplate; - if (config->resultsCharacterDetails) + // Grab detailed results for each character + for (unsigned int c_idx = 0; c_idx < ppResults[pp].letter_details.size(); c_idx++) { - // Grab detailed results for each character - for (unsigned int c_idx = 0; c_idx < ppResults[pp].letter_details.size(); c_idx++) - { - AlprChar character_details; - character_details.character = ppResults[pp].letter_details[c_idx].letter; - character_details.confidence = ppResults[pp].letter_details[c_idx].totalscore; - cv::Rect char_rect = pipeline_data.charRegions[ppResults[pp].letter_details[c_idx].charposition]; - std::vector charpoints = getCharacterPoints(char_rect, charTransformMatrix ); - for (int cpt = 0; cpt < 4; cpt++) - character_details.corners[cpt] = charpoints[cpt]; - aplate.character_details.push_back(character_details); - } - plateResult.topNPlates.push_back(aplate); + AlprChar character_details; + character_details.character = ppResults[pp].letter_details[c_idx].letter; + character_details.confidence = ppResults[pp].letter_details[c_idx].totalscore; + cv::Rect char_rect = pipeline_data.charRegions[ppResults[pp].letter_details[c_idx].charposition]; + std::vector charpoints = getCharacterPoints(char_rect, charTransformMatrix ); + for (int cpt = 0; cpt < 4; cpt++) + character_details.corners[cpt] = charpoints[cpt]; + aplate.character_details.push_back(character_details); } + plateResult.topNPlates.push_back(aplate); } if (plateResult.topNPlates.size() > bestPlateIndex) diff --git a/src/openalpr/config.cpp b/src/openalpr/config.cpp index 32a1229..7146a4c 100644 --- a/src/openalpr/config.cpp +++ b/src/openalpr/config.cpp @@ -180,8 +180,6 @@ namespace alpr postProcessMinCharacters = getInt(ini, "", "postprocess_min_characters", 100); postProcessMaxCharacters = getInt(ini, "", "postprocess_max_characters", 100); - resultsCharacterDetails = getBoolean(ini,"", "results_character_details", false); - debugGeneral = getBoolean(ini, "", "debug_general", false); debugTiming = getBoolean(ini, "", "debug_timing", false); debugPrewarp = getBoolean(ini, "", "debug_prewarp", false); diff --git a/src/openalpr/config.h b/src/openalpr/config.h index 28aa740..aad1588 100644 --- a/src/openalpr/config.h +++ b/src/openalpr/config.h @@ -104,8 +104,6 @@ namespace alpr unsigned int postProcessMinCharacters; unsigned int postProcessMaxCharacters; - unsigned int resultsCharacterDetails; - bool debugGeneral; bool debugTiming; bool debugPrewarp;