From b387a89f6df93d10b632f12f05be159cffbfb133 Mon Sep 17 00:00:00 2001 From: "Ivan (BeloziorovIA)" <BeloziorovIA@mpei.ru> Date: Mon, 5 May 2025 14:14:02 +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=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=86?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=84=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB=D0=B0=20=D0=B3=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=86?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=B0=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- svg.cpp | 23 ++++++++++++++++++----- svg.h | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/svg.cpp b/svg.cpp index 0246c50..f404978 100644 --- a/svg.cpp +++ b/svg.cpp @@ -21,13 +21,26 @@ void svg_text(double left, double baseline, std::string text){ } void show_histogram_svg(const std::vector<size_t>& bins){ - svg_begin(400, 300); - svg_text(20, 20, std::to_string(bins[0])); + 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; + for (size_t bin : bins) { + const double bin_width = BLOCK_WIDTH * bin; + svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); + top += BIN_HEIGHT; + } svg_end(); } -/* void svg_rect(double x, double y, double width, double height){ - std::cout << "<rect x='" << x << "' y='" width='" << width << "' height='" << height << "' />" + std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='red' fill='#ffeeee' />"; } -*/ + diff --git a/svg.h b/svg.h index cfa0484..5dc97d6 100644 --- a/svg.h +++ b/svg.h @@ -7,6 +7,6 @@ void svg_begin(double width, double height); void svg_end(); void show_histogram_svg(const std::vector<size_t>& bins); void svg_text(double left, double baseline, std::string text); -//void svg_rect(double x, double y, double width, double height) +void svg_rect(double x, double y, double width, double height); #endif // SVG_H_INCLUDED