diff --git a/src/openalpr/config.cpp b/src/openalpr/config.cpp index 8935d92..2f30a29 100644 --- a/src/openalpr/config.cpp +++ b/src/openalpr/config.cpp @@ -139,6 +139,8 @@ void Config::loadValues(string country) minPlateSizeWidthPx = getInt(country, "min_plate_size_width_px", 100); minPlateSizeHeightPx = getInt(country, "min_plate_size_height_px", 100); + multiline = getBoolean(country, "multiline", false); + plateWidthMM = getFloat(country, "plate_width_mm", 100); plateHeightMM = getFloat(country, "plate_height_mm", 100); diff --git a/src/openalpr/config.h b/src/openalpr/config.h index 21fb8dc..7477b79 100644 --- a/src/openalpr/config.h +++ b/src/openalpr/config.h @@ -57,6 +57,8 @@ class Config float minPlateSizeWidthPx; float minPlateSizeHeightPx; + bool multiline; + float plateWidthMM; float plateHeightMM; diff --git a/src/openalpr/licenseplatecandidate.cpp b/src/openalpr/licenseplatecandidate.cpp index f21b87a..4406718 100644 --- a/src/openalpr/licenseplatecandidate.cpp +++ b/src/openalpr/licenseplatecandidate.cpp @@ -40,6 +40,7 @@ void LicensePlateCandidate::recognize() charSegmenter = NULL; pipeline_data->plate_area_confidence = 0; + pipeline_data->isMultiline = config->multiline; int expandX = round(this->pipeline_data->regionOfInterest.width * 0.20); int expandY = round(this->pipeline_data->regionOfInterest.height * 0.15); diff --git a/src/openalpr/pipeline_data.h b/src/openalpr/pipeline_data.h index e92302e..6c71e8a 100644 --- a/src/openalpr/pipeline_data.h +++ b/src/openalpr/pipeline_data.h @@ -23,6 +23,8 @@ class PipelineData cv::Mat grayImg; cv::Rect regionOfInterest; + bool isMultiline; + cv::Mat crop_gray; bool hasPlateBorder; diff --git a/src/openalpr/textdetection/characteranalysis.cpp b/src/openalpr/textdetection/characteranalysis.cpp index 999746f..d44bfff 100644 --- a/src/openalpr/textdetection/characteranalysis.cpp +++ b/src/openalpr/textdetection/characteranalysis.cpp @@ -27,7 +27,6 @@ CharacterAnalysis::CharacterAnalysis(PipelineData* pipeline_data) this->pipeline_data = pipeline_data; this->config = pipeline_data->config; - this->isTwoLine = true; if (this->config->debugCharAnalysis) cout << "Starting CharacterAnalysis identification" << endl;