diff --git a/fin_lab34.cbp b/fin_lab34.cbp
index d5952e7..2b3d25a 100644
--- a/fin_lab34.cbp
+++ b/fin_lab34.cbp
@@ -32,7 +32,15 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/svg.cpp b/svg.cpp
index e8688a7..e15ff44 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -22,13 +22,25 @@ svg_text(double left, double baseline, string text){
cout << "" << text << "" << endl;
}
void
-svg_rect(double x, double y, double width, double height){
- cout << "";
+svg_rect(double x, double y, double width, double height, string stroke = "#ed53a8", string fill = "#9df3a1"){
+ cout << "" << endl;
}
void
show_histogram_svg(const vector &bins) {
- svg_begin(400, 300);
- svg_text(20, 20, to_string(bins[0]));
- svg_rect(50, 0, bins[0]*10, 30);
+ const auto IMAGE_WIDTH = 800;
+ const auto IMAGE_HEIGHT = 600;
+ const auto TEXT_LEFT = 20;
+ const auto TEXT_BASELINE = 20;
+ const auto TEXT_WIDTH = 50;
+ const auto BIN_HEIGHT = 30;
+ const auto BLOCK_WIDTH = 10;
+ svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+ double top = 0;
+ for (size_t bin : bins){
+ const double bin_width = BLOCK_WIDTH * bin;
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+ svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+ top += BIN_HEIGHT;
+ }
svg_end();
}
diff --git a/svg.h b/svg.h
index 4888808..6421fce 100644
--- a/svg.h
+++ b/svg.h
@@ -13,7 +13,7 @@ void
svg_text(double left, double baseline, string text);
void
-svg_rect(double x, double y, double width, double height);
+svg_rect(double x, double y, double width, double height, string stroke, string fill);
void
show_histogram_svg(const vector &bins);