diff --git a/TWOPO.cpp b/TWOPO.cpp index 9ea8754..bb8cd72 100644 --- a/TWOPO.cpp +++ b/TWOPO.cpp @@ -3,6 +3,7 @@ #include "histogram.h" #include "text.h" #include "histogram_internal.h" +#include "svg.h" using namespace std; @@ -15,18 +16,18 @@ struct Input { //ввод Input input_data() { size_t number_count; - cout << "Введите количество оценок: "; + cerr << "Введите количество оценок: "; cin >> number_count; Input in; in.numbers.resize(number_count); - cout << "Введите оценки:\n"; + cerr << "Введите оценки:\n"; for (size_t i = 0; i < number_count; i++) { cin >> in.numbers[i]; } - cout << "Введите количество корзин: "; + cerr << "Введите количество корзин: "; cin >> in.bin_count; return in; @@ -43,7 +44,8 @@ int main() { double bin_size = (max - min) / in.bin_count; - show_histogram_text(bins, bin_size); + //show_histogram_text(bins, bin_size); заменили на: + show_histogram_svg(bins); return 0; } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..25a2805 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,65 @@ +#include +#include +#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 = "black", string fill = "red") +{ + cout << ""; + +} + +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); + 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_end(); +} +//Самостоятельно. Реализуйте для гистограммы в SVG масштабирование: самый длинный столбец должен занимать (IMAGE_WIDTH - TEXT_WIDTH) точек.!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..30292c7 --- /dev/null +++ b/svg.h @@ -0,0 +1,12 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED + +#include +#include +#include +#include + +void show_histogram_svg(const std::vector& bins); + + +#endif // SVG_H_INCLUDED