From b8cd5cd0b57653f1a69c962556ccf4bb3b753ae8 Mon Sep 17 00:00:00 2001 From: Andre Monteiro Date: Wed, 19 Aug 2020 14:52:04 -0300 Subject: [PATCH] Additional configuration options for Quagga2 (#844) --- config-dist.php | 9 ++++- public/viewjs/components/barcodescanner.js | 46 +++++++++++----------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/config-dist.php b/config-dist.php index f60a0433..156db9de 100644 --- a/config-dist.php +++ b/config-dist.php @@ -134,9 +134,14 @@ DefaultUserSetting('auto_reload_on_db_change', true); # Show a clock in the header next to the logo or not DefaultUserSetting('show_clock_in_header', false); -# Component configuration +# Component configuration for Quagga2 - read https://github.com/ericblade/quagga2#configobject for details +# Default for Grocy is as below +# For iPhone 7 PLus, halfsample = true, patchsize = small, frequency = 5 yields very good results DefaultUserSetting('quagga2_numofworkers', 4); - +DefaultUserSetting('quagga2_halfsample', false); +DefaultUserSetting('quagga2_patchsize', 'medium'); +DefaultUserSetting('quagga2_frequency', 10); +DefaultUserSetting('quagga2_debug', true); # Feature flags # grocy was initially about "stock management for your household", many other things diff --git a/public/viewjs/components/barcodescanner.js b/public/viewjs/components/barcodescanner.js index a9da9db8..f469765b 100644 --- a/public/viewjs/components/barcodescanner.js +++ b/public/viewjs/components/barcodescanner.js @@ -69,25 +69,25 @@ Grocy.Components.BarcodeScanner.StartScanning = function() } }, locator: { - patchSize: "medium", - halfSample: false, + patchSize: Grocy.UserSettings.quagga2_patchsize, + halfSample: Grocy.UserSettings.quagga2_halfsample, debug: { - showCanvas: true, - showPatches: true, - showFoundPatches: true, - showSkeleton: true, - showLabels: true, - showPatchLabels: true, - showRemainingPatchLabels: true, + showCanvas: Grocy.UserSettings.quagga2_debug, + showPatches: Grocy.UserSettings.quagga2_debug, + showFoundPatches: Grocy.UserSettings.quagga2_debug, + showSkeleton: Grocy.UserSettings.quagga2_debug, + showLabels: Grocy.UserSettings.quagga2_debug, + showPatchLabels: Grocy.UserSettings.quagga2_debug, + showRemainingPatchLabels: Grocy.UserSettings.quagga2_debug, boxFromPatches: { - showTransformed: true, - showTransformedBox: true, - showBB: true + showTransformed: Grocy.UserSettings.quagga2_debug, + showTransformedBox: Grocy.UserSettings.quagga2_debug, + showBB: Grocy.UserSettings.quagga2_debug } } }, numOfWorkers: Grocy.UserSettings.quagga2_numofworkers, - frequency: 10, + frequency: Grocy.UserSettings.quagga2_frequency, decoder: { readers: [ "ean_reader", @@ -95,17 +95,17 @@ Grocy.Components.BarcodeScanner.StartScanning = function() "code_128_reader" ], debug: { - showCanvas: true, - showPatches: true, - showFoundPatches: true, - showSkeleton: true, - showLabels: true, - showPatchLabels: true, - showRemainingPatchLabels: true, + showCanvas: Grocy.UserSettings.quagga2_debug, + showPatches: Grocy.UserSettings.quagga2_debug, + showFoundPatches: Grocy.UserSettings.quagga2_debug, + showSkeleton: Grocy.UserSettings.quagga2_debug, + showLabels: Grocy.UserSettings.quagga2_debug, + showPatchLabels: Grocy.UserSettings.quagga2_debug, + showRemainingPatchLabels: Grocy.UserSettings.quagga2_debug, boxFromPatches: { - showTransformed: true, - showTransformedBox: true, - showBB: true + showTransformed: Grocy.UserSettings.quagga2_debug, + showTransformedBox: Grocy.UserSettings.quagga2_debug, + showBB: Grocy.UserSettings.quagga2_debug } } },