Add a separate checkbox for OCR preprocessing

NAPS2.Lib/Config/CommonConfig.cs

@@ -126,6 +126,9 @@ public class CommonConfig
     [Common]
     public LocalizedOcrMode OcrMode { get; set; }
 
+    [Common]
+    public bool OcrPreProcessing { get; set; }
+
     [Common]
     public bool OcrAfterScanning { get; set; }
 

NAPS2.Lib/Config/ConfigExtensions.cs

@@ -13,18 +13,18 @@ public static OcrParams DefaultOcrParams(this Naps2Config config)
         }
         return new OcrParams(
             config.Get(c => c.OcrLanguageCode),
-            MapOcrMode(config.Get(c => c.OcrMode)),
+            MapOcrMode(config.Get(c => c.OcrMode), config.Get(c => c.OcrPreProcessing)),
             config.Get(c => c.OcrTimeoutInSeconds));
     }
 
-    private static OcrMode MapOcrMode(LocalizedOcrMode ocrMode)
+    private static OcrMode MapOcrMode(LocalizedOcrMode ocrMode, bool preProcessing)
     {
-        return ocrMode switch
+        return (ocrMode, preProcessing) switch
         {
-            LocalizedOcrMode.Fast => OcrMode.Fast,
-            LocalizedOcrMode.FastWithPreProcess => OcrMode.FastWithPreProcess,
-            LocalizedOcrMode.Best => OcrMode.BestWithPreProcess,
-            LocalizedOcrMode.BestWithPreProcess => OcrMode.BestWithPreProcess,
+            (LocalizedOcrMode.Fast, false) => OcrMode.Fast,
+            (LocalizedOcrMode.Fast, true) => OcrMode.FastWithPreProcess,
+            (LocalizedOcrMode.Best, false) => OcrMode.Best,
+            (LocalizedOcrMode.Best, true) => OcrMode.BestWithPreProcess,
             _ => OcrMode.Default
         };
     }

NAPS2.Lib/Config/InternalDefaults.cs

@@ -50,6 +50,7 @@ public static CommonConfig GetCommonConfig() =>
             OcrLanguageCode = "",
             LastOcrMultiLangCode = "",
             OcrMode = LocalizedOcrMode.Fast,
+            OcrPreProcessing = false,
             OcrAfterScanning = true,
             LastImageExt = "",
             LastPdfOrImageExt = "",

NAPS2.Lib/EtoForms/Ui/OcrSetupForm.cs

@@ -12,8 +12,8 @@ public class OcrSetupForm : EtoDialogBase
 
     private readonly CheckBox _enableOcr = C.CheckBox(UiStrings.MakePdfsSearchable);
     private readonly DropDown _ocrLang = C.DropDown();
-    private readonly DropDown _ocrMode = C.EnumDropDown(LocalizedOcrMode.Fast, LocalizedOcrMode.FastWithPreProcess,
-        LocalizedOcrMode.Best, LocalizedOcrMode.BestWithPreProcess);
+    private readonly DropDown _ocrMode = C.EnumDropDown(LocalizedOcrMode.Fast, LocalizedOcrMode.Best);
+    private readonly CheckBox _ocrPreProcessing = C.CheckBox(UiStrings.OcrPreProcessing);
     private readonly CheckBox _ocrAfterScanning = C.CheckBox(UiStrings.RunOcrAfterScanning);
     private readonly LinkButton _moreLanguages = C.Link(UiStrings.GetMoreLanguages);
 
@@ -42,6 +42,7 @@ public OcrSetupForm(Naps2Config config, TesseractLanguageManager tesseractLangua
         _ocrLang.SelectedIndexChanged += OcrLang_SelectedIndexChanged;
         _ocrMode.SelectedIndex = (int) configOcrMode;
         if (_ocrMode.SelectedIndex == -1) _ocrMode.SelectedIndex = 0;
+        _ocrPreProcessing.Checked = Config.Get(c => c.OcrPreProcessing);
         _ocrAfterScanning.Checked = Config.Get(c => c.OcrAfterScanning);
 
         LoadLanguages();
@@ -65,6 +66,7 @@ protected override void BuildLayout()
                 C.Label(UiStrings.OcrModeLabel).AlignCenter().Padding(right: 40),
                 _ocrMode.Scale()
             ).Aligned(),
+            _ocrPreProcessing,
             _ocrAfterScanning,
             C.Filler(),
             L.Row(
@@ -125,6 +127,7 @@ private void UpdateView()
         _enableOcr.Enabled = !Config.AppLocked.Has(c => c.EnableOcr);
         _ocrLang.Enabled = isEnabled && !Config.AppLocked.Has(c => c.OcrLanguageCode);
         _ocrMode.Enabled = isEnabled && !Config.AppLocked.Has(c => c.OcrMode);
+        _ocrPreProcessing.Enabled = isEnabled && !Config.AppLocked.Has(c => c.OcrPreProcessing);
         _ocrAfterScanning.Enabled = isEnabled && !Config.AppLocked.Has(c => c.OcrAfterScanning);
         _moreLanguages.Enabled = !Config.AppLocked.Has(c => c.OcrLanguageCode);
     }
@@ -172,6 +175,7 @@ private void Save()
                 Config.User.Set(c => c.LastOcrMultiLangCode, _multiLangCode);
             }
             transact.Set(c => c.OcrMode, (LocalizedOcrMode) _ocrMode.SelectedIndex);
+            transact.Set(c => c.OcrPreProcessing, _ocrPreProcessing.IsChecked());
             transact.Set(c => c.OcrAfterScanning, _ocrAfterScanning.IsChecked());
             transact.Commit();
         }

NAPS2.Lib/Lang/Resources/SettingsResources.resx

@@ -267,15 +267,9 @@
   <data name="OcrMode_Fast" xml:space="preserve">
     <value>Fast</value>
   </data>
-  <data name="OcrMode_FastWithPreProcess" xml:space="preserve">
-    <value>Fast + Pre-Processing</value>
-  </data>
   <data name="OcrMode_Best" xml:space="preserve">
     <value>Best</value>
   </data>
-  <data name="OcrMode_BestWithPreProcess" xml:space="preserve">
-    <value>Best + Pre-Processing</value>
-  </data>
   <data name="SaveButtonDefaultAction_SaveAll" xml:space="preserve">
     <value>Save All</value>
   </data>

NAPS2.Lib/Lang/Resources/UiStrings.resx

@@ -471,6 +471,9 @@
   <data name="OcrModeLabel" xml:space="preserve">
     <value>OCR mode:</value>
   </data>
+  <data name="OcrPreProcessing" xml:space="preserve">
+    <value>Fix white balance and remove noise</value>
+  </data>
   <data name="RunOcrAfterScanning" xml:space="preserve">
     <value>Automatically run OCR after scanning</value>
   </data>

NAPS2.Lib/Ocr/LocalizedOcrMode.cs

@@ -6,11 +6,7 @@ public enum LocalizedOcrMode
 {
     [LocalizedDescription(typeof(SettingsResources), "OcrMode_Fast")]
     Fast,
-    [LocalizedDescription(typeof(SettingsResources), "OcrMode_FastWithPreProcess")]
-    FastWithPreProcess,
     [LocalizedDescription(typeof(SettingsResources), "OcrMode_Best")]
     Best,
-    [LocalizedDescription(typeof(SettingsResources), "OcrMode_BestWithPreProcess")]
-    BestWithPreProcess,
     Legacy // Deprecated, not mapped to the Sdk OcrMode
 }

NAPS2.Sdk/Ocr/OcrMode.cs

@@ -3,11 +3,13 @@
 /// <summary>
 /// The mode of an OCR request (fast/best), if supported by the engine.
 /// </summary>
+[Flags]
 public enum OcrMode
 {
-    Default,
-    Fast,
-    FastWithPreProcess,
-    Best,
-    BestWithPreProcess
+    Default = 0,
+    Fast = 1,
+    Best = 2,
+    WithPreProcess = 4,
+    FastWithPreProcess = Fast | WithPreProcess,
+    BestWithPreProcess = Best | WithPreProcess
 }

NAPS2.Sdk/Ocr/TesseractOcrEngine.cs

@@ -70,7 +70,7 @@ private TesseractOcrEngine(string tesseractPath, string? languageDataBasePath =
         string tempHocrFilePathWithExt = tempHocrFilePath + ".hocr";
         try
         {
-            if (ocrParams.Mode is OcrMode.FastWithPreProcess or OcrMode.BestWithPreProcess)
+            if (ocrParams.Mode.HasFlag(OcrMode.WithPreProcess))
             {
                 PreProcessImage(scanningContext, imagePath);
             }
@@ -88,7 +88,7 @@ private TesseractOcrEngine(string tesseractPath, string? languageDataBasePath =
                 string languageDataPath = _languageDataBasePath;
                 if (_withModes)
                 {
-                    string subfolder = ocrParams.Mode is OcrMode.Best or OcrMode.BestWithPreProcess ? "best" : "fast";
+                    string subfolder = ocrParams.Mode.HasFlag(OcrMode.Best) ? "best" : "fast";
                     languageDataPath = Path.Combine(languageDataPath, subfolder);
                 }
                 startInfo.EnvironmentVariables["TESSDATA_PREFIX"] = languageDataPath;