diff --git a/LABA1.cpp b/LABA1.cpp
index cfa8558..88b7ac6 100644
--- a/LABA1.cpp
+++ b/LABA1.cpp
@@ -19,7 +19,7 @@ void svg_text(double left, double baseline, string text) {
cout << "" << text <<"\n";
}
-void svg_rect(double x, double y, double width, double height, string stroke = "red", string fill = "red") {
+void svg_rect(double x, double y, double width, double height, string stroke = "yellow", string fill = "red") {
cout << "\n";
}
@@ -35,12 +35,16 @@ void show_histogram_svg(const vector& marks, const vector& chart
const auto TEXT_WIDTH = 50;
const auto BIN_HEIGHT = 30;
const auto BLOCK_WIDTH = 10;
- svg_begin(400, 300);
+ double min = 0, max = 0, scale = 1;
+ int maxlen = IMAGE_WIDTH - TEXT_WIDTH;
+ svg_begin(4000, 300);
double top = 0;
+ FindMinMax(chart, min, max);
+ scale = max * BLOCK_WIDTH / maxlen;
for (double bin : chart) {
- const double bin_width = BLOCK_WIDTH * bin;
+ double bin_width = BLOCK_WIDTH * bin;
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string((int)bin));
- svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+ svg_rect(TEXT_WIDTH, top, bin_width / scale, BIN_HEIGHT);
top += BIN_HEIGHT;
}
svg_end();