From 78a15cfb138f61e36ee4faa66b72427803b4c5da Mon Sep 17 00:00:00 2001 From: KlimecnhenkoIA Date: Mon, 26 May 2025 04:51:58 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=BC=D0=B0=D1=81=D1=88=D1=82=D0=B0=D0=B1=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- svg.cpp | 44 +++++++++++++++++++++++++++----------------- svg.h | 7 ++++++- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/svg.cpp b/svg.cpp index f17f5a8..d221f01 100644 --- a/svg.cpp +++ b/svg.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "svg.h" using namespace std; @@ -18,44 +19,53 @@ void svg_end() { cout << "\n"; } -void svg_text(double left, double baseline, string text) { +void svg_text(double left, double baseline, const string& text) { cout << "" << text << "\n"; } -void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") { +void svg_rect(double x, double y, double width, double height, + const string& stroke, const string& fill) { cout << "\n"; } void show_histogram_svg(const vector& bins) { - if (bins.empty()) { - cerr << "Error: Empty bins vector\n"; - return; - } - 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 MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH; + const auto BIN_GAP = 5; + const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH - 10; + + if (bins.empty()) { + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + svg_text(TEXT_LEFT, TEXT_BASELINE, "No data"); + svg_end(); + return; + } + + // Находим максимальное значение + size_t max_count = *max_element(bins.begin(), bins.end()); + + double scaling_factor = (max_count == 0) ? 1.0 : (MAX_WIDTH / static_cast(max_count)); svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); double top = 0; - size_t max_count = bins[0]; for (size_t bin : bins) { - if (max_count < bin) { - max_count = bin; - } - } + const double bin_width = bin * scaling_factor; - for (size_t bin : bins) { - const double bin_width = MAX_WIDTH * (static_cast(bin) / max_count); svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); - svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "red"); - top += BIN_HEIGHT; + + if (bin == 0) { + svg_rect(TEXT_WIDTH, top, 1, BIN_HEIGHT, "black", "#cccccc"); + } else { + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "#4169e1"); + } + + top += BIN_HEIGHT + BIN_GAP; } svg_end(); diff --git a/svg.h b/svg.h index f48d806..44ab3f1 100644 --- a/svg.h +++ b/svg.h @@ -2,8 +2,13 @@ #define SVG_H_INCLUDED #include -#include // Äëÿ size_t +#include +void svg_begin(double width, double height); +void svg_end(); +void svg_text(double left, double baseline, const std::string& text); +void svg_rect(double x, double y, double width, double height, + const std::string& stroke = "black", const std::string& fill = "black"); void show_histogram_svg(const std::vector& bins); #endif // SVG_H_INCLUDED