Добавлен curl_easy_init

.gitignore

@@ -1,2 +1,3 @@
 /bin
 /obj
+/curl

lab01.cbp

@@ -32,18 +32,18 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="doctest.h" />
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h" />
-		<Unit filename="histogram_internal.h" />
-		<Unit filename="historgam.cpp" />
 		<Unit filename="lab01.cbp" />
 		<Unit filename="lab01.depend" />
 		<Unit filename="lab01.layout" />
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h" />
-		<Unit filename="unittest.cpp" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>

lab01.depend

@@ -1,9 +1,10 @@
 # depslib dependency file v1.0
-1745609797 source:c:\users\ïëàòîí\desktop\project\lab01\main.cpp
+1746094194 source:c:\users\ïëàòîí\desktop\project\lab01\main.cpp
 	<iostream>
 	<vector>
 	"histogram.h"
 	"text.h"
+	"svg.h"
 
 1745611606 source:c:\users\ïëàòîí\desktop\project\lab01\historgam.cpp
 	<iostream>
@@ -73,8 +74,107 @@
 1745611606 c:\users\ïëàòîí\desktop\project\lab01\histogram_internal.h
 	<vector>
 
-1746093073 source:c:\users\ïëàòîí\desktop\project\lab01\histogram.cpp
+1747659893 source:c:\users\ïëàòîí\desktop\project\lab01\histogram.cpp
 	<iostream>
 	<vector>
 	"histogram.h"
 
+1747659893 c:\users\ïëàòîí\desktop\project\lab01\svg.h
+	<vector>
+
+1747659893 source:c:\users\ïëàòîí\desktop\project\lab01\svg.cpp
+	<math.h>
+	<iostream>
+	<conio.h>
+	<vector>
+	<string>
+	"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
+

lab01.layout

@@ -2,12 +2,22 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="main.cpp" open="1" top="1" tabpos="1" 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>
-			<Cursor1 position="795" topLine="2" />
+			<Cursor1 position="511" topLine="13" />
 		</Cursor>
 	</File>
-	<File name="histogram.cpp" open="1" top="0" tabpos="2" 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>
+			<Cursor1 position="140" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.h" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="0" topLine="0" />
 		</Cursor>

main.cpp

@@ -2,6 +2,8 @@
 #include <vector>
 #include "histogram.h"
 #include "text.h"
+#include "svg.h"
+#include <curl/curl.h>
 
 using namespace std;
 
@@ -11,27 +13,39 @@ struct Input {
 };
 
 Input
-input_data() {
+input_data(istream& in, bool prompt){
-    size_t number_count, bin_count;
+    size_t number_count;
 	cerr << "Enter 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++)
     {
         cerr << "Enter Num[" << i << "]: ";
-        cin >> in.numbers[i];
+        cin >> inp.numbers[i];
     }
-    cerr << "Enter bin count: "; cin >> bin_count;
+    if (prompt) {
-    cerr << "Enter bin count: ";
+        cerr << "Enter bin count: ";
-    cin >> in.bin_count;
+    }
-    return in;
+    cin >> inp.bin_count;
+    return inp;
 }
-int main()
+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);
-    show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins);
 
     return 0;
 }

svg.cpp

@@ -0,0 +1,81 @@
+#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)
+{
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' ";
+    cout << "height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height << "' ";
+    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end()
+{
+    cout << "</svg>\n";
+}
+
+void
+svg_text(double left, double baseline, string text)
+{
+    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
+}
+
+void
+svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black")
+{
+    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke='"<<stroke<<"' fill='"<<fill<<"' />";
+
+}
+
+
+
+void
+show_histogram_svg(const vector<size_t>& bins)
+{
+    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 BLACK = "black";
+    const auto RED = "red";
+    const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
+
+
+    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
+
+    double top = 0;
+    double max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++)
+    {
+        if (max_count<bins[i])
+        {
+            max_count=bins[i];
+        }
+    }
+
+    for (size_t bin : bins)
+    {
+        double bin_width = (MAX_WIDTH)*(bin/max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, RED);
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}
+
+
+

svg.h

@@ -0,0 +1,9 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+#include <vector>
+
+void
+show_histogram_svg(const std::vector<size_t>& bins);
+
+
+#endif // SVG_H_INCLUDED

unittest.cbp

@@ -31,6 +31,10 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

unittest.layout

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="unittest.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="227" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="210" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>