code: добавил svg

project/main.cpp

@@ -1,7 +1,8 @@
 #include <iostream>
 #include <vector>
 #include "histogram.h"
-#include "text.h"
+#include "svg.h"
+#include "show_svg.h"
 using namespace std;
 
 struct Input {
@@ -36,7 +37,7 @@ int main()
 {
     Input in = input_data();
     vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
-    show_histogram_text(bins, in.max_count, in.bin_count);
+    show_histogram_svg(bins);
     return 0;
 
 }

project/show_histogram.cpp

@@ -0,0 +1,38 @@
+#include "svg.h"
+
+void
+show_histogram_svg(const vector<size_t>& bins) {
+    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;
+    size_t longest;
+    if (!bins.empty()) {
+        longest = bins[0];
+    } else {
+        longest = 0;
+    }
+    for (size_t bin : bins) {
+        if (bin > longest) {
+            longest = bin;
+        }
+    }
+    for (size_t bin : bins) {
+            const double bin_width = BLOCK_WIDTH * bin;
+            if (bin == longest){
+                svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+                svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2");
+                top += BIN_HEIGHT;
+            } else{
+                svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+                svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "#000000", "#ff00a2");
+                top += BIN_HEIGHT;
+            }
+    }
+    svg_end();
+}

project/show_svg.h

@@ -0,0 +1,10 @@
+#ifndef SHOW_SVG_H_INCLUDED
+#define SHOW_SVG_H_INCLUDED
+
+#include <vector>
+using namespace std;
+
+void
+show_histogram_svg(const vector<size_t>& bins);
+
+#endif // SHOW_SVG_H_INCLUDED

project/svg.cpp

@@ -0,0 +1,30 @@
+#include <iostream>
+#include <vector>
+#include <string>
+#include "svg.h"
+using namespace std;
+
+void
+svg_begin(double width, double height) {
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' ";
+    cout << "height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height << "' ";
+    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+    cout << "</svg>\n";
+}
+
+void
+svg_text(double left, double baseline, string text) {
+    cout << "<text x='" << left << "' y='"<< baseline <<"'>"<< text <<"</text>";
+}
+
+void
+svg_rect(double x, double y, double width, double height, string stroke, string fill){
+    cout << "<rect x='"<< x <<"' y='"<< y <<"' width='"<< width <<"' height='"<< height <<"' stroke='"<< stroke <<"' fill='"<< fill <<"' />";
+}

project/svg.h

@@ -0,0 +1,13 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+#include <vector>
+#include <iostream>
+using namespace std;
+void svg_begin(double width, double height);
+
+void svg_end();
+
+void svg_text(double left, double baseline, string text);
+
+void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black");;
+#endif // SVG_H_INCLUDED