mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-17 02:57:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revise imagetype to image_type

Browse Source
This commit is contained in:
Mr-Dave
2022-12-19 19:10:24 -07:00
parent 52775d0969
commit e76e695609
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/motionplus_config.html
View File

@@ -1252,10 +1252,10 @@
</div>
<div>
<i><h4> imagetype </h4></i>
<i><h4> image_type </h4></i>
<ul>
<li> Values: full, roi | Default: full </li>
Process full image or just the region of interest(roi).
<li> Values: full, grey, roi | Default: full </li>
Process full color image, the full grey image or just the region of interest(roi).
</ul>
<p></p>
</div>

10
src/alg_sec.cpp
View File

@@ -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") {

2
src/alg_sec.hpp
View File

@@ -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;