From 9279645ea9ddb043fe24a90cb69792c9f195074c Mon Sep 17 00:00:00 2001
From: IshutinaYI <ishutinayi@mpei.ru>
Date: Sun, 23 Apr 2023 07:31:57 +0300
Subject: [PATCH] =?UTF-8?q?pic:=20=D0=94=D0=B8=D0=B0=D0=B3=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B0=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=D1=8E=20=D0=B7=D0=B0=20=D0=B8=D1=81=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=BC=D0=B0=D1=81?=
 =?UTF-8?q?=D1=88=D1=82=D0=B0=D0=B1=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fin_lab34.cbp | 10 +++++++++-
 svg.cpp       | 22 +++++++++++++++++-----
 svg.h         |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/fin_lab34.cbp b/fin_lab34.cbp
index d5952e7..2b3d25a 100644
--- a/fin_lab34.cbp
+++ b/fin_lab34.cbp
@@ -32,7 +32,15 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="main.cpp" />
+		<Unit filename=".gitignore" />
+		<Unit filename="fin_lab34.cpp" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>
diff --git a/svg.cpp b/svg.cpp
index e8688a7..e15ff44 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -22,13 +22,25 @@ svg_text(double left, double baseline, string text){
     cout << "<text x='" << left << "' y='" << baseline <<"' >" << text << "</text>" << endl;
 }
 void
-svg_rect(double x, double y, double width, double height){
-    cout << "<rect x='" << x << "' y='" << y << "' width= '" << width << "' height= '" << height << "'/>";
+svg_rect(double x, double y, double width, double height, string stroke = "#ed53a8", string fill = "#9df3a1"){
+    cout << "<rect x='" << x << "' y='" << y << "' width= '" << width << "' height= '" << height << "' stroke= '" << stroke << "' fill= '" << fill << "'/>" << endl;
 }
 void
 show_histogram_svg(const vector <size_t> &bins) {
-    svg_begin(400, 300);
-    svg_text(20, 20, to_string(bins[0]));
-    svg_rect(50, 0, bins[0]*10, 30);
+    const auto IMAGE_WIDTH = 800;
+    const auto IMAGE_HEIGHT = 600;
+    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;
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+    double top = 0;
+    for (size_t 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);
+        top += BIN_HEIGHT;
+    }
     svg_end();
 }
diff --git a/svg.h b/svg.h
index 4888808..6421fce 100644
--- a/svg.h
+++ b/svg.h
@@ -13,7 +13,7 @@ void
 svg_text(double left, double baseline, string text);
 
 void
-svg_rect(double x, double y, double width, double height);
+svg_rect(double x, double y, double width, double height, string stroke, string fill);
 
 void
 show_histogram_svg(const vector <size_t> &bins);