исправление варианта
Этот коммит содержится в:
@@ -40,6 +40,8 @@
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="main.cpp" />
|
||||
<Unit filename="svg.cpp" />
|
||||
<Unit filename="svg.h" />
|
||||
<Unit filename="text.cpp" />
|
||||
<Unit filename="text.h">
|
||||
<Option target="<{~None~}>" />
|
||||
|
||||
2
main.cpp
2
main.cpp
@@ -10,7 +10,7 @@ using namespace std;
|
||||
struct Input {
|
||||
vector<double> numbers;
|
||||
size_t bin_count{};
|
||||
size_t USER_BIN_HEIGHT{};
|
||||
double USER_BIN_HEIGHT{};
|
||||
};
|
||||
|
||||
Input input_data() {
|
||||
|
||||
36
svg.cpp
36
svg.cpp
@@ -26,6 +26,32 @@ void svg_rect(double x, double y, double width, double height){
|
||||
std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='black' fill='#33A220' ></rect>";
|
||||
}
|
||||
|
||||
double calculate_bin_height (const std::vector<std::size_t>& bins, double USER_BIN_HEIGHT, double IMAGE_HEIGHT){
|
||||
|
||||
double BIN_HEIGHT;
|
||||
|
||||
if ( USER_BIN_HEIGHT < 0 ){
|
||||
|
||||
BIN_HEIGHT = 0;
|
||||
|
||||
} else {
|
||||
|
||||
BIN_HEIGHT = USER_BIN_HEIGHT;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
auto USER_IMAGE_HEIGHT = bins.size() * BIN_HEIGHT;
|
||||
|
||||
if (USER_IMAGE_HEIGHT > IMAGE_HEIGHT){
|
||||
BIN_HEIGHT = IMAGE_HEIGHT / bins.size();
|
||||
}
|
||||
|
||||
return BIN_HEIGHT;
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
show_histogram_svg(const std::vector<std::size_t>& bins, std::size_t USER_BIN_HEIGHT) {
|
||||
|
||||
@@ -35,19 +61,19 @@ show_histogram_svg(const std::vector<std::size_t>& bins, std::size_t USER_BIN_HE
|
||||
const auto TEXT_BASELINE = 20;
|
||||
const auto TEXT_WIDTH = 50;
|
||||
const auto BLOCK_WIDTH = 10;
|
||||
auto BIN_HEIGHT = USER_BIN_HEIGHT;
|
||||
|
||||
|
||||
|
||||
auto BIN_HEIGHT = calculate_bin_height (bins, USER_BIN_HEIGHT, IMAGE_HEIGHT);
|
||||
|
||||
auto USER_IMAGE_HEIGHT = bins.size() * BIN_HEIGHT;
|
||||
|
||||
if (USER_IMAGE_HEIGHT > IMAGE_HEIGHT){
|
||||
BIN_HEIGHT = IMAGE_HEIGHT / bins.size();
|
||||
}
|
||||
|
||||
const std::size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
|
||||
svg_begin(IMAGE_WIDTH, USER_IMAGE_HEIGHT);
|
||||
double top = 0;
|
||||
|
||||
|
||||
|
||||
std::size_t maxbin=bins[0];
|
||||
for (std::size_t i=0; i < bins.size(); i++){
|
||||
if (maxbin < bins[i]){
|
||||
|
||||
2
svg.h
2
svg.h
@@ -4,6 +4,6 @@
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
show_histogram_svg(const std::vector<std::size_t>& bins, std::size_t USER_BIN_HEIGHT);
|
||||
show_histogram_svg(const std::vector<std::size_t>& bins, double USER_BIN_HEIGHT);
|
||||
|
||||
#endif // SVG_H_INCLUDED
|
||||
|
||||
Ссылка в новой задаче
Block a user