code: добавлен svg.h svg.cpp и изменен main.cpp

cs-lab34.depend

@@ -0,0 +1,29 @@
+# depslib dependency file v1.0
+1745823834 source:c:\users\diman3000\desktop\cs-lab34\histogram.cpp
+	"histogram.h"
+	<vector>
+
+1745823794 c:\users\diman3000\desktop\cs-lab34\histogram.h
+	<vector>
+
+1745823869 source:c:\users\diman3000\desktop\cs-lab34\text.cpp
+	"text.h"
+	<iostream>
+
+1745823848 c:\users\diman3000\desktop\cs-lab34\text.h
+	<vector>
+
+1745824478 source:c:\users\diman3000\desktop\cs-lab34\main.cpp
+	<iostream>
+	<vector>
+	"histogram.h"
+	"svg.h"
+
+1745824381 c:\users\diman3000\desktop\cs-lab34\svg.h
+	<vector>
+	<string>
+
+1745824404 source:c:\users\diman3000\desktop\cs-lab34\svg.cpp
+	"svg.h"
+	<iostream>
+

main.cpp

@@ -1,29 +1,30 @@
 #include <iostream>
+#include <vector>
 #include "histogram.h"
-#include "text.h"
+#include "svg.h"
 
 using namespace std;
 
+// Ñòðóêòóðà äëÿ õðàíåíèÿ âõîäíûõ äàííûõ
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
 };
 
+// Ôóíêöèÿ ââîäà äàííûõ
 Input input_data() {
     Input in;
     int number_count;
 
-    do {
-        cout << "Enter number count: ";
     cin >> number_count;
-    } while (number_count < 1);
+    while (number_count < 1) {
+        cin >> number_count;
+    }
 
-    do {
-        cout << "Enter bucket: ";
     cin >> in.bin_count;
-    } while (in.bin_count < 1);
-
-    cout << "\n";
+    while (in.bin_count < 1) {
+        cin >> in.bin_count;
+    }
 
     in.numbers.resize(number_count);
     for (int i = 0; i < number_count; i++) {
@@ -33,8 +34,9 @@ Input input_data() {
     return in;
 }
 
+// Ãëàâíàÿ ôóíêöèÿ
 int main() {
-    auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins);
+    auto in = input_data(); // Ââîä äàííûõ
+    auto bins = make_histogram(in.numbers, in.bin_count); // Ðàñ÷¸ò ãèñòîãðàììû
+    show_histogram_svg(bins); // Âûâîä ãèñòîãðàììû â ôîðìàòå SVG
 }

svg.cpp

@@ -0,0 +1,58 @@
+#include "svg.h"
+#include <iostream>
+
+using namespace std;
+
+void svg_begin(double width, double height) {
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height << "' ";
+    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void svg_end() {
+    cout << "</svg>\n";
+}
+
+void svg_text(double left, double baseline, const string& text) {
+    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
+}
+
+void svg_rect(double x, double y, double width, double height,
+              const string& stroke, const string& fill) {
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width
+         << "' height='" << height
+         << "' stroke='" << stroke
+         << "' fill='" << fill << "' />\n";
+}
+
+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;
+
+    size_t max_count = 0;
+    for (size_t count : bins) {
+        if (count > max_count) {
+            max_count = count;
+        }
+    }
+
+    double BLOCK_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH) / static_cast<double>(max_count);
+
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+
+    double top = 0;
+    for (size_t bin : bins) {
+        double bin_width = BLOCK_WIDTH * bin;
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#aaaaff");
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svg.h

@@ -0,0 +1,11 @@
+#pragma once
+#include <vector>
+#include <string>
+
+void svg_begin(double width, double height);
+void svg_end();
+void svg_text(double left, double baseline, const std::string& text);
+void svg_rect(double x, double y, double width, double height,
+              const std::string& stroke = "black",
+              const std::string& fill = "black");
+void show_histogram_svg(const std::vector<size_t>& bins);