code: оформление гистограммы svg

svg.cpp

@@ -4,14 +4,23 @@
 #include "svg.h"
 using namespace std;
 
+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;
+const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+
 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) {
-    cout << "<rect x='" << x<< "' y='" << y<< "' width='" << width<< "' height='" << height<< "' />\n";
+svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "aaaaaa") {
+    cout << "<rect x='" << x<< "' y='" << y<< "' width='" << width<< "' height='" << height<< "' stroke='" << stroke<< "' fill='" << fill << "' />\n";
 }
 
 void
@@ -31,17 +40,24 @@ svg_end() {
 
 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;
+    const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+    size_t max_count = 0;
+    for (size_t x : bins) {
+        if (x > max_count) {
+            max_count = x;
+        }
+    }
+    if (max_count == 0) {
+        max_count = 1;
+    }
+    auto scale_factor = static_cast<double>(MAX_WIDTH) / (max_count * BLOCK_WIDTH);
+    if (scale_factor > 1) {
+        scale_factor = 1;
+    }
     svg_begin(400, 300);
     double top = 0;
     for (size_t bin : bins) {
-        const double bin_width = BLOCK_WIDTH * bin;
+        double bin_width = BLOCK_WIDTH * bin * scale_factor;
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
         svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
         top += BIN_HEIGHT;