diff --git a/main.cpp b/main.cpp index 42ae11b..3246b34 100644 --- a/main.cpp +++ b/main.cpp @@ -34,6 +34,12 @@ input_data(){ cerr << "Enter bin count: "; cin >> in.bin_count; + cerr << "Enter color: "; + cin >> in.stroke; + + cerr << "Enter color to fill: "; + cin >> in.fill; + return in; } @@ -42,6 +48,6 @@ int main() auto in = input_data(); std::vector bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins); + show_histogram_svg(bins, in.stroke, in.fill); return 0; } diff --git a/svg.cpp b/svg.cpp index 2312bc9..9533773 100644 --- a/svg.cpp +++ b/svg.cpp @@ -31,7 +31,7 @@ svg_rect(double x, double y, double width, double height, string stroke = "chart } 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(); diff --git a/svg.h b/svg.h index 88a7da4..4859b3e 100644 --- a/svg.h +++ b/svg.h @@ -3,5 +3,5 @@ #include void -show_histogram_svg(const std::vector& bins); +show_histogram_svg(const std::vector& bins, std::string stroke, std::string fill);