code: добавление полноценного функционала гистограммы и изменение цвета гистограммы

svg.cpp

@@ -21,13 +21,26 @@ void svg_text(double left, double baseline, std::string text){
 }
 
 void show_histogram_svg(const std::vector<size_t>& bins){
-    svg_begin(400, 300);
-    svg_text(20, 20, std::to_string(bins[0]));
+    const auto IMAGE_WIDTH = 400;
+    const auto IMAGE_HEIGHT = 300;
+    const auto TEXT_LEFT = 20;
+    const auto TEXT_BASELINE = 20;
+    const auto TEXT_WIDTH = 50;
+    const auto BIN_HEIGHT = 30;
+    const auto BLOCK_WIDTH = 10;
+
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+    double top = 0;
+    for (size_t bin : bins) {
+        const double bin_width = BLOCK_WIDTH * bin;
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+        top += BIN_HEIGHT;
+    }
     svg_end();
 }
 
-/*
 void svg_rect(double x, double y, double width, double height){
-    std::cout << "<rect x='" << x << "' y='" width='" << width << "' height='" << height << "' />"
+    std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='red' fill='#ffeeee' />";
 }
-*/
+

svg.h

@@ -7,6 +7,6 @@ void svg_begin(double width, double height);
 void svg_end();
 void show_histogram_svg(const std::vector<size_t>& bins);
 void svg_text(double left, double baseline, std::string text);
-//void svg_rect(double x, double y, double width, double height)
+void svg_rect(double x, double y, double width, double height);
 
 #endif // SVG_H_INCLUDED