Procházet zdrojové kódy

Revert "add AlignmentAlgo=off option (#1867)" (#1876)

This reverts commit 3de4cc7c567b5c2bf46600d32d038aa5f56eb13d.
Nicolas Liaudat před 3 roky
rodič
revize
782e1c229b

+ 1 - 6
code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -65,7 +65,7 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
     std::vector<string> splitted;
     int suchex = 40;
     int suchey = 40;
-    int alg_algo = 0; //default=0; 1 =HIGHACCURACY; 2= FAST; 3= OFF
+    int alg_algo = 0;
 
 
     aktparamgraph = trim(aktparamgraph);
@@ -130,8 +130,6 @@ 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;
         }
     }
 
@@ -197,11 +195,8 @@ 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!");

+ 0 - 1
sd-card/html/edit_config_param.html

@@ -282,7 +282,6 @@ textarea {
 					<option value="default" selected>Default</option>
 					<option value="highAccuracy" >HighAccuracy</option>
 					<option value="fast" >Fast</option>
-					<option value="off" >Fast</option>
 				</select>
 			</td>
 			<td style="font-size: 80%;">