From c40968c2848936aef6257f84e76ab7532a16ca8f Mon Sep 17 00:00:00 2001
From: "Alice (TimoshenkoAA)" <timoshenkoaa@mpei.ru>
Date: Sat, 27 Apr 2024 21:54:09 +0300
Subject: [PATCH] =?UTF-8?q?svg:=20=20=D0=B3=D0=B8=D1=81=D1=82=D0=BE=D0=B3?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20=D0=B4=D0=BE=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=86=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab01/histogram.cpp |  5 ++---
 lab01/svg.cpp       | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/lab01/histogram.cpp b/lab01/histogram.cpp
index 71dc381..3c033de 100644
--- a/lab01/histogram.cpp
+++ b/lab01/histogram.cpp
@@ -16,9 +16,8 @@ find_minmax(const vector<double>& numbers, double& min, double& max) {
         }
     }
 }
-
-std::vector<double>
-make_histogram(const std::vector<double>& numbers, size_t bin_count){
+vector<double>
+make_histogram(const vector<double>& numbers, size_t bin_count){
     vector<double> bins (bin_count);
 
     double min = 0, max = 0;
diff --git a/lab01/svg.cpp b/lab01/svg.cpp
index 1b08098..748bf82 100644
--- a/lab01/svg.cpp
+++ b/lab01/svg.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <vector>
+#include <string>
 using namespace std;
 
 void
@@ -18,7 +19,36 @@ svg_end() {
 }
 
 void
-show_histogram_svg(const vector <double>& bins) {
+svg_text(double left, double baseline, string text) {
+    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
+}
+
+void
+svg_rect(double x, double y, double width, double height, string stroke, string fill){
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />";
+}
+
+
+
+void
+show_histogram_svg(const vector<double>& bins) {
+    const auto IMAGE_WIDTH = 400;
+    const auto IMAGE_HEIGHT = 300;
+    const auto TEXT_LEFT = 20;
+    const auto TEXT_BASELINE = 20;
+    const auto TEXT_WIDTH = 50;
+    const auto BIN_HEIGHT = 30;
+    const auto BLOCK_WIDTH = 10;
+    string stroke = "black";
+    string fill = "black";
+
     svg_begin(400, 300);
+    double top = 0;
+    for (double bin : bins) {
+        const double bin_width = BLOCK_WIDTH * bin;
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, stroke, fill);
+        top += BIN_HEIGHT;
+    }
     svg_end();
 }