diff --git a/main.cpp b/main.cpp index f10be0d..3593f1c 100644 --- a/main.cpp +++ b/main.cpp @@ -2,6 +2,7 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; @@ -37,8 +38,6 @@ int main() { Input in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - double min, max; - double bin_size = (max - min) / in.bin_count; - show_histogram_text(bins,in.bin_count, bin_size); + show_histogram_svg(bins); return 0; } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..3fdee3f --- /dev/null +++ b/svg.cpp @@ -0,0 +1,71 @@ +#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 = "yellow", string fill = "yellow") +{ + 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; + const auto YELLOW = "yellow"; + const auto RED = "red"; + const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH; + + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + + + + double top = 0; + for (size_t bin : bins) + { + const double bin_width = BLOCK_WIDTH * bin; + if (bin_width > MAX_WIDTH) + { + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, MAX_WIDTH, BIN_HEIGHT); + + top += BIN_HEIGHT; + } + else + { + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + 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..8dd3117 --- /dev/null +++ b/svg.h @@ -0,0 +1,11 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED + +#include +#include +#include + +void show_histogram_svg(const std::vector& bins); + + +#endif // SVG_H_INCLUDED