build: вариант 2

svg.cpp

@@ -1,11 +1,9 @@
-#include <math.h>
 #include <iostream>
-#include <conio.h>
-#include <vector>
-#include <string>
 #include "svg.h"
-using namespace std;
+#include <math.h>
+#include <string>
 
+using namespace std;
 
 void
 svg_begin(double width, double height) {
@@ -21,17 +19,22 @@ void
 svg_end() {
     cout << "</svg>\n";
 }
+
+int color(int bin, int max_count) {
+    int color;
+    return color = round((10 - (bin * 9) / max_count));
+}
+
 void
 svg_text(double left, double baseline, string text) {
-    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
+    cout << "<text x='" << left << "' y='" << baseline << "' > " << text << "</text>";
 }
 
-void svg_rect(double x, double y, double width, double height, string colour = "black", string fill = "black"){
-    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke = '"<<colour <<"' fill = '"<<fill<<"' />";
+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 << stroke << stroke << "' fill='" << "#" << fill << fill << fill << "'>" << "</rect>";
 }
 
-void
-show_histogram_svg(const vector<size_t>& bins) {
+void show_histogram_svg(const vector<size_t>& bins) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     const auto TEXT_LEFT = 20;
@@ -39,17 +42,21 @@ show_histogram_svg(const vector<size_t>& bins) {
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
     const auto BLOCK_WIDTH = 10;
+
+
+    svg_begin(400, 300);
+
     double top = 0;
     double max_count = bins[0];
     for (size_t i = 0; i < bins.size(); i++) {
         if (bins[i] > max_count)
             max_count = bins[i];
     }
-    svg_begin(400, 300);
     for (size_t bin : bins) {
-        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count);
+        int temp_color = color(bin, max_count);
+        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (bin / max_count);
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#FF00FF");
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, to_string(temp_color), to_string(temp_color));
         top += BIN_HEIGHT;
     }
     svg_end();