build:6 вариант
Этот коммит содержится в:
8
main.cpp
8
main.cpp
@@ -34,6 +34,12 @@ input_data(){
|
|||||||
cerr << "Enter bin count: ";
|
cerr << "Enter bin count: ";
|
||||||
cin >> in.bin_count;
|
cin >> in.bin_count;
|
||||||
|
|
||||||
|
cerr << "Enter color: ";
|
||||||
|
cin >> in.stroke;
|
||||||
|
|
||||||
|
cerr << "Enter color to fill: ";
|
||||||
|
cin >> in.fill;
|
||||||
|
|
||||||
return in;
|
return in;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,6 +48,6 @@ int main()
|
|||||||
|
|
||||||
auto in = input_data();
|
auto in = input_data();
|
||||||
std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
|
std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
|
||||||
show_histogram_svg(bins);
|
show_histogram_svg(bins, in.stroke, in.fill);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
4
svg.cpp
4
svg.cpp
@@ -31,7 +31,7 @@ svg_rect(double x, double y, double width, double height, string stroke = "chart
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
show_histogram_svg(const vector<size_t>& bins) {
|
show_histogram_svg(const vector<size_t>& bins, string stroke, string fill) {
|
||||||
const auto IMAGE_WIDTH = 400;
|
const auto IMAGE_WIDTH = 400;
|
||||||
const auto IMAGE_HEIGHT = 300;
|
const auto IMAGE_HEIGHT = 300;
|
||||||
const auto TEXT_LEFT = 20;
|
const auto TEXT_LEFT = 20;
|
||||||
@@ -51,7 +51,7 @@ show_histogram_svg(const vector<size_t>& bins) {
|
|||||||
for (size_t bin : bins) {
|
for (size_t bin : bins) {
|
||||||
const double bin_width = (( IMAGE_WIDTH - TEXT_WIDTH ) / BLOCK_WIDTH ) * ( bin / maxel );
|
const double bin_width = (( IMAGE_WIDTH - TEXT_WIDTH ) / BLOCK_WIDTH ) * ( bin / maxel );
|
||||||
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||||
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
|
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, stroke, fill);
|
||||||
top += BIN_HEIGHT;
|
top += BIN_HEIGHT;
|
||||||
}
|
}
|
||||||
svg_end();
|
svg_end();
|
||||||
|
|||||||
2
svg.h
2
svg.h
@@ -3,5 +3,5 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
void
|
void
|
||||||
show_histogram_svg(const std::vector<size_t>& bins);
|
show_histogram_svg(const std::vector<size_t>& bins, std::string stroke, std::string fill);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user