l03.cpp

@@ -4,113 +4,73 @@
 #include "svg.h"
 #include "text.h"
 #include <curl/curl.h>
-#include <sstream>
+
-#include <string>
+
 
 using namespace std;
 
+//const size_t SCREEN_WIDTH = 80;
+//const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
 struct Input
 {
     vector<double> numbers;
     size_t bin_count{};
+    size_t IMAGE_WIDTH{};
+    
 };
 
-Input input_data(istream &in, bool promt)
+Input 
+input_data(istream& in, bool promt)
 {   
 
-    size_t number_count, bin_count;
+    size_t number_count, bin_count, IMAGE_WIDTH;
 
-    if (promt)
+    if (promt) cerr << "Enter number count: ";
-    {
-        cerr << "Enter number count: ";
-    }
     in >> number_count;
 
     Input input;
 
-    input.numbers.resize(number_count);
+    
-    if (promt)
+    
-    {
+    if (promt) cerr << " Input width of image, > 70 but not >800 : ";
-        cerr << "Enter numbers: ";
+    in >> input.IMAGE_WIDTH;
+    if(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800 ) {
+        while(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800) {
+            if (promt) cerr << " Input width of image, >70 but not >800 : ";
+            in >> input.IMAGE_WIDTH;
         }
+    }
+  
+
+    //size_t number_count = in.number_counts;
+
+    input.numbers.resize( number_count );
+    if (promt) cerr << "Enter numbers: ";
+    // vector<double> numbers(number_count);
 
     for (size_t i = 0; i < number_count; i++)
     {
         in >> input.numbers[i];
     }
 
-    if (promt)
+    if (promt) cerr << "Count of baskets: ";
-    {
-        cerr << "Count of baskets: ";
-    }
     in >> input.bin_count;
 
     return input;
 }
-size_t
-write_data(void *items, size_t item_size, size_t item_count, void *ctx)
-{
-    size_t data_size = item_count * item_size;
-
-    stringstream *buffer = reinterpret_cast<stringstream *>(ctx);
-    char *item = reinterpret_cast<char *>(items);
-    //(*buffer).write(item, data_size);
-    buffer->write(item, data_size);
-
-    return data_size;
-}
 
-Input download(const string &address)
+int main()
 {   
-    stringstream buffer;
-
-    // address.c_str();
-
     curl_global_init(CURL_GLOBAL_ALL);
-    {
-        CURL *curl = curl_easy_init();
-        if (curl)
-        {
-            CURLcode res;
-            double total;
-            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);
-            }
-
-            if (CURLE_OK == res)
-            {
-                res = curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total);
-                cerr << "Time spending for downloading file: " << total << endl;
-            }
-            curl_easy_cleanup(curl);
-        }
-    }
 
-    return input_data(buffer, false);
+    auto input = input_data(cin, true);
-}
+    auto bins = make_histogram( input.numbers, input.bin_count );
-
+    //int chek_block_width(in.IMAGE_WIDTH);
-int main(int argc, char *argv[])
+    //chek_block_width(in.IMAGE_WIDTH, in.number_count);
-{
+    //if (chek_block_width==1)
-    Input input;
+    show_histogram_svg( bins, input.IMAGE_WIDTH );
-    if (argc > 1)
+    //if(chek_block_width==0) return 0;
-    {
+    //show_histogram_svg(bins);
-        input = download(argv[1]);
-    }
-    else
-    {
-        input = input_data(cin, true);
-    }
   
-    const auto bins = make_histogram(input.numbers, input.bin_count);
-    show_histogram_svg(bins);
 }