GladkyMS 6 месяцев назад
Родитель 0b7d923bba
Сommit 5717431cc2

@ -22,11 +22,11 @@ svg_text(double left, double baseline, std::string text) {
void svg_rect(double x, double y, double width, double height,std::string stroke = "black", std::string fill = "black") { void svg_rect(double x, double y, double width, double height,std::string stroke = "black", std::string fill = "black") {
std::cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke='"<<stroke<<"' fill='"<<fill<<"'/>"; std::cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke='"<<stroke<<"' fill='"<<fill<<"'/>";
} }
//std::string bin_color(size_t bin, size_t mxbins) { std::string bin_color(size_t bin, size_t mxbins) {
// return("#" + std::to_string((10 - floor((bin) * 9 / mxbins))) + std::to_string((10 - floor((bin) * 9 / mxbins))) + std::to_string((10 - floor((bin) * 9 / mxbins)))); return("#" + std::to_string(int((10 - floor(((bin) * 9) / mxbins)))) + std::to_string(int((10 - floor(((bin) * 9) / mxbins)))) + std::to_string(int((10 - floor(((bin) * 9) / mxbins)))));
//} }
void show_histogram_svg(const std::vector<size_t>& bins, size_t bin_count) { void show_histogram_svg(const std::vector<size_t>& bins) {
const auto IMAGE_WIDTH = 400; const auto IMAGE_WIDTH = 400;
const auto IMAGE_HEIGHT = 300; const auto IMAGE_HEIGHT = 300;
const auto TEXT_LEFT = 20; const auto TEXT_LEFT = 20;
@ -48,10 +48,10 @@ void show_histogram_svg(const std::vector<size_t>& bins, size_t bin_count) {
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
double top = 0; double top = 0;
for (size_t bin : bins) { for (size_t bin : bins) {
/* std::string color = bin_color(bin,mxbins);*/ std::string color = bin_color(bin,mxbins);
const double bin_width = BLOCK_WIDTH * bin*k; const double bin_width = BLOCK_WIDTH * bin*k;
svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin)); svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "red", "#ffeeee");///color,color äëÿ ïåðñîíàëüíîãî âàðèàíòà svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, color, color);///color,color äëÿ ïåðñîíàëüíîãî âàðèàíòà
top += BIN_HEIGHT; top += BIN_HEIGHT;
} }
svg_end(); svg_end();

@ -7,13 +7,13 @@ svg_begin(double width, double height);
void void
svg_end(); svg_end();
void show_histogram_svg(const std::vector<size_t>& bins, size_t bin_count); void show_histogram_svg(const std::vector<size_t>& bins);
void void
svg_text(double left, double baseline, std::string text); svg_text(double left, double baseline, std::string text);
//std::string std::string
//bin_color(size_t bin, size_t mxbins); bin_color(size_t bin, size_t mxbins);
void void
svg_rect(double x, double y, double width, double height, std::string stroke , std::string fill ); svg_rect(double x, double y, double width, double height, std::string stroke , std::string fill );

@ -1,146 +1,123 @@
#include <vector> 
#include <curl/curl.h>
#include <vector>
#include <sstream>
#include <string>
#include <iostream> #include <iostream>
#include<cmath>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <curl/curl.h> #include"string"
#include <sstream>
#include <string>
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
using namespace std; using namespace std;
struct Input {
vector<double> numbers;
size_t bin_count{};
struct Input {
vector<double> numbers;
size_t bin_count{};
}; };
Input input_data() Input
{ input_data(istream& in, bool prompt) {
size_t number_count;
cin >> number_count; size_t number_count;
Input in; if (prompt) {
in.numbers.resize(number_count); cerr << "Enter number count: ";
for (size_t i = 0; i < number_count; i++) }
{ in >> number_count;
cin >> in.numbers[i];
Input iinn;
iinn.numbers.resize(number_count);
if (prompt) {
cerr << "Enter numbers: ";
}
for (size_t i = 0; i < number_count; i++)
{
in >> iinn.numbers[i];
}
} if (prompt) {
cerr << "Enter bin count: ";
}
in >> iinn.bin_count;
cin >> in.bin_count; return iinn;
}
return in; static size_t
write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
size_t data_size = item_size * item_count;
stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
buffer->write(reinterpret_cast<const char*>(items), data_size);
return data_size;
} }
//Input input_data(istream& in,bool prompt) { Input
// download(const string& address) {
// if (prompt == true) cerr << "Enter number_count: "; stringstream buffer;
// CURL* curl = curl_easy_init();
// size_t number_count; if (curl) {
// in >> number_count; CURLcode res;
// curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
// Input data; curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
// data.numbers.resize(number_count); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
// res = curl_easy_perform(curl);
// if (prompt == true) cerr << "Enter numbers: "; if (res != CURLE_OK) {
// fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
// for (size_t i = 0; i < number_count; i++) { exit(1);
// in >> data.numbers[i]; }
// } curl_easy_cleanup(curl);
// }
// if (prompt == true) cerr << "Enter bin count: "; return input_data(buffer, false);
// }
// in >> data.bin_count;
// return data;
//}
//size_t
//write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
// size_t data_size = item_size * item_count;
// stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
// buffer->write(reinterpret_cast<const char*>(items), data_size);
// return data_size;
//}
//Input
//download(const string& address) {
// stringstream buffer;
// CURL* curl = curl_easy_init();
// if (curl) {
// CURLcode res;
// curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
// curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
// curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
// res = curl_easy_perform(curl);
// if (res != CURLE_OK) {
// fprintf(stderr, "curl_easy_perform() failed: %s\n",
// curl_easy_strerror(res));
// exit(1);
// }
// curl_easy_cleanup(curl);
// }
//
// return input_data(buffer, false);
//}
int main() void usage() {
{ cout << "Usage: (lab34.exe [-format {text|svg}] URL) or (lab34.exe URL [-format {text|svg}])\n" ;
auto in = input_data(); exit(1);
vector <size_t> bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins, in.bin_count);
} }
int
main(int argc, char* argv[])
{
#include <curl/curl.h>
curl_global_init(CURL_GLOBAL_ALL);
Input input;
string format_option;
if ((argc > 3) && (strcmp(argv[1], "-format") == 0))
{
if (strcmp(argv[2], "svg") == 0) {
format_option = "svg";
}
else if (strcmp(argv[2], "text") == 0) {
format_option = "text";
}
//void usage() { input = download(argv[3]);
// cout << "Usage: lab34.exe [-format {text|svg}] URL\n"; }
// exit(1);
//} else if ((argc > 3) && (strcmp(argv[2], "-format") == 0))
// {
//int main(int argc, char* argv[]) { if (strcmp(argv[3], "svg") == 0) {
// curl_global_init(CURL_GLOBAL_ALL); format_option = "svg";
// }
// if (argc > 1) { else if (strcmp(argv[3], "text") == 0) {
// string format_option; format_option = "text";
// for (int i = 1; i < argc; i++) { }
// if (argv[i][0] == '-') { input = download(argv[1]);
// }
// if ( strcmp(argv[i], "-format") == 0) { else {
// format_option = argv[i++]; usage();
// break;
// } }
// } if (format_option != "text" && format_option != "svg") {
// } usage();
// }
// if (!format_option.empty()) {
// if (format_option != "text" && format_option != "svg") { const auto bins = make_histogram(input.numbers, input.bin_count);
// usage();
// } if (format_option == "text") {
// } show_histogram_text(bins, input.bin_count);
// }
// Input input; else if (format_option == "svg") {
// if (argc > 2) { show_histogram_svg(bins);
// input = download(argv[2]); }
// } return(0);
// else { }
// input = input_data(cin, true);
// }
//
// vector<size_t> bins = make_histogram(input.numbers, input.bin_count);
//
// if (!format_option.empty()) {
// if (format_option == "text") {
// show_histogram_text(bins, input.bin_count);
// }
// else {
// show_histogram_svg(bins, input.bin_count);
// }
// }
// else {
// show_histogram_svg(bins, input.bin_count);
// }
// }
// else {
// cerr << "No arguments provided." << endl;
// usage();
// }
//
// return 0;
//}

Загрузка…
Отмена
Сохранить