From 3145fd865b1f0f6638852c72fd64f26128fd5d5a Mon Sep 17 00:00:00 2001
From: "Platon (MiachinPY)" <MiachinPY@mpei.ru>
Date: Thu, 1 May 2025 14:04:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20sv?=
 =?UTF-8?q?g=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B8=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab01.cbp       |  8 ++++----
 lab01.depend    | 14 +++++++++++++-
 lab01.layout    | 16 +++++++++++++---
 main.cpp        |  4 ++--
 unittest.cbp    |  4 ++++
 unittest.layout | 15 +++++++++++++++
 6 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 unittest.layout

diff --git a/lab01.cbp b/lab01.cbp
index a390f01..88dfea5 100644
--- a/lab01.cbp
+++ b/lab01.cbp
@@ -32,18 +32,18 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="doctest.h" />
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h" />
-		<Unit filename="histogram_internal.h" />
-		<Unit filename="historgam.cpp" />
 		<Unit filename="lab01.cbp" />
 		<Unit filename="lab01.depend" />
 		<Unit filename="lab01.layout" />
 		<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" />
-		<Unit filename="unittest.cpp" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>
diff --git a/lab01.depend b/lab01.depend
index 381bce7..9be2205 100644
--- a/lab01.depend
+++ b/lab01.depend
@@ -1,9 +1,10 @@
 # depslib dependency file v1.0
-1745609797 source:c:\users\платон\desktop\project\lab01\main.cpp
+1746094194 source:c:\users\платон\desktop\project\lab01\main.cpp
 	<iostream>
 	<vector>
 	"histogram.h"
 	"text.h"
+	"svg.h"
 
 1745611606 source:c:\users\платон\desktop\project\lab01\historgam.cpp
 	<iostream>
@@ -78,3 +79,14 @@
 	<vector>
 	"histogram.h"
 
+1746094194 c:\users\платон\desktop\project\lab01\svg.h
+	<vector>
+
+1746094194 source:c:\users\платон\desktop\project\lab01\svg.cpp
+	<math.h>
+	<iostream>
+	<conio.h>
+	<vector>
+	<string>
+	"svg.h"
+
diff --git a/lab01.layout b/lab01.layout
index 0244e65..06c2d6a 100644
--- a/lab01.layout
+++ b/lab01.layout
@@ -2,12 +2,22 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
+	<File name="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="795" topLine="2" />
+			<Cursor1 position="511" topLine="19" />
 		</Cursor>
 	</File>
-	<File name="histogram.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="svg.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="140" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.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="histogram.cpp" 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>
diff --git a/main.cpp b/main.cpp
index 507cd57..57e57b6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,6 +2,7 @@
 #include <vector>
 #include "histogram.h"
 #include "text.h"
+#include "svg.h"
 
 using namespace std;
 
@@ -22,7 +23,6 @@ input_data() {
         cerr << "Enter Num[" << i << "]: ";
         cin >> in.numbers[i];
     }
-    cerr << "Enter bin count: "; cin >> bin_count;
     cerr << "Enter bin count: ";
     cin >> in.bin_count;
     return in;
@@ -31,7 +31,7 @@ int main()
 {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins);
 
     return 0;
 }
diff --git a/unittest.cbp b/unittest.cbp
index 7f9621b..5a9c8c0 100644
--- a/unittest.cbp
+++ b/unittest.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="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>
diff --git a/unittest.layout b/unittest.layout
new file mode 100644
index 0000000..8ec3341
--- /dev/null
+++ b/unittest.layout
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="unittest.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="227" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="210" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>