Rename decoder config 2 decoder options

karlheinzkurt · Jun 9, 2024 · 776615b · 776615b
1 parent 3d99a02
commit 776615b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/source/app/source/analyzer.cpp b/source/app/source/analyzer.cpp
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
                      std::back_inserter(decodingResults),
                      [&](auto const &contourDescriptor)
                      {
-                        auto config = cameraEnabled ? barcode::api::DecoderConfig{false, true} : barcode::api::DecoderConfig{pureEnabled, binarizerEnabled};
+                        auto config = cameraEnabled ? barcode::api::DecoderOptions{false, true} : barcode::api::DecoderOptions{pureEnabled, binarizerEnabled};
                         return decoder->decode(std::move(config), contourDescriptor); });
 
       auto interpreterResults = std::vector<std::optional<std::string>>{};

diff --git a/source/lib/api/source/DecoderFacade.cpp b/source/lib/api/source/DecoderFacade.cpp
@@ -65,7 +65,7 @@ namespace api
 
         bool getLocalBinarizer() const { return localBinarizer.value_or(false); }
 
-        barcode::api::DecoderConfig getDecoderConfig() const { return {getPureBarcode(), getLocalBinarizer()}; }
+        barcode::api::DecoderOptions getDecoderOptions() const { return {getPureBarcode(), getLocalBinarizer()}; }
 
         bool getFailOnDecodingError() const { return failOnDecodingError.value_or(false); }
 
@@ -221,7 +221,7 @@ namespace api
                   options->getDetectorType())),
               decoder(barcode::api::Decoder::create(
                   loggerFactory,
-                  options->getDecoderConfig())),
+                  options->getDecoderOptions())),
               signatureChecker(
                   options->publicKeyFilePath
                       ? uic918::api::SignatureChecker::create(loggerFactory, *options->publicKeyFilePath)

diff --git a/source/lib/barcode/api/include/Decoder.h b/source/lib/barcode/api/include/Decoder.h
@@ -14,7 +14,7 @@
 namespace barcode::api
 {
 
-  struct DecoderConfig
+  struct DecoderOptions
   {
     bool const pure;
     bool const binarize;
@@ -27,12 +27,12 @@ namespace barcode::api
 
     virtual api::Result decode(dip::detection::api::Descriptor const &descriptor) = 0;
 
-    virtual api::Result decode(DecoderConfig config, dip::detection::api::Descriptor const &descriptor) = 0;
+    virtual api::Result decode(DecoderOptions options, dip::detection::api::Descriptor const &descriptor) = 0;
 
     virtual api::Result decode(unsigned int id, cv::Rect const &box, cv::Mat const &image) = 0;
 
-    virtual api::Result decode(DecoderConfig config, unsigned int id, cv::Rect const &box, cv::Mat const &image) = 0;
+    virtual api::Result decode(DecoderOptions options, unsigned int id, cv::Rect const &box, cv::Mat const &image) = 0;
 
-    static std::unique_ptr<Decoder> create(::utility::LoggerFactory &loggerFactory, DecoderConfig config = {false, false});
+    static std::unique_ptr<Decoder> create(::utility::LoggerFactory &loggerFactory, DecoderOptions defaultOptions = {false, false});
   };
 }
diff --git a/source/lib/barcode/api/source/Decoder.cpp b/source/lib/barcode/api/source/Decoder.cpp
@@ -5,8 +5,8 @@
 
 namespace barcode::api
 {
-  std::unique_ptr<Decoder> Decoder::create(::utility::LoggerFactory &loggerFactory, DecoderConfig config)
+  std::unique_ptr<Decoder> Decoder::create(::utility::LoggerFactory &loggerFactory, DecoderOptions defaultOptions)
   {
-    return std::unique_ptr<Decoder>(new detail::AztecDecoder(loggerFactory, std::move(config)));
+    return std::unique_ptr<Decoder>(new detail::AztecDecoder(loggerFactory, std::move(defaultOptions)));
   }
 }
diff --git a/source/lib/barcode/detail/include/AztecDecoder.h b/source/lib/barcode/detail/include/AztecDecoder.h
@@ -16,14 +16,14 @@ namespace barcode::detail
     std::shared_ptr<Internal> internal;
 
   public:
-    AztecDecoder(::utility::LoggerFactory &loggerFactory, api::DecoderConfig defaultConfig);
+    AztecDecoder(::utility::LoggerFactory &loggerFactory, api::DecoderOptions defaultOptions);
 
     virtual api::Result decode(dip::detection::api::Descriptor const &descriptor) override;
 
-    virtual api::Result decode(api::DecoderConfig config, dip::detection::api::Descriptor const &descriptor) override;
+    virtual api::Result decode(api::DecoderOptions options, dip::detection::api::Descriptor const &descriptor) override;
 
     virtual api::Result decode(unsigned int id, cv::Rect const &box, cv::Mat const &image) override;
 
-    virtual api::Result decode(api::DecoderConfig config, unsigned int id, cv::Rect const &box, cv::Mat const &image) override;
+    virtual api::Result decode(api::DecoderOptions options, unsigned int id, cv::Rect const &box, cv::Mat const &image) override;
   };
 }
diff --git a/source/lib/barcode/detail/source/AztecDecoder.cpp b/source/lib/barcode/detail/source/AztecDecoder.cpp
@@ -9,13 +9,13 @@
 namespace barcode::detail
 {
 
-  ZXing::ReaderOptions createOptions(api::DecoderConfig config)
+  ZXing::ReaderOptions createOptions(api::DecoderOptions decoderOptions)
   {
     ZXing::ReaderOptions options;
     options.setFormats(ZXing::BarcodeFormat::Aztec);
-    options.setBinarizer(config.binarize ? ZXing::Binarizer::LocalAverage : ZXing::Binarizer::BoolCast);
+    options.setBinarizer(decoderOptions.binarize ? ZXing::Binarizer::LocalAverage : ZXing::Binarizer::BoolCast);
     options.setCharacterSet(ZXing::CharacterSet::BINARY);
-    options.setIsPure(config.pure);
+    options.setIsPure(decoderOptions.pure);
     options.setTryRotate(true);
     options.setTryHarder(true);
     options.setTryDownscale(true);
@@ -75,8 +75,8 @@ namespace barcode::detail
     }
   };
 
-  AztecDecoder::AztecDecoder(::utility::LoggerFactory &loggerFactory, api::DecoderConfig defaultConfig)
-      : internal(std::make_shared<Internal>(loggerFactory, createOptions(std::move(defaultConfig))))
+  AztecDecoder::AztecDecoder(::utility::LoggerFactory &loggerFactory, api::DecoderOptions defaultOptions)
+      : internal(std::make_shared<Internal>(loggerFactory, createOptions(std::move(defaultOptions))))
   {
   }
 
@@ -85,18 +85,18 @@ namespace barcode::detail
     return internal->decode(internal->defaultOptions, descriptor.id, descriptor.square, descriptor.image);
   }
 
-  api::Result AztecDecoder::decode(api::DecoderConfig config, dip::detection::api::Descriptor const &descriptor)
+  api::Result AztecDecoder::decode(api::DecoderOptions options, dip::detection::api::Descriptor const &descriptor)
   {
-    return internal->decode(createOptions(config), descriptor.id, descriptor.square, descriptor.image);
+    return internal->decode(createOptions(options), descriptor.id, descriptor.square, descriptor.image);
   }
 
   api::Result AztecDecoder::decode(unsigned int id, cv::Rect const &box, cv::Mat const &image)
   {
     return internal->decode(internal->defaultOptions, id, box, image);
   }
 
-  api::Result AztecDecoder::decode(api::DecoderConfig config, unsigned int id, cv::Rect const &box, cv::Mat const &image)
+  api::Result AztecDecoder::decode(api::DecoderOptions options, unsigned int id, cv::Rect const &box, cv::Mat const &image)
   {
-    return internal->decode(createOptions(config), id, box, image);
+    return internal->decode(createOptions(options), id, box, image);
   }
 }