main.cpp

@@ -4,86 +4,93 @@
 #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)
-        cerr << "Enter number count: ";
+    if (promt) cerr << "Enter number count: ";
     in >> number_count;
 
     Input input;
 
-    input.numbers.resize(number_count);
-    if (promt)
-        cerr << "Enter numbers: ";
+
+
+    if (promt) cerr << " Input width of image, > 70 but not >800 : ";
+    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)
-        cerr << "Count of baskets: ";
+    if (promt) cerr << "Count of baskets: ";
     in >> input.bin_count;
 
     return input;
 }
 
-Input download(const string &address)
+int
+main(int argc, char* argv[])
 {
-    stringstream buffer;
 
-    //address.c_str();
+    if( argc > 1 ){
 
-    curl_global_init(CURL_GLOBAL_ALL);
-    {
-        CURL *curl = curl_easy_init();
-        if (curl)
-        {
-            CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
-            res = curl_easy_perform(curl);
-            CURL *curl = curl_easy_init();
-            if (curl)
-            {
-                CURLcode res;
-                /* set options */
-                /* Perform the entire transfer */
-                res = curl_easy_perform(curl);
-                /* Check for errors */
-                if (res != CURLE_OK)
-                    fprintf(stderr, "curl_easy_perform() failed: %s\n",
-                            curl_easy_strerror(res));
-                exit(1);
+        CURL* curl = curl_easy_init();
+
+        cout << argc << '\n';
+        //while (true)
+        for (int i = 0; i < argc; i++){
+
+            cout << argv[i] << " ";
         }
+        cout << endl;
+
         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);
+
+        return 0;
     }
 
-    const auto bins = make_histogram(input.numbers, input.bin_count);
-    show_histogram_svg(bins);
+    curl_global_init(CURL_GLOBAL_ALL);
+
+    auto input = input_data(cin, true);
+    auto bins = make_histogram( input.numbers, input.bin_count );
+    //int chek_block_width(in.IMAGE_WIDTH);
+    //chek_block_width(in.IMAGE_WIDTH, in.number_count);
+    //if (chek_block_width==1)
+    show_histogram_svg( bins, input.IMAGE_WIDTH );
+    //if(chek_block_width==0) return 0;
+    //show_histogram_svg(bins);
+
 }