diff --git a/1.cbp b/1.cbp
index a5c062d..5a34f58 100644
--- a/1.cbp
+++ b/1.cbp
@@ -13,7 +13,12 @@
+
+
+
+
+
diff --git a/1.depend b/1.depend
index 05a41b4..fd94e7c 100644
--- a/1.depend
+++ b/1.depend
@@ -20,7 +20,7 @@
-1684762502 source:c:\users\79156\desktop\3\main.cpp
+1684764299 source:c:\users\79156\desktop\3\main.cpp
@@ -28,6 +28,8 @@
"histogram.h"
"svg.h"
+
+
1681131908 c:\users\79156\desktop\3\histogram.h
diff --git a/main.cpp b/main.cpp
index 68035e8..bc3a33f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,77 +1,89 @@
#include
#include
-#include
-#include
+#include
#include "histogram.h"
+#include "text.h"
#include "svg.h"
#include
-
+#include
+#include
using namespace std;
+
struct Input
{
vector numbers;
size_t bin_count{};
};
-
-
Input
-input_data(istream& tin, bool prompt)
+input_data(istream& in, bool promt)
{
-
size_t number_count;
- if(prompt)
- cerr << "Enter number_count ";
-
- tin >> number_count;
-
- vector numbers(number_count);
- Input in;
- in.numbers.resize(number_count);
-
- if(prompt)
- cerr << "Enter numbers ";
+ if (promt)
+ {
+ cerr << "Enter number count: ";
+ }
+ in >> number_count;
+ Input it;
+ it.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++)
{
- cin >> in.numbers[i];
+ in >> it.numbers[i];
}
-
- size_t bin_count;
-
- if(prompt)
- cerr << "Enter bin_count ";
-
- tin >> in.bin_count;
- return in;
-
+ if (promt)
+ {
+ cerr << "Enter bin count: ";
+ }
+ in>> it.bin_count;
+ return it;
}
+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)
+ {
+ 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[])
{
- if(argc > 1){
- CURL *curl = curl_easy_init();
- if(curl)
-{
- CURLcode res;
- curl_easy_setopt(curl, CURLOPT_URL, "https://example.com");
- 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 0;
+ Input input;
+ if (argc > 1)
+ {
+ input = download(argv[1]);
}
- curl_global_init(CURL_GLOBAL_ALL);
- auto in = input_data(cin, false);
- auto bins = make_histogram(in.numbers, in.bin_count);
+ else
+ {
+ input = input_data(cin, true);
+ }
+
+ const auto bins = make_histogram(input.numbers, input.bin_count);
show_histogram_svg(bins);
- return 0;
}