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& 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& 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(); }