Сравнить коммиты
6 Коммитов
3145fd865b
...
master
| Автор | SHA1 | Дата | |
|---|---|---|---|
| cd1a518e91 | |||
| de2f56b65b | |||
| 0afe6f06a1 | |||
| 89a4be4fa9 | |||
| db7a473cdc | |||
| b03befd0f9 |
1
.gitignore
поставляемый
1
.gitignore
поставляемый
@@ -1,2 +1,3 @@
|
|||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
|
/curl
|
||||||
|
|||||||
94
lab01.depend
94
lab01.depend
@@ -74,15 +74,15 @@
|
|||||||
1745611606 c:\users\ïëàòîí\desktop\project\lab01\histogram_internal.h
|
1745611606 c:\users\ïëàòîí\desktop\project\lab01\histogram_internal.h
|
||||||
<vector>
|
<vector>
|
||||||
|
|
||||||
1746093073 source:c:\users\ïëàòîí\desktop\project\lab01\histogram.cpp
|
1747659893 source:c:\users\ïëàòîí\desktop\project\lab01\histogram.cpp
|
||||||
<iostream>
|
<iostream>
|
||||||
<vector>
|
<vector>
|
||||||
"histogram.h"
|
"histogram.h"
|
||||||
|
|
||||||
1746094194 c:\users\ïëàòîí\desktop\project\lab01\svg.h
|
1747659893 c:\users\ïëàòîí\desktop\project\lab01\svg.h
|
||||||
<vector>
|
<vector>
|
||||||
|
|
||||||
1746094194 source:c:\users\ïëàòîí\desktop\project\lab01\svg.cpp
|
1747659893 source:c:\users\ïëàòîí\desktop\project\lab01\svg.cpp
|
||||||
<math.h>
|
<math.h>
|
||||||
<iostream>
|
<iostream>
|
||||||
<conio.h>
|
<conio.h>
|
||||||
@@ -90,3 +90,91 @@
|
|||||||
<string>
|
<string>
|
||||||
"svg.h"
|
"svg.h"
|
||||||
|
|
||||||
|
1747663012 source:c:\users\ïëàòîí\desktop\project\lab01_copy\histogram.cpp
|
||||||
|
<iostream>
|
||||||
|
<vector>
|
||||||
|
"histogram.h"
|
||||||
|
|
||||||
|
1747663012 c:\users\ïëàòîí\desktop\project\lab01_copy\histogram.h
|
||||||
|
<vector>
|
||||||
|
|
||||||
|
1747663012 source:c:\users\ïëàòîí\desktop\project\lab01_copy\svg.cpp
|
||||||
|
<math.h>
|
||||||
|
<iostream>
|
||||||
|
<conio.h>
|
||||||
|
<vector>
|
||||||
|
<string>
|
||||||
|
"svg.h"
|
||||||
|
|
||||||
|
1747663012 c:\users\ïëàòîí\desktop\project\lab01_copy\svg.h
|
||||||
|
<vector>
|
||||||
|
|
||||||
|
1747663012 source:c:\users\ïëàòîí\desktop\project\lab01_copy\text.cpp
|
||||||
|
<iostream>
|
||||||
|
<vector>
|
||||||
|
"text.h"
|
||||||
|
|
||||||
|
1747663012 c:\users\ïëàòîí\desktop\project\lab01_copy\text.h
|
||||||
|
<vector>
|
||||||
|
|
||||||
|
1748263687 source:c:\users\ïëàòîí\desktop\project\lab01_copy\main.cpp
|
||||||
|
<iostream>
|
||||||
|
<vector>
|
||||||
|
"histogram.h"
|
||||||
|
"text.h"
|
||||||
|
"svg.h"
|
||||||
|
<curl/curl.h>
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\curl.h
|
||||||
|
"curlver.h"
|
||||||
|
"system.h"
|
||||||
|
<stdio.h>
|
||||||
|
<limits.h>
|
||||||
|
<sys/param.h>
|
||||||
|
<sys/types.h>
|
||||||
|
<time.h>
|
||||||
|
<winsock2.h>
|
||||||
|
<ws2tcpip.h>
|
||||||
|
<sys/select.h>
|
||||||
|
<sys/socket.h>
|
||||||
|
<sys/time.h>
|
||||||
|
"easy.h"
|
||||||
|
"multi.h"
|
||||||
|
"urlapi.h"
|
||||||
|
"options.h"
|
||||||
|
"header.h"
|
||||||
|
"websockets.h"
|
||||||
|
"mprintf.h"
|
||||||
|
"typecheck-gcc.h"
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\curlver.h
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\system.h
|
||||||
|
<ConditionalMacros.h>
|
||||||
|
<inttypes.h>
|
||||||
|
<inttypes.h>
|
||||||
|
<sys/types.h>
|
||||||
|
<sys/socket.h>
|
||||||
|
<sys/poll.h>
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\easy.h
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\multi.h
|
||||||
|
"curl.h"
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\urlapi.h
|
||||||
|
"curl.h"
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\options.h
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\header.h
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\websockets.h
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\mprintf.h
|
||||||
|
<stdarg.h>
|
||||||
|
<stdio.h>
|
||||||
|
"curl.h"
|
||||||
|
|
||||||
|
1747661306 c:\users\ïëàòîí\desktop\project\lab01_copy\curl\include\curl\typecheck-gcc.h
|
||||||
|
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
<ActiveTarget name="Debug" />
|
<ActiveTarget name="Debug" />
|
||||||
<File name="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
|
<File name="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
|
||||||
<Cursor>
|
<Cursor>
|
||||||
<Cursor1 position="511" topLine="19" />
|
<Cursor1 position="511" topLine="13" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
</File>
|
</File>
|
||||||
<File name="svg.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
<File name="svg.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||||
<Cursor>
|
<Cursor>
|
||||||
<Cursor1 position="140" topLine="0" />
|
<Cursor1 position="140" topLine="0" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
<Cursor1 position="0" topLine="0" />
|
<Cursor1 position="0" topLine="0" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
</File>
|
</File>
|
||||||
<File name="histogram.cpp" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
<File name="histogram.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||||
<Cursor>
|
<Cursor>
|
||||||
<Cursor1 position="0" topLine="0" />
|
<Cursor1 position="0" topLine="0" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
|
|||||||
32
main.cpp
32
main.cpp
@@ -3,6 +3,7 @@
|
|||||||
#include "histogram.h"
|
#include "histogram.h"
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include "svg.h"
|
#include "svg.h"
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@@ -12,24 +13,37 @@ struct Input {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Input
|
Input
|
||||||
input_data() {
|
input_data(istream& in, bool prompt){
|
||||||
size_t number_count, bin_count;
|
size_t number_count;
|
||||||
cerr << "Enter number count: ";
|
cerr << "Enter number count: ";
|
||||||
cin >> number_count;
|
cin >> number_count;
|
||||||
Input in;
|
Input inp;
|
||||||
in.numbers.resize(number_count);
|
inp.numbers.resize(number_count);
|
||||||
for (size_t i = 0; i < number_count; i++)
|
for (size_t i = 0; i < number_count; i++)
|
||||||
{
|
{
|
||||||
cerr << "Enter Num[" << i << "]: ";
|
cerr << "Enter Num[" << i << "]: ";
|
||||||
cin >> in.numbers[i];
|
cin >> inp.numbers[i];
|
||||||
}
|
}
|
||||||
|
if (prompt) {
|
||||||
cerr << "Enter bin count: ";
|
cerr << "Enter bin count: ";
|
||||||
cin >> in.bin_count;
|
|
||||||
return in;
|
|
||||||
}
|
}
|
||||||
int main()
|
cin >> inp.bin_count;
|
||||||
|
return inp;
|
||||||
|
}
|
||||||
|
int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
auto in = input_data();
|
curl_global_init(CURL_GLOBAL_ALL);
|
||||||
|
if (argc > 1){
|
||||||
|
CURL* curl = curl_easy_init();
|
||||||
|
if(curl) {
|
||||||
|
CURLcode res;
|
||||||
|
curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
|
||||||
|
res = curl_easy_perform(curl);
|
||||||
|
curl_easy_cleanup(curl);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
auto in = input_data(cin, true);;
|
||||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||||
show_histogram_svg(bins);
|
show_histogram_svg(bins);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user