diff --git a/config/alprd.conf.defaults b/config/alprd.conf.defaults index 0e62337..b58c225 100644 --- a/config/alprd.conf.defaults +++ b/config/alprd.conf.defaults @@ -3,6 +3,7 @@ ; country determines the training dataset used for recognizing plates. ; Valid values are: us, eu, au, auwide, gb, kr, mx, sg country = us +;pattern = ca ; text name identifier for this location ; site_id = your-unique-sitename diff --git a/src/daemon.cpp b/src/daemon.cpp index 8446b56..0a61ef8 100644 --- a/src/daemon.cpp +++ b/src/daemon.cpp @@ -50,6 +50,7 @@ struct CaptureThreadData std::string config_file; std::string country_code; + std::string pattern; bool output_images; std::string output_image_folder; int top_n; @@ -171,7 +172,6 @@ int main( int argc, const char** argv ) std::string daemon_defaults_file = INSTALL_PREFIX "/share/openalpr/config/alprd.defaults.conf"; DaemonConfig daemon_config(daemonConfigFile, daemon_defaults_file); - if (daemon_config.stream_urls.size() == 0) { @@ -199,6 +199,7 @@ int main( int argc, const char** argv ) tdata->company_id = daemon_config.company_id; tdata->site_id = daemon_config.site_id; tdata->top_n = daemon_config.topn; + tdata->pattern = daemon_config.pattern; tdata->clock_on = clockOn; tthread::thread* thread_recognize = new tthread::thread(streamRecognitionThread, (void*) tdata); @@ -233,9 +234,11 @@ void streamRecognitionThread(void* arg) LOG4CPLUS_INFO(logger, "country: " << tdata->country_code << " -- config file: " << tdata->config_file ); LOG4CPLUS_INFO(logger, "Stream " << tdata->camera_id << ": " << tdata->stream_url); + LOG4CPLUS_INFO(logger, "Region " << tdata->pattern); Alpr alpr(tdata->country_code, tdata->config_file); alpr.setTopN(tdata->top_n); + alpr.setDefaultRegion(tdata->pattern); int framenum = 0; @@ -467,4 +470,4 @@ bool uploadPost(CURL* curl, std::string url, std::string data) return success; -} \ No newline at end of file +} diff --git a/src/daemon/daemonconfig.cpp b/src/daemon/daemonconfig.cpp index f6aeb4d..0a6b203 100644 --- a/src/daemon/daemonconfig.cpp +++ b/src/daemon/daemonconfig.cpp @@ -53,6 +53,7 @@ DaemonConfig::DaemonConfig(std::string config_file, std::string config_defaults_ upload_url = getString(&ini, &defaultIni, "daemon", "upload_address", ""); company_id = getString(&ini, &defaultIni, "daemon", "company_id", ""); site_id = getString(&ini, &defaultIni, "daemon", "site_id", ""); + pattern = getString(&ini, &defaultIni, "daemon", "pattern", ""); } DaemonConfig::~DaemonConfig() { diff --git a/src/daemon/daemonconfig.h b/src/daemon/daemonconfig.h index 766563e..5f98ba3 100644 --- a/src/daemon/daemonconfig.h +++ b/src/daemon/daemonconfig.h @@ -22,6 +22,7 @@ public: std::string upload_url; std::string company_id; std::string site_id; + std::string pattern; private: