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

...

5 Коммитов

2 изменённых файлов: 61 добавлений и 12 удалений

Просмотреть файл

@@ -4,6 +4,10 @@
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <curl/curl.h>
#include <sstream>
#include <string>
using namespace std; using namespace std;
struct Input struct Input
@@ -17,27 +21,67 @@ input_data(istream& in, bool prompt)
{ {
size_t number_count; size_t number_count;
if (prompt) if (prompt)
cerr << "Enter number count: "; {
cerr << "Enter number count: ";
}
in >> number_count; in >> number_count;
Input ik; Input ik;
ik.numbers.resize(number_count); ik.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++) for (size_t i = 0; i < number_count; i++)
{ {
cin >> ik.numbers[i]; in >> ik.numbers[i];
} }
cerr << "Enter bin count: "; if (prompt)
cin>> ik.bin_count; {
cerr << "Enter bin count: ";
}
in>> ik.bin_count;
return ik; return ik;
} }
size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx)
int main()
{ {
auto in = input_data(cin, true); size_t data_size = item_size * item_count;
auto bins = make_histogram(in.numbers, in.bin_count); stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
show_histogram_svg(bins); buffer->write(reinterpret_cast<const char*>(items), data_size);
getch(); return data_size;
return 0; }
Input
download(const string& address)
{
stringstream buffer;
CURL*curl = curl_easy_init();
if(curl)
{
CURLcode res;
curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
res = curl_easy_perform(curl);
if (res != CURLE_OK)
{
fprintf(stderr, "curl_easy_perform() failed: %s\n",curl_easy_strerror(res));
exit(1);
}
curl_easy_cleanup(curl);
}
return input_data(buffer, false);
}
int main(int argc, char* argv[])
{
Input input;
if (argc > 1)
{
input = download(argv[1]);
}
else
{
input = input_data(cin, true);
}
const auto bins = make_histogram(input.numbers, input.bin_count);
show_histogram_svg(bins);
} }

Просмотреть файл

@@ -13,7 +13,12 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker>
<Add library="libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/pr1" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release/pr1" prefix_auto="1" extension_auto="1" />