diff --git a/main.cpp b/main.cpp index af98169..4d9a9a4 100644 --- a/main.cpp +++ b/main.cpp @@ -3,12 +3,15 @@ #include "histogram.h" #include "text.h" #include "svg.h" +#include using namespace std; struct Input { vector numbers; size_t bin_count{}; + string stroke; + string fill; }; Input @@ -24,6 +27,10 @@ input_data() { } cerr << "Enter bin count: "; cin >> in.bin_count; + cerr << "Enter stroke in format RGB: "; + cin >> in.stroke; + cerr << "Enter fill in format RGB: "; + cin >> in.fill; return in; } @@ -31,5 +38,5 @@ int main() { auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins); + show_histogram_svg(bins, in.stroke, in.fill); } diff --git a/svg.cpp b/svg.cpp index de51dd1..d19d479 100644 --- a/svg.cpp +++ b/svg.cpp @@ -26,7 +26,7 @@ svg_rect(double x, double y, double width, double height, string stroke, string 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; @@ -48,7 +48,7 @@ show_histogram_svg(const vector& bins) { 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_WIDTH, top, bin_width, BIN_HEIGHT); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, stroke, fill); top += BIN_HEIGHT; } svg_end(); @@ -58,7 +58,7 @@ show_histogram_svg(const vector& bins) { for (size_t bin : bins) { const double bin_width = BLOCK_WIDTH * bin * kf; 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 433e877..a0911c2 100644 --- a/svg.h +++ b/svg.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include void svg_begin(double width, double height); @@ -12,4 +12,4 @@ svg_text(double left, double baseline, std::string text); void svg_rect(double x, double y, double width, double height, std::string stroke = "black", std::string fill = "black"); void -show_histogram_svg(const std::vector& bins); +show_histogram_svg(const std::vector& bins, std::string stroke, std::string fill);