From ef24eaf0f7afadafe5a67dd3e8287f967e19eefb Mon Sep 17 00:00:00 2001
From: "Andrew (ShabatovAA)" <ShabatovAA@mpei.ru>
Date: Mon, 22 Apr 2024 01:44:23 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=BA=D0=BE=D0=BD=D0=B5=D1=87=D0=BD?=
=?UTF-8?q?=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0?=
=?UTF-8?q?=D1=82(=D0=BC=D0=B0=D1=81=D1=88=D1=82=D0=B0=D0=B1=D0=B8=D1=80?=
=?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=BE=D0=BB?=
=?UTF-8?q?=D0=B1=D1=86=D0=BE=D0=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
svg.cpp | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/svg.cpp b/svg.cpp
index f9b348c..aecfba3 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -34,14 +34,14 @@ 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_LEFT = IMAGE_WIDTH-30;
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);
-
+ auto space = IMAGE_WIDTH - TEXT_WIDTH;
size_t max_count = bins[0];
for(size_t x: bins){
if(x > max_count){
@@ -49,13 +49,24 @@ show_histogram_svg(const vector<size_t>& bins) {
}
}
double top = 0;
- for (size_t bin : bins) {
- const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * bin / max_count;
- svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
- svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "blue");
- top += BIN_HEIGHT;
+ if ((max_count*BLOCK_WIDTH) > space){
+ for (size_t bin : bins) {
+ const double bin_width = space * bin / max_count;
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+ svg_rect(TEXT_LEFT - bin_width - 20, top, bin_width, BIN_HEIGHT, "black", "blue");
+ top += BIN_HEIGHT;
+ }
+ svg_end();
+ }
+ else{
+ for (size_t bin : bins) {
+ const double bin_width = BLOCK_WIDTH * bin;
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+ svg_rect(TEXT_LEFT - bin_width - 20, top, bin_width, BIN_HEIGHT, "black", "blue");
+ top += BIN_HEIGHT;
+ }
+ svg_end();
}
- svg_end();
}