code: svg

main.cpp

@@ -1,44 +1,100 @@
 #include <iostream>
+#include <string>
+#include <sstream>
 #include <vector>
 #include <curl/curl.h>
+#include <stdio.h>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
 using namespace std;
+
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
 };
 
 Input
-input_data(istream& in, bool prompt){
+input_data(istream& inp, bool prompt){
     size_t number_count;
-    in >> number_count;
+    if (prompt){
-
+        cerr << "enter number_count";
-    Input inp;
+    }
-    inp.numbers.resize(number_count);
+    inp >> number_count;
 
+    Input in;
+    in.numbers.resize(number_count);
+    if (prompt){
+        std::cerr << "enter numbers";
+    }
+    for (size_t i = 0; i < number_count; i++){
+        inp >> in.numbers[i];
+    }
     if (prompt){
         std::cerr << "enter bin_count";
     }
+    inp >> in.bin_count;
+    return in;
+}
 
-    for (size_t i = 0; i < number_count; i++){
+size_t
-        in >> inp.numbers[i];
+write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    size_t data_size = item_size * item_count;
+    (*buffer).write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
 }
 
-    in >> inp.bin_count;
+string
+filling(const string& key, const string& color){
+    if(strcmp(key.c_str(), "-fill") == 0){
+        if (strcmp(color.c_str(), " ") == 0){
+            cerr << "Error: no color specified";
+            exit(1);
+        }
+        return color.c_str();
+    }
+}
 
-    return inp;
+Input
+download(const string& adress){
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if(curl) {
+        CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_URL, adress.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){
+            cerr << curl_easy_strerror(res);
+            exit(1);
+        }
+        curl_easy_cleanup(curl);
+    }
+    return input_data(buffer, false);
 }
 
 int main(int argc, char* argv[]){
+    string color = "base";
     curl_global_init(CURL_GLOBAL_ALL);
+    Input in;
     if (argc > 1) {
-        cerr << "argv[0] = " << argv[0] << "argc = " << argc;
+        in = download(argv[1]);
-        return 0;
+    } else {
+        in = input_data(cin, true);
     }
-    auto in = input_data(cin, true);
+
+    if (argc > 2){
+        if (argv[3] == NULL){
+            color = filling(argv[2], " ");
+        }
+        else{
+        color = filling(argv[2], argv[3]);
+        }
+    }
+
     auto bins = make_histogram(in.numbers, in.bin_count);
     auto borders = make_borders(in.numbers, in.bin_count);
-    show_histogram_svg(bins, borders, in.bin_count);
+    show_histogram_svg(bins, borders, in.bin_count, color);
 }

svg.cpp

@@ -27,7 +27,7 @@ void svg_rect(double x, double y, double width, double height, string stroke = "
 }
 
 void
-show_histogram_svg(const vector<size_t>& bins, const std::vector<double>& borders, size_t bin_count) {
+show_histogram_svg(const vector<size_t>& bins, const std::vector<double>& borders, size_t bin_count, string filling) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     const auto TEXT_LEFT = 20;
@@ -40,26 +40,33 @@ show_histogram_svg(const vector<size_t>& bins, const std::vector<double>& border
     size_t max_bin = *max_element(bins.begin(), bins.end());
     size_t number_of_blocks;
     double top = 0;
-    size_t color = 0;
+    size_t paint_swicher = 0;
+    string color;
     size_t border = 0;
     for (size_t bin: bins){
+        if (filling != "base"){
+            color = filling;
+        }
+        else{
+            color = colors[paint_swicher];
+        }
         number_of_blocks = bin;
         if ((max_bin * BLOCK_WIDTH) > (IMAGE_WIDTH - TEXT_WIDTH)){
             number_of_blocks = ((IMAGE_WIDTH - TEXT_WIDTH)/10) * (static_cast<double>(bin) / max_bin);
         }
         const double bin_width = BLOCK_WIDTH * number_of_blocks;
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", colors[color]);
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", color);
+        paint_swicher += 1;
+        if (paint_swicher > 6){
+            paint_swicher = 0;
+        }
         if (border < bin_count - 1){
             top += BIN_HEIGHT;
             svg_text(TEXT_LEFT / 2, top + TEXT_BASELINE , to_string(borders[border]));
             border += 1;
             top += BIN_HEIGHT;
         }
-        color += 1;
-        if (color > 6){
-            color = 0;
-        }
     }
     svg_end();
 }