From b1b7dd3165879dc8eafdc17ccaf5b2601d2d0bbc Mon Sep 17 00:00:00 2001
From: BezhenarAN <bezhenaran@mpei.ru>
Date: Tue, 7 May 2024 22:56:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab1_orig.cbp |  2 ++
 main.cpp      |  2 +-
 svg.cpp       | 36 +++++++++++++++++++++++++++++++-----
 svg.h         |  2 +-
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/lab1_orig.cbp b/lab1_orig.cbp
index 1ca372d..731189d 100644
--- a/lab1_orig.cbp
+++ b/lab1_orig.cbp
@@ -40,6 +40,8 @@
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h">
 			<Option target="&lt;{~None~}&gt;" />
diff --git a/main.cpp b/main.cpp
index af7a402..b412814 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,7 +10,7 @@ using namespace std;
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
-    size_t USER_BIN_HEIGHT{};
+    double USER_BIN_HEIGHT{};
 };
 
 Input input_data() {
diff --git a/svg.cpp b/svg.cpp
index 96d572a..2241da6 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -26,6 +26,32 @@ void svg_rect(double x, double y, double width, double height){
         std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='black' fill='#33A220' ></rect>";
 }
 
+double calculate_bin_height (const std::vector<std::size_t>& bins, double USER_BIN_HEIGHT, double IMAGE_HEIGHT){
+
+    double BIN_HEIGHT;
+
+    if ( USER_BIN_HEIGHT < 0 ){
+
+        BIN_HEIGHT = 0;
+
+    } else {
+
+        BIN_HEIGHT = USER_BIN_HEIGHT;
+
+    }
+
+
+
+    auto USER_IMAGE_HEIGHT = bins.size() * BIN_HEIGHT;
+
+    if (USER_IMAGE_HEIGHT > IMAGE_HEIGHT){
+        BIN_HEIGHT = IMAGE_HEIGHT / bins.size();
+    }
+
+    return BIN_HEIGHT;
+
+}
+
 void
 show_histogram_svg(const std::vector<std::size_t>& bins, std::size_t USER_BIN_HEIGHT) {
 
@@ -35,19 +61,19 @@ show_histogram_svg(const std::vector<std::size_t>& bins, std::size_t USER_BIN_HE
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BLOCK_WIDTH = 10;
-    auto BIN_HEIGHT = USER_BIN_HEIGHT;
+
+
+
+    auto BIN_HEIGHT = calculate_bin_height (bins, USER_BIN_HEIGHT, IMAGE_HEIGHT);
+
     auto USER_IMAGE_HEIGHT = bins.size() * BIN_HEIGHT;
 
-    if (USER_IMAGE_HEIGHT > IMAGE_HEIGHT){
-        BIN_HEIGHT = IMAGE_HEIGHT / bins.size();
-    }
 
     const std::size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
     svg_begin(IMAGE_WIDTH, USER_IMAGE_HEIGHT);
     double top = 0;
 
 
-
     std::size_t maxbin=bins[0];
     for (std::size_t i=0; i < bins.size(); i++){
         if (maxbin < bins[i]){
diff --git a/svg.h b/svg.h
index a80dc65..7d9b273 100644
--- a/svg.h
+++ b/svg.h
@@ -4,6 +4,6 @@
 #include <vector>
 
 void
-show_histogram_svg(const std::vector<std::size_t>& bins, std::size_t USER_BIN_HEIGHT);
+show_histogram_svg(const std::vector<std::size_t>& bins, double USER_BIN_HEIGHT);
 
 #endif // SVG_H_INCLUDED