From a422c46ecad49e86189575f3362e8c35d248eaa7 Mon Sep 17 00:00:00 2001
From: YusufovYB <YusufovYB@mpei.ru>
Date: Sat, 20 May 2023 17:24:59 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BC=D0=B0=D1=81=D1=88=D1=82=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B3=D0=B8=D1=81=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 svg.cpp | 38 +++++++++++++++++++++-----------------
 svg.h   |  2 --
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/svg.cpp b/svg.cpp
index 7ef7072..4988b5d 100644
--- a/svg.cpp
+++ b/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<< "Block_wight=";
-        cin >> BLOCK_WIDTH;
+            cout<< "Error range from 3 to 30 pi" << endl;
+            cout<< "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();
 }
diff --git a/svg.h b/svg.h
index bf89b6e..8d55a3d 100644
--- a/svg.h
+++ b/svg.h
@@ -4,6 +4,4 @@
 #include <vector>
 
 void show_histogram_svg(const std::vector<size_t>& bins);
-
-
 #endif // SVG_H_INCLUDED