main
SavinSA 1 год назад
Родитель 9f7fba6586
Сommit aace6162d6

1
.gitignore поставляемый

@ -5,3 +5,4 @@
/x64
/unittest.vcxproj.filters
/unittest.vcxproj.user
/unittest.sln

@ -129,8 +129,13 @@
<ItemGroup>
<ClCompile Include="histogram.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="svg.cpp" />
<ClCompile Include="text.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="histogram_internal.h" />
<ClInclude Include="svg.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

@ -3,6 +3,7 @@
#include <string>
#include "histogram.h"
#include "text.h"
#include "svg.h"
using namespace std;
struct Input {
vector<double> numbers;
@ -32,9 +33,8 @@ int main()
{
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins, MAX_ASTERISK, in.bin_count);
show_histogram_svg(bins);
return 0;
}

@ -0,0 +1,61 @@
#include <iostream>
#include <vector>
#include <string>
using namespace std;
void
svg_begin(double width, double height) {
cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
cout << "<svg ";
cout << "width='" << width << "' ";
cout << "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, string text) {
cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
}
void
svg_rect(double x, double y, double width, double height, string stroke, string fill) {
cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />";
}
void
show_histogram_svg(const vector<double>& 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;
const auto MAX_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH);
double max_count = (bins[0] * BLOCK_WIDTH);
for (double bin : bins) {
if ((bin * BLOCK_WIDTH) > max_count) {
max_count = (bin * BLOCK_WIDTH);
}
}
svg_begin(400, 300);
double top = 0;
for (double bin : bins) {
const double bin_width = MAX_WIDTH * ((BLOCK_WIDTH * bin) / max_count);
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#aaffaa");
top += BIN_HEIGHT;
}
svg_end();
}

@ -0,0 +1,3 @@
#pragma once
#include <vector>
void show_histogram_svg(const std::vector<double>& bins);

@ -1,10 +1,11 @@
#include "text.h"
#include "svg.h"
#include <string>
#include <iostream>
using namespace std;
void
show_histogram_text(const vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count) {
show_histogram_svg(const vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count) {
double max_count = bins[0];
for (double x : bins) {
if (x > max_count) {

Загрузка…
Отмена
Сохранить