From ed81237874dcb6059b4798cc73cccc900d4c9c9a Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Sun, 27 Apr 2025 01:56:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D0=BD=D0=BA=D1=82=205:=20=D0=A4?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20SVG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 3 ++- svg.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ svg.h | 8 ++++++++ unittest.cpp | 3 +-- 4 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 svg.cpp create mode 100644 svg.h diff --git a/main.cpp b/main.cpp index 33dbb41..e48cec4 100644 --- a/main.cpp +++ b/main.cpp @@ -2,6 +2,7 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; @@ -35,5 +36,5 @@ int main() size_t max_count; auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count, max_count); + show_histogram_svg(bins); } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..1036f55 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,54 @@ +#include "svg.h" +#include +using namespace std; + +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 = "black", string fill = "black") +{ + 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; + + svg_begin(400, 300); + double top = 0; + + for (size_t bin : bins) { + const double bin_width = BLOCK_WIDTH * bin; + if(bin_width> IMAGE_WIDTH) { + const double bin_width= IMAGE_WIDTH - TEXT_WIDTH; + } + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green"); + top += BIN_HEIGHT; + } + + //svg_text(20, 20, to_string(bins[0])); + //svg_rect(50, 0, bins[0] * 10, 30); + svg_end(); +} + diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..bedea90 --- /dev/null +++ b/svg.h @@ -0,0 +1,8 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED +#include +#include + +void show_histogram_svg(const std::vector &bins); + +#endif // SVG_H_INCLUDED diff --git a/unittest.cpp b/unittest.cpp index f0883f5..e531bdb 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -2,7 +2,7 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #include "doctest.h" #include "histogram_internal.h" -/* + TEST_CASE("distinct positive numbers") { double min = 0; double max = 0; @@ -10,7 +10,6 @@ TEST_CASE("distinct positive numbers") { CHECK(min == 1); CHECK(max == 2); } -*/ TEST_CASE("distinct negative numbers") { double min = 0;