diff --git a/Lab34.cbp b/Lab34.cbp
index 25bf332..762df55 100644
--- a/Lab34.cbp
+++ b/Lab34.cbp
@@ -32,7 +32,13 @@
+
+
+
+
+
+
diff --git a/main.cpp b/main.cpp
index a8e168f..3f7145b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,7 @@
#include
#include
#include "histogram.h"
-#include "text.h"
+#include "svg.h"
using namespace std;
@@ -32,6 +32,6 @@ 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);
return 0;
}
diff --git a/svg.cpp b/svg.cpp
new file mode 100644
index 0000000..c8cd4e1
--- /dev/null
+++ b/svg.cpp
@@ -0,0 +1,61 @@
+#include "svg.h"
+#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 = "black", string fill = "orange"){
+ 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(IMAGE_WIDTH, IMAGE_HEIGHT);
+ double top = 0;
+ double maxbin = bins[0];
+ for (size_t bin : bins) {
+ if (maxbin < bin){
+ maxbin = bin;
+ }
+ }
+ for (size_t bin : bins) {
+ double bin_width = BLOCK_WIDTH * bin;
+ if ((IMAGE_WIDTH - TEXT_WIDTH) < (bin * BLOCK_WIDTH)){
+ bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * ( bin / maxbin );
+ }
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+ svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+ top += BIN_HEIGHT;
+ }
+ svg_end();
+}
diff --git a/svg.h b/svg.h
new file mode 100644
index 0000000..5e3353c
--- /dev/null
+++ b/svg.h
@@ -0,0 +1,5 @@
+#pragma once
+#include
+
+void
+show_histogram_svg(const std::vector& bins);