main.cpp

@@ -11,8 +11,8 @@ using namespace std;
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
-    string colors_stroke;
+    string stroke;
-    string colors_fill;
+    string fill;
 };
 
 Input
@@ -33,10 +33,12 @@ input_data(){
 
     cerr << "Enter bin count: ";
     cin >> in.bin_count;
-    in.colors_stroke = "midnightblue";
-    in.colors_fill = "deeppink";
 
-    input_colors(in.colors_stroke, in.colors_fill);
+    cerr << "Enter the color for the stroke: ";
+    cin >> in.stroke;
+
+    cerr << "Enter the color to fill: ";
+    cin >> in.fill;
 
     return in;
 }
@@ -46,6 +48,6 @@ int main()
 
     auto in = input_data();
     std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins, in.colors_stroke, in.colors_fill);
+    show_histogram_svg(bins, in.stroke, in.fill);
     return 0;
 }

svg01.cpp

@@ -26,33 +26,12 @@ svg_text(double left, double baseline, string text) {
 }
 
 void
-svg_rect(double x, double y, double width, double height, string colors_stroke, string colors_fill){
+svg_rect(double x, double y, double width, double height, string stroke = "midnightblue", string fill = "deeppink"){
-    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << colors_stroke << "' fill='" << colors_fill << "'/>";
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "'/>";
 }
 
 void
-input_colors(string &colors_stroke, string &colors_fill){
+show_histogram_svg(const vector<size_t>& bins, string stroke, string fill) {
-    string color_personal;
-    cout << "Do you want to change colors? Yes/No" << endl;
-    cin >> color_personal;
-    while ((color_personal != "No") && (color_personal != "Yes")){
-        cout << "WRONG ANSWER! Try again!" << endl;
-        cin >> color_personal;
-    }
-    if (color_personal == "No"){
-        return;
-    }
-    else {
-        cout << "What color for a stroke do you want?" << endl;
-        cin >> colors_stroke;
-        cout << "What color to fill do you want?" << endl;
-        cin >> colors_fill;
-    }
-    return;
-}
-
-void
-show_histogram_svg(const vector<size_t>& bins, string colors_stroke, string colors_fill) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     const auto TEXT_LEFT = 20;
@@ -72,7 +51,7 @@ show_histogram_svg(const vector<size_t>& bins, string colors_stroke, string colo
     for (size_t bin : bins) {
         const double bin_width = (( IMAGE_WIDTH - TEXT_WIDTH ) / BLOCK_WIDTH ) * ( bin / maxel );
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, colors_stroke, colors_fill);
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, stroke, fill);
         top += BIN_HEIGHT;
     }
     svg_end();

svg01.h

@@ -3,7 +3,4 @@
 #include <vector>
 
 void
-show_histogram_svg(const std::vector<size_t>& bins, std::string colors_stroke, std::string colors_fill);
+show_histogram_svg(const std::vector<size_t>& bins, std::string stroke, std::string fill);
-
- void
- input_colors(std::string &colors_stroke, std::string &colors_fill);