DobrovolskaY 1 год назад
Родитель d4e6e73904
Сommit 3b5ba758d3

@ -0,0 +1,37 @@
# depslib dependency file v1.0
1713909416 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\main.cpp
<iostream>
<vector>
<cmath>
"histogram.h"
"text.h"
"svg.h"
1713895642 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.h
<vector>
1713895071 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.cpp
<iostream>
<vector>
<cmath>
"histogram.h"
1713911640 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\svg.cpp
<iostream>
<vector>
"svg.h"
1713902731 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\text.cpp
<iostream>
<vector>
<cmath>
"text.h"
1713902545 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\text.h
<vector>
1713912021 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\svg.h
<iostream>
<string>
<vector>

@ -3,10 +3,10 @@
#include <cmath> #include <cmath>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h"
using namespace std; using namespace std;
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 4;
struct Input { struct Input {
vector<double> numbers; vector<double> numbers;
@ -36,7 +36,8 @@ input_data() {
int main() { int main() {
auto in = input_data(); auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins, in.bin_count); svg_rect(50, 0, bins[0] * 10, 30);
show_histogram_svg(bins);
return 0; return 0;
} }

@ -0,0 +1,51 @@
#include <iostream>
#include <vector>
#include "svg.h"
void svg_begin(double width, double height) {
std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
std::cout << "<svg ";
std::cout << "width='" << width << "' ";
std::cout << "height='" << height << "' ";
std::cout << "viewBox='0 0 " << width << " " << height << "' ";
std::cout << "xmlns='http://www.w3.org/2000/svg'>\n";
}
void svg_end() {
std::cout << "</svg>\n";
}
void svg_text(double left, double baseline, std::string text) {
std::cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
}
void svg_rect(double x, double y, double width, double height, std::string stroke, std::string fill) {
std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />\n";
}
void show_histogram_svg(const std::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;
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
double top = 0;
for (size_t bin : bins) {
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);
top += BIN_HEIGHT;
}
svg_end();
}

15
svg.h

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

@ -4,6 +4,9 @@
#include "text.h" #include "text.h"
using namespace std; using namespace std;
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 4;
void void
show_histogram_text(const vector<size_t>& bins, size_t bin_count) { show_histogram_text(const vector<size_t>& bins, size_t bin_count) {
size_t max_count = bins[0]; size_t max_count = bins[0];

@ -2,4 +2,4 @@
#include <vector> #include <vector>
void void
show_histogram_text(const vector<size_t>& bins, size_t bin_count); show_histogram_text(const std::vector<size_t>& bins, size_t bin_count);

@ -0,0 +1,10 @@
# depslib dependency file v1.0
1713895071 source:c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.cpp
<iostream>
<vector>
<cmath>
"histogram.h"
1713895642 c:\users\Ëèçà\onedrive\desktop\lab3\lab1\histogram.h
<vector>
Загрузка…
Отмена
Сохранить