diff --git a/lab01/histogram.cpp b/lab01/histogram.cpp index 71dc381..3c033de 100644 --- a/lab01/histogram.cpp +++ b/lab01/histogram.cpp @@ -16,9 +16,8 @@ find_minmax(const vector& numbers, double& min, double& max) { } } } - -std::vector -make_histogram(const std::vector& numbers, size_t bin_count){ +vector +make_histogram(const vector& numbers, size_t bin_count){ vector bins (bin_count); double min = 0, max = 0; diff --git a/lab01/svg.cpp b/lab01/svg.cpp index 1b08098..748bf82 100644 --- a/lab01/svg.cpp +++ b/lab01/svg.cpp @@ -1,5 +1,6 @@ #include #include +#include using namespace std; void @@ -18,7 +19,36 @@ svg_end() { } void -show_histogram_svg(const vector & bins) { +svg_text(double left, double baseline, string text) { + cout << "" << text << ""; +} + +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_BASELINE = 20; + const auto TEXT_WIDTH = 50; + const auto BIN_HEIGHT = 30; + const auto BLOCK_WIDTH = 10; + string stroke = "black"; + string fill = "black"; + svg_begin(400, 300); + double top = 0; + for (double 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, stroke, fill); + top += BIN_HEIGHT; + } svg_end(); }