From cee44481e204af1e35877af6535f0231e8304989 Mon Sep 17 00:00:00 2001 From: artemzelenov Date: Sat, 22 Apr 2023 12:54:30 +0300 Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20svg=20=D1=84=D0=B0=D0=B9=D0=BB=20=D0=B8=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B8=D0=BB=20=D0=BC=D0=B0=D1=88=D1=82?= =?UTF-8?q?=D0=B0=D0=B1=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/main.cpp | 3 ++- project/svg.cpp | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ project/svg.h | 7 ++++++ unittest.cpp | 6 ++++- 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 project/svg.cpp create mode 100644 project/svg.h diff --git a/project/main.cpp b/project/main.cpp index 10a3cd3..d67f5e7 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; } diff --git a/project/svg.cpp b/project/svg.cpp new file mode 100644 index 0000000..9b26b9a --- /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(); +} diff --git a/project/svg.h b/project/svg.h new file mode 100644 index 0000000..e4a6fd8 --- /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 diff --git a/unittest.cpp b/unittest.cpp index 8f121d5..2cbf15c 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -6,7 +6,11 @@ TEST_CASE("distinct positive numbers") { double min = 0; double max = 0; + std::vectorv{2,1}; + CHECK(v.size() != 0); + CHECK(v.size() != 1); find_minmax({1, 2}, min, max); - CHECK(min == 2); + CHECK(min == 1); CHECK(max == 2); + CHECK(min != max); }