From e8b21024eca6910f5c55f052b0878f90171d1bef Mon Sep 17 00:00:00 2001
From: Artyom <StepanovAV@mpei.ru>
Date: Sat, 18 May 2024 16:13:49 +0300
Subject: [PATCH] =?UTF-8?q?Code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B3=D0=B8?=
=?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20=D0=B2?=
=?UTF-8?q?=20svg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Lab34.cbp | 6 ++++++
main.cpp | 4 ++--
svg.cpp | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
svg.h | 5 +++++
4 files changed, 74 insertions(+), 2 deletions(-)
create mode 100644 svg.cpp
create mode 100644 svg.h
diff --git a/Lab34.cbp b/Lab34.cbp
index 25bf332..762df55 100644
--- a/Lab34.cbp
+++ b/Lab34.cbp
@@ -32,7 +32,13 @@
<Add option="-Wall" />
<Add option="-fexceptions" />
</Compiler>
+ <Unit filename="histogram.cpp" />
+ <Unit filename="histogram.h" />
<Unit filename="main.cpp" />
+ <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/main.cpp b/main.cpp
index a8e168f..3f7145b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,7 @@
#include <iostream>
#include <vector>
#include "histogram.h"
-#include "text.h"
+#include "svg.h"
using namespace std;
@@ -32,6 +32,6 @@ 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/svg.cpp b/svg.cpp
new file mode 100644
index 0000000..c8cd4e1
--- /dev/null
+++ b/svg.cpp
@@ -0,0 +1,61 @@
+#include "svg.h"
+#include <vector>
+#include <iostream>
+
+using namespace std;
+
+void
+svg_begin(double width, double height) {
+ cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+ cout << "<svg ";
+ cout << "width='" << width << "' ";
+ cout << "height='" << height << "' ";
+ cout << "viewBox='0 0 " << width << " " << height << "' ";
+ cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+ cout << "</svg>\n";
+}
+
+void
+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 = "black", string fill = "orange"){
+ cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' 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;
+ svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+ double top = 0;
+ double maxbin = bins[0];
+ for (size_t bin : bins) {
+ if (maxbin < bin){
+ maxbin = bin;
+ }
+ }
+ for (size_t bin : bins) {
+ double bin_width = BLOCK_WIDTH * bin;
+ if ((IMAGE_WIDTH - TEXT_WIDTH) < (bin * BLOCK_WIDTH)){
+ bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * ( bin / maxbin );
+ }
+ 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
new file mode 100644
index 0000000..5e3353c
--- /dev/null
+++ b/svg.h
@@ -0,0 +1,5 @@
+#pragma once
+#include <vector>
+
+void
+show_histogram_svg(const std::vector<size_t>& bins);