diff --git a/histogram.cpp b/histogram.cpp index eb2de5e..41832b0 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -5,7 +5,7 @@ using namespace std; void find_minmax(const vector& numbers, double& min, double& max) { - if (numbers.size() == 2) + if (numbers.size() != 0) { min = numbers[0]; max = numbers[0]; diff --git a/lab03.vcxproj b/lab03.vcxproj index 097c62d..09294d5 100644 --- a/lab03.vcxproj +++ b/lab03.vcxproj @@ -21,12 +21,15 @@ + false + + diff --git a/lab1.cpp b/lab1.cpp index 8db375e..0924133 100644 --- a/lab1.cpp +++ b/lab1.cpp @@ -3,6 +3,7 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; struct Input { vector numbers; @@ -27,6 +28,6 @@ int main() const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, MAX_ASTERISK); + show_histogram_svg(bins); return 0; } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..26d379d --- /dev/null +++ b/svg.cpp @@ -0,0 +1,49 @@ +#include +#include +#include +#include +#include "svg.h" +#include "text.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; + svg_begin(400, 300); + double top = 0; + size_t max_bin_capacity{}; + find_max_capacity(bins, max_bin_capacity); + for (size_t bin : bins) { + const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (static_cast(bin) / max_bin_capacity); + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "purple", "#ffcc00"); + top += BIN_HEIGHT; + } + svg_end(); +} \ No newline at end of file diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..f40efe2 --- /dev/null +++ b/svg.h @@ -0,0 +1,4 @@ +#pragma once +#include + +void show_histogram_svg(const std::vector& bins); \ No newline at end of file diff --git a/text.cpp b/text.cpp index b14d021..af82aa6 100644 --- a/text.cpp +++ b/text.cpp @@ -4,7 +4,7 @@ #include "text.h" using namespace std; -static void find_max_capacity(const vector& bins, size_t& max_bin_capacity) +void find_max_capacity(const vector& bins, size_t& max_bin_capacity) { max_bin_capacity = bins[0]; for (size_t x : bins) diff --git a/text.h b/text.h index e5ab877..8335660 100644 --- a/text.h +++ b/text.h @@ -1,4 +1,5 @@ #pragma once #include -void show_histogram_text(const std::vector& bins, std::size_t max_asterisk); \ No newline at end of file +void show_histogram_text(const std::vector& bins, std::size_t max_asterisk); +void find_max_capacity(const std::vector& bins, std::size_t& max_bin_capacity); \ No newline at end of file