diff --git a/main.cpp b/main.cpp index af1c552..fe1ce01 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,6 @@ #include "histogram.h" #include "text.h" +#include "svg.h" struct Input { vector vec; size_t korz{}; @@ -21,5 +22,5 @@ Input input_data() { int main() { auto in = input_data(); auto bins = make_histogram(in.korz, in.vec); - show_histogram(bins); + show_histogram_svg(bins); } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..a9dd88c --- /dev/null +++ b/svg.cpp @@ -0,0 +1,73 @@ +#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 = "black") +{ + 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; + const auto BLACK = "black"; + const auto RED = "red"; + const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH; + + + svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT); + + double top = 0; + double max_count = bins[0]; + for (size_t i = 0; i < bins.size(); i++) + { + if (max_count +#include +#include +#include +using namespace std; +void show_histogram_svg(const vector& bins); diff --git a/unittest.depend b/unittest.depend index b17539a..f30841d 100644 --- a/unittest.depend +++ b/unittest.depend @@ -6,3 +6,54 @@ +1746116058 source:c:\users\german\desktop\Проги С2\lab01\unittest.cpp + "doctest.h" + "histogram_internal.h" + +1746115894 c:\users\german\desktop\Проги С2\lab01\doctest.h + + + + + + + "doctest_fwd.h" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1746115147 c:\users\german\desktop\Проги С2\lab01\histogram_internal.h +