From 1088349152fbc59caf6acb4e7be4b7a4e86ff2b9 Mon Sep 17 00:00:00 2001
From: "Yaroslav (PivovarovYV)" <PivovarovYV@mpei.ru>
Date: Mon, 24 Apr 2023 15:36:26 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B0=D1=80=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=BC=D1=8B=20=D0=B4=D0=BE=20=D0=B8=D0=BD=D0=B4=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp        |  2 +-
 project3.cbp    |  4 ++++
 project3.depend |  5 ++---
 project3.layout | 34 +++++++++++++++++++++++++++-------
 svg.cpp         | 25 +++++++++++++++++++++++--
 unitest.cbp     |  4 ++++
 6 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/main.cpp b/main.cpp
index d3676af..19c5a82 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,7 +26,7 @@ input_data() {
         cin >> in.numbers[i];
     }
 
-    cout << "Enter number of bins";
+    cerr << "Enter number of bins";
     cin >> in.bin_count;
     return in;
 }
diff --git a/project3.cbp b/project3.cbp
index 2270934..57c9634 100644
--- a/project3.cbp
+++ b/project3.cbp
@@ -40,6 +40,10 @@
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h">
 			<Option target="&lt;{~None~}&gt;" />
diff --git a/project3.depend b/project3.depend
index a0f7a3f..f777c7f 100644
--- a/project3.depend
+++ b/project3.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1682281180 source:c:\users\hp\desktop\lab-03\project3\main.cpp
+1682333921 source:c:\users\hp\desktop\lab-03\project3\main.cpp
 	<iostream>
 	<vector>
 	<cmath>
@@ -33,14 +33,13 @@
 1682275464 c:\users\hp\desktop\lab-03\project3\histogram_internal.h
 	<vector>
 
-1682280773 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
+1682282112 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
 	<math.h>
 	<iostream>
 	<conio.h>
 	<vector>
 	<string>
 	"svg.h"
-	<conio.h>
 
 1682278136 c:\users\hp\desktop\lab-03\project3\svg.h
 	<vector>
diff --git a/project3.layout b/project3.layout
index 5bf559e..367d5da 100644
--- a/project3.layout
+++ b/project3.layout
@@ -2,24 +2,44 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="histogram.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="svg.cpp" open="1" top="1" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="175" topLine="0" />
+			<Cursor1 position="819" topLine="14" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="133" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram_internal.h" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="99" topLine="0" />
+			<Cursor1 position="677" topLine="23" />
 		</Cursor>
 	</File>
-	<File name="text.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="text.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="77" topLine="0" />
+			<Cursor1 position="95" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="histogram.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="svg.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="160" topLine="0" />
+			<Cursor1 position="98" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="175" topLine="0" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/svg.cpp b/svg.cpp
index c590e2d..f81e0c2 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -26,10 +26,31 @@ 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 colour = "black", string fill = "black"){
+    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke = '"<<colour <<"' fill = '"<<fill<<"' />";
+}
+
 void
 show_histogram_svg(const vector<size_t>& 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;
+    double top = 0;
+    double max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++) {
+        if (bins[i] > max_count)
+            max_count = bins[i];
+    }
     svg_begin(400, 300);
-    svg_text(20, 20, to_string(bins[0]));
+    for (size_t bin : bins) {
+        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#FF00FF");
+        top += BIN_HEIGHT;
+    }
     svg_end();
 }
-
diff --git a/unitest.cbp b/unitest.cbp
index b58cac2..b0fa675 100644
--- a/unitest.cbp
+++ b/unitest.cbp
@@ -31,6 +31,10 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unitest.cpp" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>