[SVG] Refactor svgDrawer openMVG#1658

jjzhang166 · Feb 2, 2023 · 44a6e56 · 44a6e56
1 parent 358f0df
commit 44a6e56
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 281 deletions.
diff --git a/src/openMVG/features/sift/sift_test.cpp b/src/openMVG/features/sift/sift_test.cpp
@@ -10,7 +10,7 @@
 #include "openMVG/features/sift/SIFT_Anatomy_Image_Describer.hpp"
 #include "openMVG/image/image_io.hpp"
 #include "openMVG/system/timer.hpp"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "testing/testing.h"
 

diff --git a/src/openMVG/matching/svg_matches.cpp b/src/openMVG/matching/svg_matches.cpp
@@ -8,7 +8,7 @@
 
 #include <openMVG/matching/svg_matches.hpp>
 #include <openMVG/features/feature.hpp>
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 namespace openMVG {
 namespace matching {

diff --git a/src/openMVG/multiview/translation_averaging_test.hpp b/src/openMVG/multiview/translation_averaging_test.hpp
@@ -20,9 +20,9 @@
 #include "openMVG/multiview/test_data_sets.hpp"
 #include "openMVG/multiview/translation_averaging_common.hpp"
 #include "openMVG/numeric/numeric.h"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "testing/testing.h"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
 
 int modifiedMod
 (

diff --git a/src/openMVG/numeric/lm_test.cpp b/src/openMVG/numeric/lm_test.cpp
@@ -8,9 +8,9 @@
 
 #include "openMVG/numeric/numeric.h"
 #include "openMVG/numeric/lm.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "testing/testing.h"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <unsupported/Eigen/NonLinearOptimization>
 #include <unsupported/Eigen/NumericalDiff>

diff --git a/src/openMVG/robust_estimation/robust_estimator_ACRansac_test.cpp b/src/openMVG/robust_estimation/robust_estimator_ACRansac_test.cpp
@@ -10,9 +10,9 @@
 #include "openMVG/robust_estimation/robust_estimator_ACRansac.hpp"
 #include "openMVG/robust_estimation/robust_estimator_lineKernel_test.hpp"
 #include "openMVG/numeric/extract_columns.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "testing/testing.h"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <iterator>
 #include <random>

diff --git a/src/openMVG/sfm/sfm_report.cpp b/src/openMVG/sfm/sfm_report.cpp
@@ -14,11 +14,11 @@
 #include <vector>
 
 #include "openMVG/sfm/sfm_data.hpp"
+#include "openMVG/vector_graphics/svgHistogram.hpp"
 
 #include "third_party/histogram/histogram.hpp"
 #include "third_party/htmlDoc/htmlDoc.hpp"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include  "openMVG/vector_graphics/svgHistogram.hpp"
 
 namespace openMVG {
 namespace sfm {

diff --git a/src/openMVG_Samples/features_kvld_filter/kvld_filter.cpp b/src/openMVG_Samples/features_kvld_filter/kvld_filter.cpp
@@ -17,7 +17,7 @@
 
 #include "third_party/cmdLine/cmdLine.h"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <cstdlib>
 #include <iostream>

diff --git a/src/openMVG_Samples/image_spherical_to_pinholes/main_pano_converter.cpp b/src/openMVG_Samples/image_spherical_to_pinholes/main_pano_converter.cpp
@@ -11,7 +11,7 @@
 
 #include "third_party/cmdLine/cmdLine.h"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <fstream>
 #include <iostream>

diff --git a/...VG_Samples/multiview_robust_estimation_tutorial/robust_estimation_tutorial_homography.cpp b/...VG_Samples/multiview_robust_estimation_tutorial/robust_estimation_tutorial_homography.cpp
@@ -33,7 +33,7 @@
 #include "openMVG/robust_estimation/robust_estimator_ACRansacKernelAdaptator.hpp"
 
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <string>
 #include <iostream>

diff --git a/src/openMVG_Samples/multiview_robust_fundamental_guided/robust_fundamental_guided.cpp b/src/openMVG_Samples/multiview_robust_fundamental_guided/robust_fundamental_guided.cpp
@@ -19,7 +19,7 @@
 #include "openMVG/robust_estimation/robust_estimator_ACRansac.hpp"
 #include "openMVG/robust_estimation/robust_estimator_ACRansacKernelAdaptator.hpp"
 
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
 
 #include <iostream>

diff --git a/src/openMVG_Samples/multiview_robust_homography_guided/robust_homography_guided.cpp b/src/openMVG_Samples/multiview_robust_homography_guided/robust_homography_guided.cpp
@@ -19,10 +19,10 @@
 #include "openMVG/robust_estimation/robust_estimator_ACRansac.hpp"
 #include "openMVG/robust_estimation/robust_estimator_ACRansacKernelAdaptator.hpp"
 #include "openMVG/types.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "third_party/cmdLine/cmdLine.h"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <cstdlib>
 #include <iostream>

diff --git a/src/software/SfM/main_ComputeVLAD.cpp b/src/software/SfM/main_ComputeVLAD.cpp
@@ -21,10 +21,11 @@
 #include "openMVG/stl/stl.hpp"
 #include "openMVG/system/loggerprogress.hpp"
 #include "openMVG/system/timer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "third_party/cmdLine/cmdLine.h"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include "third_party/vectorGraphics/svgDrawer.hpp"
+
 
 #include <cstdlib>
 #include <iostream>
@@ -62,7 +63,7 @@ void saveRetrievalMatrix(
     const std::string ref_view_filename =
         stlplus::create_filespec(sfm_data.s_root_path, ref_view->s_Img_path);
 
-    svg_stream.drawImage(ref_view_filename, size, size, x_offset * size,
+    svg_stream << svg::drawImage(ref_view_filename, size, size, x_offset * size,
                          y_offset * size);
 
     const auto &retrieval_list = result_it.second;
@@ -74,7 +75,7 @@ void saveRetrievalMatrix(
       const std::string found_view_filename = stlplus::create_filespec(
           sfm_data.s_root_path, found_view->s_Img_path);
 
-      svg_stream.drawImage(found_view_filename, size, size, x_offset * size,
+      svg_stream << svg::drawImage(found_view_filename, size, size, x_offset * size,
                            y_offset * size);
     }
     x_offset = 0;

diff --git a/src/software/SfM/main_ListMatchingPairs.cpp b/src/software/SfM/main_ListMatchingPairs.cpp
@@ -11,12 +11,11 @@
 #include "openMVG/sfm/sfm_data.hpp"
 #include "openMVG/sfm/sfm_data_io.hpp"
 #include "openMVG/system/loggerprogress.hpp"
-
 #include "openMVG/system/timer.hpp"
+#include "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include "third_party/cmdLine/cmdLine.h"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
-#include  "openMVG/vector_graphics/svgDrawer.hpp"
 
 #include <cstdlib>
 #include <string>