code: масштабирование svg

histogram.cpp

@@ -18,13 +18,13 @@ void find_minmax(const std::vector<double>& numbers, double& min, double& max)
     }
 }
 
-std::vector<double> make_histogram(const std::vector<double> &numbers, std::size_t bin_count)
+std::vector<std::size_t> make_histogram(const std::vector<double> &numbers, std::size_t bin_count)
 {
     double min = numbers[0];
     double max = numbers[0];
     find_minmax(numbers, min, max);
     double bin_size = (max - min) / bin_count;
-    std::vector<double>bins(bin_count);
+    std::vector<std::size_t>bins(bin_count);
 
     for (std::size_t i = 0; i < numbers.size(); i++)
     {

histogram.h

@@ -2,7 +2,7 @@
 #define HISTOGRAM_H_INCLUDED
 #include <vector>
 
-std::vector<double> make_histogram(const std::vector<double>& numbers, std::size_t bin_count);
+std::vector<std::size_t> make_histogram(const std::vector<double>& numbers, std::size_t bin_count);
 
 
 #endif // HISTOGRAM_H_INCLUDED

main.cpp

@@ -34,5 +34,5 @@ int main()
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
-    return 0;
+
 }

svg.cpp

@@ -19,11 +19,12 @@ void svg_text(double left, double baseline, std::string text) {
         std::cout << "<text x='" << left << "' y='"<< baseline <<"'>"<< text <<"</text>";
 }
 
-void svg_rect(double x, double y, double width, double height) {
-        std::cout << "<rect x='"<< x <<"' y='"<< y <<"' width='"<< width <<"' height='"<< height <<"' fill='#FF0000' />";
+void svg_rect(double x, double y, double width, double height, std::string stroke = "black", std::string fill = "black") {
+        std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='#000000' fill='#F8B496' ></rect>";
 }
 
-void show_histogram_svg(const std::vector<double>& bins) {
+void show_histogram_svg(const std::vector<std::size_t>& bins) {
+
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     const auto TEXT_LEFT = 20;
@@ -31,24 +32,37 @@ void show_histogram_svg(const std::vector<double>& bins) {
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
     const auto BLOCK_WIDTH = 10;
-    const std::size_t MAX_STAR = IMAGE_WIDTH - TEXT_WIDTH;
 
-    svg_begin(400, 300);
+    const std::size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
+    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;
-    }
 
-    std::size_t max_star_search=bins[0];
+    std::size_t maxbin=bins[0];
     for (std::size_t i=0; i < bins.size(); i++){
-        if (max_star_search < bins[i]){
-            max_star_search=bins[i];
+        if (maxbin < bins[i]){
+            maxbin=bins[i];
         }
     }
 
+    if (maxbin<=76) {
+        for (std::size_t i=0; i < bins.size(); i++) {
+            double bin_width= MAX_ASTERISK * (static_cast<double>(bins[i]) / maxbin);
+            svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+            top += BIN_HEIGHT;
+        }
+        svg_end();
+    }
+    else {
+        for (std::size_t i=0; i < bins.size(); i++) {
+            double bin_width = BLOCK_WIDTH * bins[i];
+            svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+            top += BIN_HEIGHT;
+        }
+        svg_end();
+    }
 
-    svg_end();
 }
+
+

svg.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-void show_histogram_svg(const std::vector<double>& bins);
+void show_histogram_svg(const std::vector<std::size_t>& bins);
 
 
 #endif // SVG_H_INCLUDED

text.cpp

@@ -1,11 +1,11 @@
 #include <iostream>
 #include <vector>
 #include "text.h"
+const size_t SCREEN_WIDTH = 80;
+const size_t MAX_STAR = SCREEN_WIDTH - 3 - 1;
 
-void show_histogram_text(const std::vector <double> &bins)
+void show_histogram_text(const std::vector <std::size_t> &bins)
 {
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_STAR = SCREEN_WIDTH - 3 - 1;
     size_t max_star_search = bins[-1];
 
     if (max_star_search > MAX_STAR)

text.h

@@ -2,6 +2,6 @@
 #define TEXT_H_INCLUDED
 #include <vector>
 
-void show_histogram_text(const std::vector<double> &bins);
+void show_histogram_text(const std::vector<std::size_t> &bins);
 
 #endif // TEXT_H_INCLUDED