Сравнить коммиты
3 Коммитов
be6059fb6c
...
19fbaf3a4d
| Автор | SHA1 | Дата | |
|---|---|---|---|
| 19fbaf3a4d | |||
| 744f381e19 | |||
| 3339fa726a |
2
LR3/.gitignore
поставляемый
2
LR3/.gitignore
поставляемый
@@ -2,3 +2,5 @@
|
|||||||
/obj
|
/obj
|
||||||
/LR3.depend
|
/LR3.depend
|
||||||
/LR3.layout
|
/LR3.layout
|
||||||
|
/curl/
|
||||||
|
/unittest.layout
|
||||||
|
|||||||
@@ -13,7 +13,12 @@
|
|||||||
<Option compiler="gcc" />
|
<Option compiler="gcc" />
|
||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-g" />
|
<Add option="-g" />
|
||||||
|
<Add directory="C:/Users/daemo/OneDrive/Рабочий стол/lab03/LR3/curl/include" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Linker>
|
||||||
|
<Add library="libcurl.dll.a" />
|
||||||
|
<Add directory="C:/Users/daemo/OneDrive/Рабочий стол/lab03/LR3/curl/lib" />
|
||||||
|
</Linker>
|
||||||
</Target>
|
</Target>
|
||||||
<Target title="Release">
|
<Target title="Release">
|
||||||
<Option output="bin/Release/LR3" prefix_auto="1" extension_auto="1" />
|
<Option output="bin/Release/LR3" prefix_auto="1" extension_auto="1" />
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
#include "histogram.h"
|
#include "histogram.h"
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include "svg.h"
|
#include "svg.h"
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@@ -29,6 +31,7 @@ input_data(){
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
curl_global_init(CURL_GLOBAL_ALL);
|
||||||
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_svg(bins);
|
show_histogram_svg(bins);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
||||||
svg_begin(double width, double height) {
|
svg_begin(double width, double height) {
|
||||||
cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
|
cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
|
||||||
cout << "<svg ";
|
cout << "<svg ";
|
||||||
@@ -11,6 +12,7 @@ svg_begin(double width, double height) {
|
|||||||
cout << "xmlns='http://www.w3.org/2000/svg'>\n";
|
cout << "xmlns='http://www.w3.org/2000/svg'>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void svg_end() {
|
void svg_end() {
|
||||||
cout << "</svg>\n";
|
cout << "</svg>\n";
|
||||||
}
|
}
|
||||||
@@ -19,6 +21,7 @@ void svg_text(double left, double baseline, string text) {
|
|||||||
cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
|
cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black")
|
void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black")
|
||||||
{
|
{
|
||||||
cout << "<rect x='" << x << "' y='" << y << "' width='" << width
|
cout << "<rect x='" << x << "' y='" << y << "' width='" << width
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user