l03.cpp

@@ -3,7 +3,7 @@
 #include "histogram.h"
 #include "svg.h"
 #include "text.h"
-//#include "mycheck.h"
+
 
 using namespace std;
 
@@ -14,28 +14,21 @@ struct Input
 {
     vector<double> numbers;
     size_t bin_count{};
-    size_t IMAGE_WIDTH{};
-    
 };
 
 Input input_data()
 {
 
-    size_t number_count, bin_count, IMAGE_WIDTH;
+    size_t number_count, bin_count;
 
     cerr << "Enter number count: ";
     cin >> number_count;
 
     Input in;
-
-    cerr << " Input width of image, >70 but not >800 : ";
-    cin >> in.IMAGE_WIDTH;
-
-    //size_t number_count = in.number_counts;
-
     in.numbers.resize(number_count);
 
     cerr << "Enter numbers: ";
+
     // vector<double> numbers(number_count);
 
     for (size_t i = 0; i < number_count; i++)
@@ -51,14 +44,8 @@ Input input_data()
 
 int main()
 {
-    
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    //int chek_block_width(in.IMAGE_WIDTH);
-    //chek_block_width(in.IMAGE_WIDTH, in.number_count);
-    //if (chek_block_width==1) 
-    show_histogram_svg(bins,in.IMAGE_WIDTH);
-    //if(chek_block_width==0) return 0;
-    //show_histogram_svg(bins);
-  
+    show_histogram_svg(bins); 
+    return 0;
 }

svg.cpp

@@ -3,6 +3,14 @@
 #include "svg.h"
 // #include"svg_rect.h"
 
+const auto IMAGE_WIDTH = 400;
+const auto IMAGE_HEIGHT = 300;
+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;
+
 void svg_begin(double width, double height)
 {
     std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
@@ -18,59 +26,35 @@ void svg_end()
     std::cout << "</svg>\n";
 }
 
-void svg_text(double left, double baseline, std::string text, int check)
+void svg_text(double left, double baseline, std::string text)
 {
     // std::cout << "<text x='20' y='35'>text</text>";
 
-    if (check == 0)
-    {
-        std::cout << "<text x=' " << left << " ' y='" << baseline << "'> uncorectly width of image </text>";
-        //std::cout << "<text x='20' y='35' >uncorectly width of image </text>"; //больше 100 ничего нет
-    }
-
-    if (check == 1)
-    {
-        std::cout << "<text x=' " << left << " ' y='" << baseline << "' > " << text << " </text>";
-    }
+    std::cout << "<text x=' " << left << " ' y='" << baseline << "' > " << text << " </text>";
 
     // std::cout << "<text x='20' y='" << baseline << "' >2</text>";
 }
 
-void svg_rect(double x, double y, double width, double height, int check)
+void svg_rect(double x, double y, double width, double height)
 {
-    //if (check == 0)
-    //{
-        //std::cout << "<rect x=' " << x << " ' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='yellow' >uncorectly width of image</rect>";
-    //}
 
-    if ( check == 1)
-    {
-        std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='yellow' fill='#9932CC' ></rect>";
-    }
+    std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='yellow' fill='#9932CC' ></rect>";
 }
 
-void show_histogram_svg(const std::vector<int> &bins, size_t IMAGE_WIDTH)
+void show_histogram_svg(const std::vector<int> &bins)
 {
-
-    // std::cout << IMAGE_WIDTH <<std::endl;
-    //  const auto IMAGE_WIDTH = 400;
-
-    // if (IMAGE_WIDTH > 70 && IMAGE_WIDTH < 800){
-
-    // return 1;
-
+    const auto SCALE = (IMAGE_WIDTH - TEXT_WIDTH);
+    const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     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;
-    const auto SCALE = (IMAGE_WIDTH - TEXT_WIDTH);
     svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
     double top = 0;
     for (size_t bin : bins)
     {
-        int check = 0;
         double bin_width = BLOCK_WIDTH * bin;
 
         if (bin_width > SCALE)
@@ -78,16 +62,8 @@ void show_histogram_svg(const std::vector<int> &bins, size_t IMAGE_WIDTH)
             bin_width = SCALE;
         }
 
-        //if (IMAGE_WIDTH < 70 && IMAGE_WIDTH > 800)
-        //{
-        //check = 0;
-        //}
-        if (IMAGE_WIDTH > 70 && IMAGE_WIDTH < 800 && IMAGE_WIDTH > 1./3*(bin*BLOCK_WIDTH))
-        {
-            check = 1;
-        }
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin), check);
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, check);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
         top += BIN_HEIGHT;
     }
 

svg.h

@@ -3,6 +3,6 @@
 #include <vector>
 
 void
-show_histogram_svg(const std::vector<int>& bins, size_t IMAGE_WIDTH);
+show_histogram_svg(const std::vector<int>& bins);
 
 #endif     //SVG_H_INCLUDED