From ff87a522c902c3269cc604c1caa4b3d13d884764 Mon Sep 17 00:00:00 2001 From: KireevYP Date: Sun, 21 Apr 2024 21:13:43 +0300 Subject: [PATCH] =?UTF-8?q?svg:=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 --- histogram.cpp | 4 ++-- svg.cpp | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/histogram.cpp b/histogram.cpp index 71dc381..64eacf5 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -17,8 +17,8 @@ find_minmax(const vector& numbers, double& min, double& max) { } } -std::vector -make_histogram(const std::vector& numbers, size_t bin_count){ +vector +make_histogram(const vector& numbers, size_t bin_count){ vector bins (bin_count); double min = 0, max = 0; diff --git a/svg.cpp b/svg.cpp index f1e7428..81efe64 100644 --- a/svg.cpp +++ b/svg.cpp @@ -1,5 +1,6 @@ #include #include +#include using namespace std; void @@ -18,8 +19,39 @@ svg_end() { } void -show_histogram_svg(const vector & bins) { +svg_text(double left, double baseline, string text) { + cout << "" << text << ""; +} + +void +svg_rect(double x, double y, double width, double height, string stroke, string fill){ + cout << ""; +} + + + +void +show_histogram_svg(const vector& 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(); } + +