diff --git a/svg.cpp b/svg.cpp index 8dd2c79..093582e 100644 --- a/svg.cpp +++ b/svg.cpp @@ -3,7 +3,8 @@ #include #include -void svg_begin(double width, double height) { +void svg_begin(double width, double height) +{ std::cout << "\n"; std::cout << "\n"; } -void svg_end() { +void svg_end() +{ std::cout << "\n"; } -void svg_text(double left, double baseline, std::string text){ +void svg_text(double left, double baseline, std::string text) +{ std::cout << "" << text << ""; } -void show_histogram_svg(const std::vector& bins){ +void show_histogram_svg(const std::vector& bins) +{ const auto IMAGE_WIDTH = 400; const auto IMAGE_HEIGHT = 300; const auto TEXT_LEFT = 20; @@ -28,19 +32,48 @@ void show_histogram_svg(const std::vector& bins){ const auto TEXT_WIDTH = 50; const auto BIN_HEIGHT = 30; const auto BLOCK_WIDTH = 10; + const auto MAX_AVAIL_WIDTH = IMAGE_WIDTH - TEXT_WIDTH - 20; // Доступная ширина с отступом 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; + + // максимальное значение в bins + size_t max_bin = 0; + for (size_t bin : bins) + { + if (bin > max_bin) max_bin = bin; + } + + if (max_bin * BLOCK_WIDTH > MAX_AVAIL_WIDTH) + { + // масштабный коэффициент + double scale = 1.0; + scale = static_cast(MAX_AVAIL_WIDTH) / (max_bin * BLOCK_WIDTH); + double top = 0; + for (size_t bin : bins) + { + const double bin_width = BLOCK_WIDTH * bin * scale; + + svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); + top += BIN_HEIGHT; + } } + else + { + 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::string stroke, std::string fill){ +void svg_rect(double x, double y, double width, double height, std::string stroke, std::string fill) +{ std::cout << ""; } -