diff --git a/project/main.cpp b/project/main.cpp index fdd8df6..627b7d0 100644 --- a/project/main.cpp +++ b/project/main.cpp @@ -2,6 +2,7 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; struct Input { vector numbers; @@ -26,6 +27,6 @@ input_data(){ int main() { Input in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count); + show_histogram_svg(bins); return 0; } \ No newline at end of file diff --git a/project/svg.cpp b/project/svg.cpp new file mode 100644 index 0000000..7ce10ec --- /dev/null +++ b/project/svg.cpp @@ -0,0 +1,63 @@ +#include +#include +#include +#include +#include +#include "svg.h" +using namespace std; + +void +svg_begin(double width, double height) { + cout << "\n"; + cout << "\n"; +} + +void +svg_end() { + cout << "\n"; +} +void +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; + 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++) { + if (bins[i] > max_count) + max_count = bins[i]; + } + 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, "red", "#aaffaa"); + top += BIN_HEIGHT; + } + + svg_end(); +} \ No newline at end of file diff --git a/project/svg.h b/project/svg.h new file mode 100644 index 0000000..23c0b59 --- /dev/null +++ b/project/svg.h @@ -0,0 +1,7 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED +#include +void +show_histogram_svg(const std::vector& bins); + +#endif // SVG_H_INCLUDED \ No newline at end of file diff --git a/unittest.cpp b/unittest.cpp index d40b715..337d88b 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -10,7 +10,7 @@ TEST_CASE("distinct positive numbers") { CHECK(v.size() != 0); CHECK(v.size() != 1); find_minmax({1, 2}, min, max); - CHECK(min == 1); + CHECK(min == 1);; CHECK(max == 2); - CHECK(min != max); + CHECK(min != max); } \ No newline at end of file