dev: Guard logs to be able to use clang-uml.

cosmin42 · Sep 15, 2024 · a9f6843 · a9f6843
1 parent d555e20
commit a9f6843
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 10 deletions.
diff --git a/PB/include/pb/persistence/SerializationStrategy.h b/PB/include/pb/persistence/SerializationStrategy.h
@@ -76,8 +76,9 @@ std::variant<Json, PBDev::Error> serialize(int depth, T object)
 #else
   Json json = object;
 #endif
-
+#ifndef _CLANG_UML_
   spdlog::info("{}T {}\n", std::string(depth * 2, ' '), json.dump());
+#endif
   return json;
 }
 
@@ -94,7 +95,9 @@ serialize(int depth, std::pair<std::string, T> const &entry)
 #else
   json[entry.first] = entry.second;
 #endif
+#ifndef _CLANG_UML_
   spdlog::info("{}T {}\n", std::string(depth * 2, ' '), json.dump());
+#endif
   return json;
 }
 
@@ -109,23 +112,25 @@ serialize(int depth, std::pair<std::string, Head> const &head,
   if (std::holds_alternative<PBDev::Error>(jsonOrError)) {
     return jsonOrError;
   }
+#ifndef _CLANG_UML_
   spdlog::info("{}T {}\n", std::string(depth * 2, ' '),
                std::get<Json>(jsonOrError).dump());
-
+#endif
   std::variant<Json, PBDev::Error> headJsonOrError =
       serialize<Head>(depth + 1, head);
 
   if (std::holds_alternative<PBDev::Error>(headJsonOrError)) {
     return headJsonOrError;
   }
-
+#ifndef _CLANG_UML_
   spdlog::info("{}T {}\n", std::string(depth * 2, ' '),
                std::get<Json>(headJsonOrError).dump());
-
+#endif
   std::get<Json>(jsonOrError).update(std::get<Json>(headJsonOrError));
-
+#ifndef _CLANG_UML_
   spdlog::info("{}T {}\n", std::string(depth * 2, ' '),
                std::get<Json>(jsonOrError).dump());
+#endif
   return jsonOrError;
 }
 

diff --git a/PB/src/CollageLibraryAssistant.cpp b/PB/src/CollageLibraryAssistant.cpp
@@ -81,7 +81,9 @@ Path CollageLibraryAssistant::createNumberedImage(cv::Size    pageSize,
   auto imagePath = mOutputFolder / Path(name);
   bool success = cv::imwrite(imagePath.string(), *image);
   PBDev::basicAssert(success);
+#ifndef _CLANG_UML_
   spdlog::info("Image created: {}", (mOutputFolder / Path(name)).string());
+#endif
   return Path(name);
 }
 } // namespace PB
diff --git a/PB/src/CollageThumbnailsMakerJob.cpp b/PB/src/CollageThumbnailsMakerJob.cpp
@@ -132,9 +132,11 @@ void CollageThumbnailsMakerJob::createCustomSVGTemplate(unsigned i)
                         mProject->paperSettings.height / 2};
 
   Path path = mSourceTemplates.at(i).path;
+#ifndef _CLANG_UML_
   spdlog::info("Generating thumbnail for template: {}", path.string());
-  auto processedPath = mAssistant->createTemplateThumbnail(mNumberedImages, path,
-                                                          {4, 3}, imageSize);
+#endif
+  auto processedPath = mAssistant->createTemplateThumbnail(
+      mNumberedImages, path, {4, 3}, imageSize);
 
   mProcessedSVGPaths.push_back(processedPath);
 }
@@ -175,8 +177,10 @@ void CollageThumbnailsMakerJob::mapJobs()
   mNumberedImages = mAssistant->createNumberedImages(imageSize);
 
   for (auto &collageTemplateInfo : templatesList) {
+#ifndef _CLANG_UML_
     spdlog::info("Generating thumbnail for template: {}",
                  collageTemplateInfo.path.string());
+#endif
     auto processedPath = mAssistant->createTemplateThumbnail(
         mNumberedImages, collageTemplateInfo.path, {4, 3}, imageSize);
 

diff --git a/PB/src/Config.cpp b/PB/src/Config.cpp
@@ -14,7 +14,9 @@ void basicAssert(int shouldBetrue, const std::source_location location)
     std::string message = std::string(location.function_name()) + ":" +
                           std::to_string(location.line());
 
+#ifndef _CLANG_UML_
     spdlog::info("{}\n", message);
+#endif
   }
 #ifdef _DEBUG
   assert(shouldBetrue);

diff --git a/PB/src/ImageOperations.cpp b/PB/src/ImageOperations.cpp
@@ -379,7 +379,9 @@ void writeImageOnDisk(std::shared_ptr<cv::Mat> image, Path full)
 {
   bool success = cv::imwrite(full.string(), *image);
   PBDev::basicAssert(success);
+#ifndef _CLANG_UML_
   spdlog::info("Image written to {}", full.string());
+#endif
 }
 
 void imageWriteThumbnail(int screenWidth, int screenHeight,
@@ -396,7 +398,9 @@ void imageWriteThumbnail(int screenWidth, int screenHeight,
 
   bool success = cv::imwrite(medium.string(), *mediumImagePointer);
   PBDev::basicAssert(success);
+#ifndef _CLANG_UML_
   spdlog::info("Medium thumbnail written to {}", medium.string());
+#endif
 
   auto smallImagePointer = PB::Process::resize(
       image,
@@ -405,7 +409,9 @@ void imageWriteThumbnail(int screenWidth, int screenHeight,
 
   success = cv::imwrite(small.string(), *smallImagePointer);
   PBDev::basicAssert(success);
+#ifndef _CLANG_UML_
   spdlog::info("Small thumbnail written to {}", small.string());
+#endif
 }
 
 unsigned pointsFromPixels(double points, unsigned ppi)

diff --git a/PB/src/SVGInflater.cpp b/PB/src/SVGInflater.cpp
@@ -45,7 +45,9 @@ std::optional<std::string> SVGInflater::inflate(BasicSVGModel svgModel,
     return inja::render(content, model);
   }
   catch (const std::exception ex) {
+#ifndef _CLANG_UML_
     spdlog::error("Error rendering SVG: {}", ex.what());
+#endif
     return std::nullopt;
   }
 }

diff --git a/PB/src/SerializationStrategy.cpp b/PB/src/SerializationStrategy.cpp
@@ -242,8 +242,10 @@ serialize(int depth, std::pair<std::string, boost::uuids::uuid> const &entry)
 {
   Json json;
   json[entry.first] = boost::uuids::to_string(entry.second);
+#ifndef _CLANG_UML_
   spdlog::info("{}(string, uuid) {}\n", std::string(depth * 2, ' '),
                json.dump());
+#endif
   return json;
 }
 
@@ -260,8 +262,10 @@ serialize(int depth, std::pair<std::string, std::vector<Path>> const &entry)
     }
     json[entry.first].push_back(std::get<Json>(jasonOrError));
   }
+#ifndef _CLANG_UML_
   spdlog::info("{}(string, vector) {}\n", std::string(depth * 2, ' '),
                json.dump());
+#endif
   return json;
 }
 
@@ -277,9 +281,10 @@ serialize(int depth,
   for (auto bimapEntry : entry.second) {
     json[entry.first][bimapEntry.left.string()] = bimapEntry.right;
   }
-
+#ifndef _CLANG_UML_
   spdlog::info("{}(bimap<Path, string>) {}\n", std::string(depth * 2, ' '),
                json.dump());
+#endif
   return json;
 }
 
@@ -298,8 +303,10 @@ serialize(int depth, std::pair<std::string, PaperSettings> const &entry)
   }
   Json json;
   json[key] = std::get<Json>(jsonOrError);
+#ifndef _CLANG_UML_
   spdlog::info("{}(string, PaperSettings) {}\n", std::string(depth * 2, ' '),
                json.dump());
+#endif
   return json;
 }
 
@@ -318,8 +325,10 @@ serialize(int depth, std::pair<std::string, Project> const &entry)
 
   Json json;
   json[key] = std::get<Json>(jsonOrError);
+#ifndef _CLANG_UML_
   spdlog::info("{}(string, Project) {}\n", std::string(depth * 2, ' '),
                json.dump());
+#endif
   return json;
 }
 
@@ -332,10 +341,10 @@ serialize(int depth, std::pair<std::string, VirtualImageType> const &entry)
   Json json;
 
   json[key] = magic_enum::enum_name(imageType);
-
+#ifndef _CLANG_UML_
   spdlog::info("%s(string, RegularImage) %s\n",
                std::string(depth * 2, ' ').c_str(), json.dump().c_str());
-
+#endif
   return json;
 }
 
@@ -362,8 +371,10 @@ serialize(int                                                          depth,
 
   Json json;
   json[key] = std::get<Json>(jsonOrError);
+#ifndef _CLANG_UML_
   spdlog::info("%s(string, RegularImage) %s\n",
                std::string(depth * 2, ' ').c_str(), json.dump());
+#endif
   return json;
 }