diff --git a/svg01.cpp b/svg01.cpp index f0714c1..41b9ab6 100644 --- a/svg01.cpp +++ b/svg01.cpp @@ -1,6 +1,7 @@ #include "svg01.h" #include #include +#include using namespace std; @@ -25,13 +26,12 @@ svg_text(double left, double baseline, string text) { } void -svg_rect(double x, double y, double width, double height, string stroke = "midnightblue", string fill = "deeppink"){ +svg_rect(double x, double y, double width, double height, string stroke, string fill){ cout << ""; } - void -show_histogram_svg(const vector& bins) { +show_histogram_svg(const vector& bins, string stroke, string fill) { const auto IMAGE_WIDTH = 400; const auto IMAGE_HEIGHT = 300; const auto TEXT_LEFT = 20; @@ -51,7 +51,7 @@ show_histogram_svg(const vector& bins) { for (size_t bin : bins) { const double bin_width = (( IMAGE_WIDTH - TEXT_WIDTH ) / BLOCK_WIDTH ) * ( bin / maxel ); svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); - svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, stroke, fill); top += BIN_HEIGHT; } svg_end();