From e76e69560906180cf03df46f0bd9f16ff9fc3cfe Mon Sep 17 00:00:00 2001 From: Mr-Dave Date: Mon, 19 Dec 2022 19:10:24 -0700 Subject: [PATCH] Revise imagetype to image_type --- doc/motionplus_config.html | 6 +++--- src/alg_sec.cpp | 10 +++++----- src/alg_sec.hpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/motionplus_config.html b/doc/motionplus_config.html index a26abfdb..f8faf36a 100644 --- a/doc/motionplus_config.html +++ b/doc/motionplus_config.html @@ -1252,10 +1252,10 @@
-

imagetype

+

image_type

diff --git a/src/alg_sec.cpp b/src/alg_sec.cpp index a12cb68b..98f27edd 100644 --- a/src/alg_sec.cpp +++ b/src/alg_sec.cpp @@ -226,10 +226,10 @@ static void algsec_image_type(ctx_cam *cam, Mat &mat_dst) { ctx_algsec_model *algmdl = &cam->algsec->models; - if ((algmdl->imagetype == "gray") || (algmdl->imagetype == "grey")) { + if ((algmdl->image_type == "gray") || (algmdl->image_type == "grey")) { mat_dst = Mat(cam->imgs.height, cam->imgs.width , CV_8UC1, (void*)cam->algsec->image_norm); - } else if (algmdl->imagetype == "roi") { + } else if (algmdl->image_type == "roi") { /*Discard really small and large images */ if ((cam->current_image->location.width < 64) || (cam->current_image->location.height < 64) || @@ -443,8 +443,8 @@ static void algsec_params_model(ctx_cam *cam) algmdl->model_file = param_vl; } else if (mystreq(param_nm,"frame_interval")) { algmdl->frame_interval = atoi(param_vl); - } else if (mystreq(param_nm,"imagetype")) { - algmdl->imagetype = param_vl; + } else if (mystreq(param_nm,"image_type")) { + algmdl->image_type = param_vl; } else if (mystreq(param_nm,"threshold")) { algmdl->threshold = atof(param_vl); } else if (mystreq(param_nm,"threshold_model")) { @@ -500,7 +500,7 @@ static void algsec_params_defaults(ctx_cam *cam) util_parms_add_default(algmdl->algsec_params, "model_file", ""); util_parms_add_default(algmdl->algsec_params, "frame_interval", "5"); - util_parms_add_default(algmdl->algsec_params, "imagetype", "full"); + util_parms_add_default(algmdl->algsec_params, "image_type", "full"); util_parms_add_default(algmdl->algsec_params, "rotate", "0"); if (algmdl->method == "haar") { diff --git a/src/alg_sec.hpp b/src/alg_sec.hpp index 03e5b511..27334f6e 100644 --- a/src/alg_sec.hpp +++ b/src/alg_sec.hpp @@ -39,7 +39,7 @@ struct ctx_algsec_model { int frame_interval; std::string method; - std::string imagetype; + std::string image_type; int rotate; float scalefactor;