From 0b29726755e9f77056bf3a82660085eef2d1f87e Mon Sep 17 00:00:00 2001
From: DevyatovaMY <DevyatovaMY@mpei.ru>
Date: Sat, 27 Apr 2024 20:04:38 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=20=E2=84=969?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 svg.cpp        | 18 +++++++++++++++++-
 svg_internal.h |  7 +++++++
 unittest.cpp   | 11 +++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 svg_internal.h

diff --git a/svg.cpp b/svg.cpp
index 7b1ccd0..2fcfa13 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -5,6 +5,14 @@
 
 using namespace std;
 
+bool
+check_width(double width) {
+    if (width >= 3 && width <= 30)
+        return true;
+    else
+        return false;
+}
+
 void
 svg_text(double left, double baseline, string text) {
     cout << "<text x='" << left
@@ -47,8 +55,16 @@ show_histogram_svg(const vector<size_t>& bins) {
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
-    const auto BLOCK_WIDTH = 10;
+    double BLOCK_WIDTH = 0;
     const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+    cerr << "Enter block width: ";
+    cin >> BLOCK_WIDTH;
+    bool check = check_width(BLOCK_WIDTH);
+    while (!check) {
+    cerr << "Incorrectly enter. The block width must be >= 3px and <= 30 px. Please try again." << endl;
+    cin >> BLOCK_WIDTH;
+    check = check_width(BLOCK_WIDTH);
+    }
     size_t max_count = 0;
     for (size_t x : bins) {
         if (x > max_count) {
diff --git a/svg_internal.h b/svg_internal.h
new file mode 100644
index 0000000..6b28b0b
--- /dev/null
+++ b/svg_internal.h
@@ -0,0 +1,7 @@
+#ifndef SVG_INTERNAL_H_INCLUDED
+#define SVG_INTERNAL_H_INCLUDED
+
+bool
+check_width(double width);
+
+#endif // SVG_INTERNAL_H_INCLUDED
diff --git a/unittest.cpp b/unittest.cpp
index 5c3f8bd..dbbf756 100644
--- a/unittest.cpp
+++ b/unittest.cpp
@@ -2,6 +2,7 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
 #include "histogram_internal.h"
+#include "svg_internal.h"
 
 TEST_CASE("distinct positive numbers") {
     double min = 0;
@@ -52,3 +53,13 @@ TEST_CASE("empty vector") {
     CHECK(min == 0);
     CHECK(max == 0);
 }
+
+TEST_CASE("correct block width") {
+    bool check = check_width(23.5);
+    CHECK(check == true);
+}
+
+TEST_CASE("incorrect block width") {
+    bool check = check_width(59);
+    CHECK(check == false);
+}