Merge pull request #18 from rursprung/use-ostream-operator-for-result-printing

refactor analysis result printing & reduce OpenCV log level from INFO to WARN

Author: Nic822

apps/livecam/main.cpp

@@ -4,6 +4,7 @@
 #include <stdexcept>
 
 #include <opencv2/opencv.hpp>
+#include <opencv2/core/utils/logger.hpp>
 
 #include <banana-lib/lib.hpp>
 
@@ -26,17 +27,6 @@ auto GetVideoCaptureFromArgs(int const argc, char const * const argv[]) -> cv::V
     }
 }
 
-void PrintAnalysisResult(banana::AnnotatedAnalysisResult const& analysis_result) {
-    std::cout << "found " << analysis_result.banana.size() << " banana(s) in the picture" << std::endl;
-
-    for (auto const& [n, banana] : std::ranges::enumerate_view(analysis_result.banana)) {
-        auto const& [coeff_0, coeff_1, coeff_2] = banana.center_line_coefficients;
-        std::cout << "  Banana #" << n << ":" << std::endl;
-        std::cout << "    " << std::format("y = {} + {} * x + {} * x^2", coeff_0, coeff_1, coeff_2) << std::endl;
-        std::cout << std::endl;
-    }
-}
-
 void ShowAnalysisResult(banana::AnnotatedAnalysisResult const& analysis_result) {
     std::string const windowName = "analysis result | press q to quit";
     cv::namedWindow(windowName, cv::WINDOW_KEEPRATIO);
@@ -45,6 +35,8 @@ void ShowAnalysisResult(banana::AnnotatedAnalysisResult const& analysis_result)
 }
 
 int main(int const argc, char const * const argv[]) {
+    cv::utils::logging::setLogLevel(cv::utils::logging::LOG_LEVEL_WARNING);
+
     banana::Analyzer const analyzer{true};
     try {
         auto cap = GetVideoCaptureFromArgs(argc, argv);
@@ -73,7 +65,7 @@ Available action keys:
 
             switch (cv::pollKey()) {
                 case 'i':
-                    PrintAnalysisResult(*analysisResult);
+                    std::cout << *analysisResult;
                     break;
                 case 'q':
                     return 0;

apps/static-image/main.cpp

@@ -2,9 +2,9 @@
 #include <format>
 #include <iostream>
 #include <stdexcept>
-#include <numbers>
 
 #include <opencv2/opencv.hpp>
+#include <opencv2/core/utils/logger.hpp>
 
 #include <banana-lib/lib.hpp>
 
@@ -24,18 +24,6 @@ auto GetPathFromArgs(int const argc, char const * const argv[]) -> std::filesyst
     return image_path;
 }
 
-void PrintAnalysisResult(banana::AnnotatedAnalysisResult const& analysis_result) {
-    std::cout << "found " << analysis_result.banana.size() << " banana(s) in the picture" << std::endl;
-
-    for (auto const& [n, banana] : std::ranges::enumerate_view(analysis_result.banana)) {
-        auto const& [coeff_0, coeff_1, coeff_2] = banana.center_line_coefficients;
-        std::cout << "  Banana #" << n << ":" << std::endl;
-        std::cout << "    " << std::format("y = {} + {} * x + {} * x^2", coeff_0, coeff_1, coeff_2) << std::endl;
-        std::cout << "    Rotation = " << (banana.rotation_angle * 180 / std::numbers::pi) << " degrees" << std::endl;
-        std::cout << std::endl;
-    }
-}
-
 void ShowAnalysisResult(banana::AnnotatedAnalysisResult const& analysis_result) {
     std::string const windowName = "analysis result | press q to quit";
     cv::namedWindow(windowName, cv::WINDOW_KEEPRATIO);
@@ -45,6 +33,8 @@ void ShowAnalysisResult(banana::AnnotatedAnalysisResult const& analysis_result)
 }
 
 int main(int const argc, char const * const argv[]) {
+    cv::utils::logging::setLogLevel(cv::utils::logging::LOG_LEVEL_WARNING);
+
     banana::Analyzer const analyzer{true};
     try {
         auto const path = GetPathFromArgs(argc, argv);
@@ -53,7 +43,7 @@ int main(int const argc, char const * const argv[]) {
         auto const analysisResult = analyzer.AnalyzeAndAnnotateImage(img);
 
         if(analysisResult) {
-            PrintAnalysisResult(*analysisResult);
+            std::cout << *analysisResult;
             ShowAnalysisResult(*analysisResult);
         } else {
             std::cerr << "failed to analyse the image: " << analysisResult.error().ToString() << std::endl;

include/banana-lib/lib.hpp

@@ -76,6 +76,9 @@ namespace banana {
         std::list<AnalysisResult> banana;
     };
 
+    /// Print detailed information about the result to an output stream.
+    std::ostream& operator << (std::ostream& o, AnnotatedAnalysisResult const& analysis_result);
+
     class Analyzer {
     public:
         explicit Analyzer(bool verbose_annotations = false);

src/lib.cpp

@@ -1,3 +1,4 @@
+#include <numbers>
 #include <stdexcept>
 
 #include <polyfit/Polynomial2DFit.hpp>
@@ -36,6 +37,19 @@ namespace banana {
         return this->ToString();
     }
 
+    std::ostream& operator << (std::ostream& o, AnnotatedAnalysisResult const& analysis_result) {
+        o << "found " << analysis_result.banana.size() << " banana(s) in the picture" << std::endl;
+        for (auto const& [n, banana] : std::ranges::enumerate_view(analysis_result.banana)) {
+            auto const& [coeff_0, coeff_1, coeff_2] = banana.center_line_coefficients;
+            o << "  Banana #" << n << ":" << std::endl;
+            o << "    " << std::format("y = {} + {} * x + {} * x^2", coeff_0, coeff_1, coeff_2) << std::endl;
+            o << "    Rotation = " << (banana.rotation_angle * 180 / std::numbers::pi) << " degrees" << std::endl;
+            o << std::endl;
+        }
+
+        return o;
+    }
+
     Analyzer::Analyzer(bool const verbose_annotations) : verbose_annotations_(verbose_annotations) {
         cv::FileStorage fs("resources/reference-contours.yml", cv::FileStorage::READ);
         if (!fs.isOpened()) {