diff --git a/lab01.cbp b/lab01.cbp
index fb64a0d..2e91d36 100644
--- a/lab01.cbp
+++ b/lab01.cbp
@@ -33,7 +33,13 @@
+
+
+
+
+
+
diff --git a/main.cpp b/main.cpp
index 1ab29a9..1fe3678 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,6 +2,7 @@
#include
#include "histogram.h"
#include "text.h"
+#include "svg.h"
using namespace std;
struct Input {
@@ -29,6 +30,6 @@ int main(){
size_t max_count;
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
- show_histogram_text(bins,in.bin_count, max_count);
+ show_histogram_svg(bins);
return 0;
}
diff --git a/svg.cpp b/svg.cpp
new file mode 100644
index 0000000..4f25546
--- /dev/null
+++ b/svg.cpp
@@ -0,0 +1,63 @@
+#include "svg.h"
+#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 = "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;
+
+ svg_begin(400, 300);
+ double top = 0;
+
+ size_t max_count = 0;
+ for (auto bin : bins)
+ {
+ if (bin > max_count)
+ max_count = bin;
+ }
+ const auto BLOCK_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH) / max_count;
+
+ for (size_t bin : bins)
+ {
+ string color;
+ cout<< "color"<>color;
+ 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, BIN_HEIGHT, "blue", color);
+ top += BIN_HEIGHT;
+ }
+ svg_end();
+}
diff --git a/svg.h b/svg.h
new file mode 100644
index 0000000..bedea90
--- /dev/null
+++ b/svg.h
@@ -0,0 +1,8 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+#include
+#include
+
+void show_histogram_svg(const std::vector &bins);
+
+#endif // SVG_H_INCLUDED
diff --git a/unittest.cbp b/unittest.cbp
index 7f9621b..57af9d9 100644
--- a/unittest.cbp
+++ b/unittest.cbp
@@ -31,6 +31,15 @@
+
+
+
+
+
+
+
+
+