diff --git a/lab1.depend b/lab1.depend new file mode 100644 index 0000000..41143b0 --- /dev/null +++ b/lab1.depend @@ -0,0 +1,37 @@ +# depslib dependency file v1.0 +1713909416 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\main.cpp + + + + "histogram.h" + "text.h" + "svg.h" + +1713895642 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.h + + +1713895071 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.cpp + + + + "histogram.h" + +1713911640 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\svg.cpp + + + "svg.h" + +1713902731 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\text.cpp + + + + "text.h" + +1713902545 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\text.h + + +1713912021 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\svg.h + + + + diff --git a/lab1.exe b/lab1.exe new file mode 100644 index 0000000..e69de29 diff --git a/main.cpp b/main.cpp index 55d34dc..90ac791 100644 --- a/main.cpp +++ b/main.cpp @@ -3,10 +3,10 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; -const size_t SCREEN_WIDTH = 80; -const size_t MAX_ASTERISK = SCREEN_WIDTH - 4; + struct Input { vector numbers; @@ -36,7 +36,8 @@ input_data() { int main() { auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count); + svg_rect(50, 0, bins[0] * 10, 30); + show_histogram_svg(bins); return 0; } diff --git a/marks.svg b/marks.svg new file mode 100644 index 0000000..e69de29 diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..fd50152 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,51 @@ +#include +#include +#include "svg.h" + +void svg_begin(double width, double height) { + std::cout << "\n"; + std::cout << "\n"; + +} + +void svg_end() { + std::cout << "\n"; +} + +void svg_text(double left, double baseline, std::string text) { + std::cout << "" << text << "\n"; +} + +void svg_rect(double x, double y, double width, double height, std::string stroke, std::string fill) { + std::cout << "\n"; +} + +void show_histogram_svg(const std::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; + for (size_t bin : bins) { + const double bin_width = BLOCK_WIDTH * bin; + svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width); + top += BIN_HEIGHT; + } + + svg_end(); +} + + + + diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..ed10ffd --- /dev/null +++ b/svg.h @@ -0,0 +1,15 @@ +#ifndef SVG_H +#define SVG_H + +#include +#include +#include + +//void svg_begin(double width, double height); +//void svg_end(); +//void svg_text(double left, double baseline, std::string text); +void svg_rect(double x, double y, double width, double height, std::string stroke = "black", std::string fill = "black"); +void show_histogram_svg(const std::vector& bins); + +#endif // SVG_H + diff --git a/text.cpp b/text.cpp index 37fe5c2..95158b3 100644 --- a/text.cpp +++ b/text.cpp @@ -4,6 +4,9 @@ #include "text.h" using namespace std; +const size_t SCREEN_WIDTH = 80; +const size_t MAX_ASTERISK = SCREEN_WIDTH - 4; + void show_histogram_text(const vector& bins, size_t bin_count) { size_t max_count = bins[0]; diff --git a/text.h b/text.h index db04afe..9eae26c 100644 --- a/text.h +++ b/text.h @@ -2,4 +2,4 @@ #include void -show_histogram_text(const vector& bins, size_t bin_count); +show_histogram_text(const std::vector& bins, size_t bin_count); diff --git a/unittest.depend b/unittest.depend new file mode 100644 index 0000000..53c84d3 --- /dev/null +++ b/unittest.depend @@ -0,0 +1,10 @@ +# depslib dependency file v1.0 +1713895071 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.cpp + + + + "histogram.h" + +1713895642 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.h + +