Сравнить коммиты

...

2 Коммитов

@ -32,7 +32,15 @@
<Add option="-Wall" />
<Add option="-fexceptions" />
</Compiler>
<Unit filename="main.cpp" />
<Unit filename=".gitignore" />
<Unit filename="fin_lab34.cpp" />
<Unit filename="histogram.cpp" />
<Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" />
<Unit filename="text.h" />
<Extensions>
<lib_finder disable_auto="1" />
</Extensions>

@ -1,6 +1,7 @@
#include <iostream>
#include <vector>
#include <cmath>
#include <string>
#include "histogram.h"
#include "text.h"
#include "svg.h"

@ -1,5 +1,6 @@
#include <iostream>
#include <vector>
#include <string>
#include "svg.h"
using namespace std;
void
@ -16,9 +17,30 @@ void
svg_end() {
cout << "</svg>\n";
}
void
svg_text(double left, double baseline, string text){
cout << "<text x='" << left << "' y='" << baseline <<"' >" << text << "</text>" << endl;
}
void
svg_rect(double x, double y, double width, double height, string stroke = "#ed53a8", string fill = "#9df3a1"){
cout << "<rect x='" << x << "' y='" << y << "' width= '" << width << "' height= '" << height << "' stroke= '" << stroke << "' fill= '" << fill << "'/>" << endl;
}
void
show_histogram_svg(const vector <size_t> &bins) {
svg_begin(400, 300);
const auto IMAGE_WIDTH = 800;
const auto IMAGE_HEIGHT = 600;
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, to_string(bin));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
top += BIN_HEIGHT;
}
svg_end();
}

@ -1,6 +1,7 @@
#ifndef SVG_H_INCLUDED
#define SVG_H_INCLUDED
#include <vector>
#include <string>
using namespace std;
void
svg_begin(double width, double height);
@ -8,6 +9,12 @@ svg_begin(double width, double height);
void
svg_end();
void
svg_text(double left, double baseline, string text);
void
svg_rect(double x, double y, double width, double height, string stroke, string fill);
void
show_histogram_svg(const vector <size_t> &bins);
#endif // SVG_H_INCLUDED

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