diff --git a/lab01/lab01.cpp b/lab01/lab01.cpp index 70b0be3..52ba88b 100644 --- a/lab01/lab01.cpp +++ b/lab01/lab01.cpp @@ -1,77 +1,11 @@ #include #include #include "histogram.h" +#include "svghis.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 = "red", string fill = "#79553D") { - cout << ""; -} - -void -show_histogram_svg(const vector& stolb) { - 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 size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH; - - svg_begin(400, 300); - - size_t maxlen = 0; - for (size_t len : stolb) - { - if (maxlen < len) maxlen = len; - } - - double top = 0; - for (size_t bin : stolb) { - size_t wight = bin; - if ((maxlen * 10) > MAX_ASTERISK) { - if (maxlen != bin) wight = MAX_ASTERISK * (static_cast (bin / maxlen)); - else if (maxlen == bin) wight = MAX_ASTERISK; - } - const double bin_width = BLOCK_WIDTH * wight; - svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); - svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); - top += BIN_HEIGHT; - } - - svg_end(); -} struct Input { vector numbers; size_t bucket{}; @@ -95,7 +29,6 @@ int main() auto in = input_data(); auto stolb = make_histogram(in.numbers, in.bucket, in.number_count); - //show_histogram_text(stolb, in.bucket); show_histogram_svg(stolb); return 0;