diff --git a/main.cpp b/main.cpp index b6e0d66..6b38d10 100644 --- a/main.cpp +++ b/main.cpp @@ -1,8 +1,9 @@ -#include -#define CURL_STATICLIB #include +#include +#include #include -#include "histogram.h" +#include +#include "hictogram.h" #include "text.h" #include "svg.h" @@ -11,63 +12,73 @@ using namespace std; struct Input { vector numbers; size_t bin_count{}; - size_t block_width{}; }; -Input input_data(istream& in_stream = cin, bool prompt = true) { - Input in; - size_t number_count; - +Input input_data(istream& in, bool prompt) { if (prompt) { - cerr << "Enter number count: "; + cerr << "Enter number count, numbers and bin count: "; } - in_stream >> number_count; - in.numbers.resize(number_count); + size_t number_count; + in >> number_count; + + Input input; + input.numbers.resize(number_count); - if (prompt) { - cerr << "Enter " << number_count << " numbers: "; - } for (size_t i = 0; i < number_count; i++) { - in_stream >> in.numbers[i]; + in >> input.numbers[i]; } - if (prompt) { - cerr << "Enter bin count: "; - } - in_stream >> in.bin_count; + in >> input.bin_count; - return in; + return input; } -vector make_histogram(const vector& numbers, size_t bin_count) { - vector bins(bin_count, 0); - for (double num : numbers) { - size_t index = min(bin_count - 1, static_cast(num)); // пример - bins[index]++; - } - return bins; +size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) { + size_t data_size = item_size * item_count; + + stringstream* buffer = reinterpret_cast(ctx); + buffer->write(reinterpret_cast(items), data_size); + + return data_size; } + +Input download(const string& address) { + stringstream buffer; + + CURL* curl = curl_easy_init(); + if (curl) { + curl_easy_setopt(curl, CURLOPT_URL, address.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); + + CURLcode res = curl_easy_perform(curl); + if (res != CURLE_OK) { + cerr << "cURL error: " << curl_easy_strerror(res) << endl; + curl_easy_cleanup(curl); + exit(1); + } + + curl_easy_cleanup(curl); + } else { + cerr << "curl_easy_init() failed" << endl; + exit(1); + } + + return input_data(buffer, false); } + + + int main(int argc, char* argv[]) { if (argc > 1) { - cout << "argc = " << argc << endl; + std::cout << "argc = " << argc << std::endl; for (int i = 0; i < argc; ++i) { - cout << "argv[" << i << "] = \"" << argv[i] << "\"" << endl; + std::cout << "argv[" << i << "] = " << argv[i] << std::endl; } return 0; } - - CURLcode res = curl_global_init(CURL_GLOBAL_ALL); - if (res != CURLE_OK) { - cerr << "cURL initialization failed: " << curl_easy_strerror(res) << endl; - return 1; - } - - auto in = input_data(); - auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins, in.block_width); - - curl_global_cleanup(); + // Если аргументов нет, программа ничего не делает и просто завершает + return 0; }