svg.cpp

@@ -1,14 +1,11 @@
-#include <math.h>
 #include <iostream>
-#include <conio.h>
 #include <vector>
-#include <string>
 #include "svg.h"
 using namespace std;
 
+
 void
-svg_begin(double width, double height)
+svg_begin(double width, double height) {
-{
     cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
     cout << "<svg ";
     cout << "width='" << width << "' ";
@@ -18,100 +15,11 @@ svg_begin(double width, double height)
 }
 
 void
-svg_end()
+svg_end() {
-{
     cout << "</svg>\n";
 }
 void
-svg_text(double left, double baseline, string text)
+show_histogram_svg(const vector<size_t> &bins) {
-{
+    svg_begin(400, 300);
-    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
-}
-
-void
-svg_rect(double x, double y, double width, double height, string stroke, string fill)
-{
-    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke='"<<stroke<<"' fill='"<<fill<<"' />";
-
-}
-
-
-void
-show_histogram_svg(const vector<size_t>& bins, size_t number_count)
-{
-    setlocale(LC_ALL, "Russian");
-    int noi=0;
-    auto IMAGE_WIDTH = 0;
-    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 MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
-//
-    cerr<<"Ââåäèòå æåëàåìóþ øèðèíó ñòðîêè";
-    //cerr<<endl;
-    cerr<<"Ó÷òèòå, ÷òî îíà äîëæíà áûòü áîëüøå 70 è ìåíüøå 800, à òàêæå";
-   // cerr<<endl;
-    cerr<<"áîëåå òðåòè êîëè÷åñâà ÷èñåë, óìíîæåííûõ íà øèðèíó áëîêà .  âàøåì ñëó÷àå áîëåå "<<(( number_count*BLOCK_WIDTH)/3)<<" ";
-    //cerr<<endl;
-    //cin>>IMAGE_WIDTH;
-    while (noi == 0)
-    {
-        cerr<<" in cicle";
-        //cerr<<endl;
-        cin>> IMAGE_WIDTH;
-        if ((IMAGE_WIDTH<800)&&(IMAGE_WIDTH>70)&&(IMAGE_WIDTH>(number_count*BLOCK_WIDTH)/3))
-        {
-            noi=noi+1;
-        }
-
-        if (IMAGE_WIDTH>800)
-        {
-            cerr<<" ß æå ñêàçàë ìåíüøå 800. Ââåäèòå çàíîâî";
-           // cerr<<endl;
-        }
-        if (IMAGE_WIDTH<70)
-        {
-            cerr<<" ß æå ñêàçàë áîëüøå 70.Ââåäèòå çàíîâî";
-            //cerr<<endl;
-        }
-        if (IMAGE_WIDTH<(number_count*BLOCK_WIDTH)/3)
-        {
-            cerr<<" ß æå ñêàçàë áîëüøå " << (number_count*BLOCK_WIDTH)/3<<" Ââåäèòå çàíîâî";
-           // cerr<<endl;
-        }
-
-    }
-
-
-
-//string k;
-//string m;
-    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
-
-    double top = 0; //ìàøòàáèðâîàíèå
-    double max_count = bins[0];
-    for (size_t i = 0; i < bins.size(); i++)
-    {
-        if (bins[i] > max_count)
-            max_count = bins[i];
-    }
-    for (size_t bin : bins)
-    {
-        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count);
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        /*/
-        cout<<"Ââåäèòå öâåò 1 â ôîðìàòå #RRGGBB";
-        cin>> k;
-        cout<<endl;
-        cout<<"Ââåäèòå öâåò 2 â ôîðìàòå #RRGGBB";
-        cin >> m;
-        /*/
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,"#00CCFF" /*/k/*/,"#0000FF" /*/m/*/);
-        top += BIN_HEIGHT;
-    }
-
     svg_end();
 }

svg.h

@@ -1,9 +1,7 @@
 #ifndef SVG_H_INCLUDED
 #define SVG_H_INCLUDED
 
-#include <vector>
 void
-show_histogram_svg(const std::vector<size_t>& bins, size_t number_count);
+svg_begin(double width, double height)
-
 
 #endif // SVG_H_INCLUDED

text.h

@@ -1,7 +1,8 @@
 #ifndef TEXT_H_INCLUDED
 #define TEXT_H_INCLUDED
 
-//std::vector<size_t>
+std::vector<size_t>
 void
 show_histogram_text(std::vector<size_t> bins, size_t bin_count);
+
 #endif // TEXT_H_INCLUDED