From 393d6590270205e1418ba8094ce350527ef75c82 Mon Sep 17 00:00:00 2001 From: KhatyukhinYS Date: Sun, 21 Apr 2024 23:18:09 +0300 Subject: [PATCH] =?UTF-8?q?text:=20=D0=B3=D0=B8=D1=81=D1=82=D0=BE=D0=B3?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- histogram.cpp | 21 +++++++++++++++++++- main.cpp | 3 ++- svg.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ svg.h | 10 ++++++++++ 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 svg.cpp create mode 100644 svg.h diff --git a/histogram.cpp b/histogram.cpp index c9f2f44..ca9a39b 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -2,11 +2,30 @@ using namespace std; +void +find_minmax(const std::vector& numbers, double& Min, double& Max) { + Min = numbers[0]; + Max = numbers[0]; + for(size_t x : numbers) + { + if(x < Min) + { + Min = x; + }else + { + if(x > Max) + { + Max = x; + } + } + } +} + std::vector make_histogram(std::vector numbers, size_t bin_count) { std::vector bins(bin_count); double Min, Max; - // find_minmax(numbers, Min, Max); + find_minmax(numbers, Min, Max); double bin_size = (Max - Min) / bin_count; for (double x : numbers) { diff --git a/main.cpp b/main.cpp index 1d5c197..e929184 100644 --- a/main.cpp +++ b/main.cpp @@ -2,6 +2,7 @@ #include #include "text.h" #include "histogram.h" +#include "svg.h" using namespace std; struct Input { std::vector numbers; @@ -25,6 +26,6 @@ int main() { auto 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/svg.cpp b/svg.cpp new file mode 100644 index 0000000..898dc45 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,54 @@ +#include "svg.h" +#include +#include +using namespace std; + +void +svg_begin(double width, double height) { + cout << "\n"; + cout << "\n"; +} +void +svg_text(double left, double baseline, string text) { + cout << "anything you want"; +} +void +svg_rect(double x, double y, double width, double height){ + cout << "\n"; +} +void svg_rect(double x, double y, double width, double height, + string stroke = "black", string fill = "black"){ + cout << "\n"; +} +void +svg_end() { + cout << "\n"; +} + +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); +// svg_rect(50, 0,bins[0] * 10, 30); + svg_text(20, 20, to_string(bins[0])); + svg_end(); + + double top = 0; + 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); + top += BIN_HEIGHT; + } + svg_rect(0, 0, 100, 200, "blue", "#aaffaa"); +} diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..1242c0e --- /dev/null +++ b/svg.h @@ -0,0 +1,10 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED +#include +#include + + +void +show_histogram_svg(std::vector bins); + +#endif // SVG_H_INCLUDED