diff --git a/svg.cpp b/svg.cpp index 60b1cfc..026d4ec 100644 --- a/svg.cpp +++ b/svg.cpp @@ -20,15 +20,34 @@ svg_end() { } void -svg_text(double left, double baseline, string text) { - cout << ""<< text << ""; +svg_text(double left, double baseline, string style, string text) { + cout << "" << text << ""; } -void svg_rect(double x, double y, double width, double height, +void +svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "orange"){ cout << ""; } +string +styled_text_func (){ + string text_style; + cerr << "Do you want to use any text style? (Yes/No)" << endl; + cin >> text_style; + if (text_style == "No") { + text_style = "none"; + } + else { + cerr << "Which text style do you want to use?" << endl; + cin >> text_style; + while ((text_style != "none") && (text_style != "underline") && (text_style != "overline") && (text_style != "line-through")){ + cerr << "You entered the wrong style name. Try again." << endl; + cin >> text_style; + } + } + return text_style; +} void show_histogram_svg(const vector& bins) { @@ -46,9 +65,10 @@ show_histogram_svg(const vector& bins) { maxbin = bin; } } + string text_style = styled_text_func(); for (size_t bin : bins) { double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * ( bin / maxbin ); - svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_text(TEXT_LEFT, top + TEXT_BASELINE, text_style, to_string(bin)); svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); top += BIN_HEIGHT; }