main.cpp

@@ -5,7 +5,6 @@
 #include <fstream>
 #include "histogram.h"
 #include "text.h"
-#include "svg.h"
 using namespace std;
 
 const size_t SCREEN_WIDTH = 80;
@@ -44,7 +43,7 @@ int main()
 
 	auto bins = make_histogramm(in.numbers, in.bin_count);
 
-	show_histogram_svg(bins);
+	show_histogramm(bins);
 
 	return 0;
 }

svg.cpp

@@ -6,7 +6,6 @@
 #include "svg.h"
 using namespace std;
 
-
 void
 svg_begin(double width, double height) {
     cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
@@ -21,36 +20,9 @@ void
 svg_end() {
     cout << "</svg>\n";
 }
-void
-svg_text(double left, double baseline, string text) {
-    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
-}
-
-void svg_rect(double x, double y, double width, double height, string colour = "black", string fill = "black"){
-    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke = '"<<colour <<"' fill = '"<<fill<<"' />";
-}
 
 void
 show_histogram_svg(const vector<size_t>& 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;
-    double top = 0;
-    double max_count = bins[0];
-    for (size_t i = 0; i < bins.size(); i++) {
-        if (bins[i] > max_count)
-            max_count = bins[i];
-    }
     svg_begin(400, 300);
-    for (size_t bin : bins) {
-        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count);
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#FF00FF");
-        top += BIN_HEIGHT;
-    }
     svg_end();
 }