diff --git a/svg.cpp b/svg.cpp index f81e0c2..c0eca04 100644 --- a/svg.cpp +++ b/svg.cpp @@ -6,9 +6,9 @@ #include "svg.h" using namespace std; - void -svg_begin(double width, double height) { +svg_begin(double width, double height) +{ cout << "\n"; cout << "\n"; } void -svg_text(double left, double baseline, string text) { +svg_text(double left, double baseline, string text) +{ cout << "" << text << ""; } -void svg_rect(double x, double y, double width, double height, string colour = "black", string fill = "black"){ - cout << ""; +void +svg_rect(double x, double y, double width, double height, string stroke, string fill) +{ +cout << ""; + } + 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 = 10; const auto TEXT_BASELINE = 20; const auto TEXT_WIDTH = 50; const auto BIN_HEIGHT = 30; const auto BLOCK_WIDTH = 10; + const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH; + + + svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT); + double top = 0; - double max_count = bins[0]; - for (size_t i = 0; i < bins.size(); i++) { +double max_count = bins[0]; + for (size_t i = 0; i < bins.size(); i++) + { if (bins[i] > max_count) max_count = bins[i]; - } - svg_begin(400, 300); - 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, "blue", "#FF00FF"); + } + for (size_t bin : bins) + { + + const double bin_width = MAX_WIDTH * (bin/max_count); + + const double emptiness_width = MAX_WIDTH - bin_width; + + svg_rect(0, top, emptiness_width, BIN_HEIGHT, "white", "#ffffff"); + + svg_text(TEXT_LEFT + MAX_WIDTH, top + TEXT_BASELINE, to_string(bin)); + + svg_rect(emptiness_width, top, bin_width, BIN_HEIGHT, "red", "#aaffaa"); + top += BIN_HEIGHT; } + svg_end(); }