From 3de4cc7c567b5c2bf46600d32d038aa5f56eb13d Mon Sep 17 00:00:00 2001 From: Nicolas Liaudat Date: Wed, 18 Jan 2023 23:01:51 +0100 Subject: [PATCH] add AlignmentAlgo=off option (#1867) --- code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp | 7 ++++++- sd-card/html/edit_config_param.html | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp index 1b1646fec..f4d2e2319 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp @@ -65,7 +65,7 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph) std::vector splitted; int suchex = 40; int suchey = 40; - int alg_algo = 0; + int alg_algo = 0; //default=0; 1 =HIGHACCURACY; 2= FAST; 3= OFF aktparamgraph = trim(aktparamgraph); @@ -130,6 +130,8 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph) alg_algo = 1; if (toUpper(splitted[1]) == "FAST") alg_algo = 2; + if (toUpper(splitted[1]) == "OFF") + alg_algo = 3; } } @@ -195,8 +197,11 @@ bool ClassFlowAlignment::doFlow(string time) } } +//no align algo if set to 3 = off +if(References[0].alignment_algo != 3){ delete AlignAndCutImage; AlignAndCutImage = new CAlignAndCutImage(ImageBasis, ImageTMP); +} if (!AlignAndCutImage) { LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!"); diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index b7be46c85..7f03955ff 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -282,6 +282,7 @@

Configuration

+