diff --git a/project/main.cpp b/project/main.cpp index 0e78004..d98e990 100644 --- a/project/main.cpp +++ b/project/main.cpp @@ -1,7 +1,8 @@ #include #include #include "histogram.h" -#include "text.h" +#include "svg.h" +#include "show_svg.h" using namespace std; struct Input { @@ -36,7 +37,7 @@ int main() { Input in = input_data(); vector bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count); - show_histogram_text(bins, in.max_count, in.bin_count); + show_histogram_svg(bins); return 0; } diff --git a/project/show_histogram.cpp b/project/show_histogram.cpp new file mode 100644 index 0000000..d22990a --- /dev/null +++ b/project/show_histogram.cpp @@ -0,0 +1,38 @@ +#include "svg.h" + +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(IMAGE_WIDTH, IMAGE_HEIGHT); + double top = 0; + size_t longest; + if (!bins.empty()) { + longest = bins[0]; + } else { + longest = 0; + } + for (size_t bin : bins) { + if (bin > longest) { + longest = bin; + } + } + for (size_t bin : bins) { + const double bin_width = BLOCK_WIDTH * bin; + if (bin == longest){ + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2"); + top += BIN_HEIGHT; + } else{ + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "#000000", "#ff00a2"); + top += BIN_HEIGHT; + } + } + svg_end(); +} diff --git a/project/show_svg.h b/project/show_svg.h new file mode 100644 index 0000000..57c168a --- /dev/null +++ b/project/show_svg.h @@ -0,0 +1,10 @@ +#ifndef SHOW_SVG_H_INCLUDED +#define SHOW_SVG_H_INCLUDED + +#include +using namespace std; + +void +show_histogram_svg(const vector& bins); + +#endif // SHOW_SVG_H_INCLUDED diff --git a/project/svg.cpp b/project/svg.cpp new file mode 100644 index 0000000..10cca26 --- /dev/null +++ b/project/svg.cpp @@ -0,0 +1,30 @@ +#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 << ""; +} diff --git a/project/svg.h b/project/svg.h new file mode 100644 index 0000000..d00c857 --- /dev/null +++ b/project/svg.h @@ -0,0 +1,13 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED +#include +#include +using namespace std; +void svg_begin(double width, double height); + +void svg_end(); + +void svg_text(double left, double baseline, string text); + +void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black");; +#endif // SVG_H_INCLUDED