diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..acf1124 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/obj +/bin +/unittest.depend +/unittest.layout \ No newline at end of file diff --git a/project/main.cpp b/project/main.cpp index 9515236..dde96dc 100644 --- a/project/main.cpp +++ b/project/main.cpp @@ -3,6 +3,7 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; struct Input @@ -34,7 +35,7 @@ int main() { auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count); + show_histogram_svg(bins); getch(); return 0; } diff --git a/project/pr3.cbp b/project/pr3.cbp index 925b16f..6b69c68 100644 --- a/project/pr3.cbp +++ b/project/pr3.cbp @@ -35,6 +35,7 @@ + diff --git a/project/svg.cpp b/project/svg.cpp new file mode 100644 index 0000000..8ad2ba8 --- /dev/null +++ b/project/svg.cpp @@ -0,0 +1,77 @@ +#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 = "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 + +void +show_histogram_svg(const std::vector& bins); + +#endif // SVG_H_INCLUDED diff --git a/unittest.cbp b/unittest.cbp index 7f9621b..6291924 100644 --- a/unittest.cbp +++ b/unittest.cbp @@ -31,6 +31,10 @@ + + + +