code: Добавлено масштабирование для гистограммы

svg.cpp

@@ -1,6 +1,7 @@
-
+#include <iostream>
 #include "svg.h"
 #include <string>
+#include "histogram_internal.h"
 using namespace std;
 
 void svg_begin(double width, double height)
@@ -30,7 +31,8 @@ void svg_rect(double x, double y, double width, double height, string stroke = "
     cout << "<rect x='" << x << "' y='" << y << "' width='" << width
               << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << " '/>";
 }
-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;
@@ -48,40 +50,42 @@ void show_histogram_svg(const vector<size_t> &bins){
         if (bin > max_count)
             max_count = bin;
     }
-	cout << "Block_wight=";
+	cerr << "BLOCK_WIDTH=";
     double BLOCK_WIDTH;
     cin >> BLOCK_WIDTH;
     bool prov=1;
+
     if((BLOCK_WIDTH<3) || (BLOCK_WIDTH>30)){
+        BLOCK_WIDTH = -1;
         prov=0;
         while(prov==0){
-        cout<< "Error range from 3 to 30 pi" << endl;
+            cout<< "Error range from 3 to 30 pi" << endl;
-        cout<< "Block_wight=";
+            cout<< "BLOCK_WIDTH=";
-        cin >> BLOCK_WIDTH;
+            cin >> BLOCK_WIDTH;
         if((BLOCK_WIDTH>3) && (BLOCK_WIDTH<30) ){
             prov=1;
             }
     }
   }
 
-
+if ((max_count * BLOCK_WIDTH) > (IMAGE_WIDTH - TEXT_WIDTH)){
     for (size_t bin : bins)
+    {
+        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (static_cast<double>(bin)/max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green");
+        top += BIN_HEIGHT;
+    }
+  }
+else{
+        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, "blue", "green");
         top += BIN_HEIGHT;
     }
-
+}
-
-
-
-
-
-
-
-
-
 
     svg_end();
 }

svg.h

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