diff --git a/main.cpp b/main.cpp index 1b42dfd..7ae72b6 100644 --- a/main.cpp +++ b/main.cpp @@ -2,6 +2,8 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" + using namespace std; @@ -38,10 +40,13 @@ Input input_data() { int main(){ + bool res = false; + Input in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins); + show_histogram_svg(bins); + } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..dbee47e --- /dev/null +++ b/svg.cpp @@ -0,0 +1,67 @@ +#include +#include +#include "svg.h" + +void +svg_begin(double width, double height) { + std::cout << "\n"; + std::cout << "\n"; +} + +void +svg_end() { + std::cout << "\n"; +} + +void +svg_text(double left, double baseline, std::string text) { + std::cout << " " << text << " "; +} + +void svg_rect(double x, double y, double width, double height){ + std::cout << ""; +} + +void +show_histogram_svg(const std::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 std::size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH; + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + double top = 0; + + std::size_t maxbin=bins[0]; + for (std::size_t i=0; i < bins.size(); i++){ + if (maxbin < bins[i]){ + maxbin=bins[i]; + } + } + + if (maxbin<=76){ + for (std::size_t i=0; i < bins.size(); i++) { + double bin_width = BLOCK_WIDTH * bins[i]; + svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i])); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); + top += BIN_HEIGHT; + } + svg_end(); + } else { + for (std::size_t i=0; i < bins.size(); i++) { + double bin_width= MAX_ASTERISK * (static_cast(bins[i]) / maxbin); + svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i])); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); + top += BIN_HEIGHT; + } + svg_end(); + } +} diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..c7da98d --- /dev/null +++ b/svg.h @@ -0,0 +1,9 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED + +#include + +void +show_histogram_svg(const std::vector& bins); + +#endif // SVG_H_INCLUDED diff --git a/text.cpp b/text.cpp index 50c04f0..1ca3e67 100644 --- a/text.cpp +++ b/text.cpp @@ -6,7 +6,6 @@ const std::size_t SCREEN_WIDTH = 80; const std::size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; void show_histogram_text(const std::vector &bins){ - std::cout<