diff --git a/.gitignore b/.gitignore
index 6911aac..945db11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/x64
/unittest.vcxproj.filters
/unittest.vcxproj.user
+/unittest.sln
\ No newline at end of file
diff --git a/cs-lab34.vcxproj b/cs-lab34.vcxproj
index d02216c..1afea30 100644
--- a/cs-lab34.vcxproj
+++ b/cs-lab34.vcxproj
@@ -129,8 +129,13 @@
+
+
+
+
+
diff --git a/main.cpp b/main.cpp
index f5e24d0..df865ea 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
#include
#include "histogram.h"
#include "text.h"
+#include "svg.h"
using namespace std;
struct Input {
vector numbers;
@@ -32,9 +33,8 @@ int main()
{
const size_t SCREEN_WIDTH = 80;
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, in.bin_count);
+ show_histogram_svg(bins);
return 0;
}
diff --git a/svg.cpp b/svg.cpp
new file mode 100644
index 0000000..c57a5f8
--- /dev/null
+++ b/svg.cpp
@@ -0,0 +1,61 @@
+#include
+#include
+#include
+using namespace std;
+
+void
+svg_begin(double width, double height) {
+ cout << "\n";
+ 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, string fill) {
+ 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 MAX_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH);
+
+ double max_count = (bins[0] * BLOCK_WIDTH);
+ for (double bin : bins) {
+ if ((bin * BLOCK_WIDTH) > max_count) {
+ max_count = (bin * BLOCK_WIDTH);
+ }
+ }
+
+ svg_begin(400, 300);
+ double top = 0;
+ for (double bin : bins) {
+ const double bin_width = MAX_WIDTH * ((BLOCK_WIDTH * bin) / max_count);
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+ svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#aaffaa");
+ top += BIN_HEIGHT;
+ }
+ svg_end();
+}
+
diff --git a/svg.h b/svg.h
new file mode 100644
index 0000000..f29e7e3
--- /dev/null
+++ b/svg.h
@@ -0,0 +1,3 @@
+#pragma once
+#include
+void show_histogram_svg(const std::vector& bins);
diff --git a/text.cpp b/text.cpp
index f4ecca4..920df62 100644
--- a/text.cpp
+++ b/text.cpp
@@ -1,10 +1,11 @@
#include "text.h"
+#include "svg.h"
#include
#include
using namespace std;
void
-show_histogram_text(const vector& bins, size_t MAX_ASTERISK, size_t bin_count) {
+show_histogram_svg(const vector& bins, size_t MAX_ASTERISK, size_t bin_count) {
double max_count = bins[0];
for (double x : bins) {
if (x > max_count) {