SVG
Этот коммит содержится в:
16
lab01.cbp
16
lab01.cbp
@@ -32,7 +32,23 @@
|
|||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
<Add option="-fexceptions" />
|
<Add option="-fexceptions" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Unit filename=".gitignore" />
|
||||||
|
<Unit filename="histogram.cpp" />
|
||||||
|
<Unit filename="histogram.h">
|
||||||
|
<Option target="<{~None~}>" />
|
||||||
|
</Unit>
|
||||||
|
<Unit filename="histogram_internal.h">
|
||||||
|
<Option target="<{~None~}>" />
|
||||||
|
</Unit>
|
||||||
<Unit filename="main.cpp" />
|
<Unit filename="main.cpp" />
|
||||||
|
<Unit filename="svg.cpp" />
|
||||||
|
<Unit filename="svg.h">
|
||||||
|
<Option target="<{~None~}>" />
|
||||||
|
</Unit>
|
||||||
|
<Unit filename="text.cpp" />
|
||||||
|
<Unit filename="text.h">
|
||||||
|
<Option target="<{~None~}>" />
|
||||||
|
</Unit>
|
||||||
<Extensions>
|
<Extensions>
|
||||||
<lib_finder disable_auto="1" />
|
<lib_finder disable_auto="1" />
|
||||||
</Extensions>
|
</Extensions>
|
||||||
|
|||||||
27
lab01.depend
27
lab01.depend
@@ -3,24 +3,35 @@
|
|||||||
<iostream>
|
<iostream>
|
||||||
<vector>
|
<vector>
|
||||||
|
|
||||||
1693205934 source:c:\users\texas\desktop\lab01\main.cpp
|
1694008250 source:c:\users\texas\desktop\lab01\main.cpp
|
||||||
|
<math.h>
|
||||||
|
<vector>
|
||||||
|
<iostream>
|
||||||
|
<string.h>
|
||||||
"histogram.h"
|
"histogram.h"
|
||||||
"text.h"
|
"text.h"
|
||||||
<iostream>
|
"svg.h"
|
||||||
<vector>
|
|
||||||
<math.h>
|
|
||||||
|
|
||||||
1693204203 c:\users\texas\desktop\lab01\histogram.h
|
1694011777 c:\users\texas\desktop\lab01\histogram.h
|
||||||
<vector>
|
<vector>
|
||||||
|
|
||||||
1693205331 source:c:\users\texas\desktop\lab01\histogram.cpp
|
1693205331 source:c:\users\texas\desktop\lab01\histogram.cpp
|
||||||
"histogram.h"
|
"histogram.h"
|
||||||
|
|
||||||
1693205776 source:c:\users\texas\desktop\lab01\text.cpp
|
1694006571 source:c:\users\texas\desktop\lab01\text.cpp
|
||||||
"histogram.h"
|
"text.h"
|
||||||
<iostream>
|
<math.h>
|
||||||
|
|
||||||
1693209461 c:\users\texas\desktop\lab01\text.h
|
1693209461 c:\users\texas\desktop\lab01\text.h
|
||||||
<vector>
|
<vector>
|
||||||
<iostream>
|
<iostream>
|
||||||
|
|
||||||
|
1694007845 c:\users\texas\desktop\lab01\svg.h
|
||||||
|
<iostream>
|
||||||
|
<vector>
|
||||||
|
<string>
|
||||||
|
|
||||||
|
1694007750 source:c:\users\texas\desktop\lab01\svg.cpp
|
||||||
|
"svg.h"
|
||||||
|
<math.h>
|
||||||
|
|
||||||
|
|||||||
37
lab01.layout
37
lab01.layout
@@ -2,24 +2,19 @@
|
|||||||
<CodeBlocks_layout_file>
|
<CodeBlocks_layout_file>
|
||||||
<FileVersion major="1" minor="0" />
|
<FileVersion major="1" minor="0" />
|
||||||
<ActiveTarget name="Debug" />
|
<ActiveTarget name="Debug" />
|
||||||
<File name="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="8" zoom_2="0">
|
<File name="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="15" zoom_2="0">
|
||||||
<Cursor>
|
<Cursor>
|
||||||
<Cursor1 position="0" topLine="12" />
|
<Cursor1 position="17" topLine="0" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
</File>
|
</File>
|
||||||
<File name="text.cpp" open="1" top="1" tabpos="6" split="0" active="1" splitpos="0" zoom_1="8" zoom_2="0">
|
<File name="svg.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="20" zoom_2="0">
|
||||||
<Cursor>
|
<Cursor>
|
||||||
<Cursor1 position="109" topLine="0" />
|
<Cursor1 position="88" topLine="0" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
</File>
|
</File>
|
||||||
<File name="histogram.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="8" zoom_2="0">
|
<File name="text.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="11" zoom_2="0">
|
||||||
<Cursor>
|
<Cursor>
|
||||||
<Cursor1 position="326" topLine="0" />
|
<Cursor1 position="19" topLine="0" />
|
||||||
</Cursor>
|
|
||||||
</File>
|
|
||||||
<File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="13" zoom_2="0">
|
|
||||||
<Cursor>
|
|
||||||
<Cursor1 position="122" topLine="0" />
|
|
||||||
</Cursor>
|
</Cursor>
|
||||||
</File>
|
</File>
|
||||||
<File name=".gitignore" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
<File name=".gitignore" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||||
@@ -27,4 +22,24 @@
|
|||||||
<Cursor1 position="7" topLine="0" />
|
<Cursor1 position="7" topLine="0" />
|
||||||
</Cursor>
|
</Cursor>
|
||||||
</File>
|
</File>
|
||||||
|
<File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="13" zoom_2="0">
|
||||||
|
<Cursor>
|
||||||
|
<Cursor1 position="69" topLine="0" />
|
||||||
|
</Cursor>
|
||||||
|
</File>
|
||||||
|
<File name="histogram.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="14" zoom_2="0">
|
||||||
|
<Cursor>
|
||||||
|
<Cursor1 position="326" topLine="15" />
|
||||||
|
</Cursor>
|
||||||
|
</File>
|
||||||
|
<File name="histogram.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="16" zoom_2="0">
|
||||||
|
<Cursor>
|
||||||
|
<Cursor1 position="62" topLine="0" />
|
||||||
|
</Cursor>
|
||||||
|
</File>
|
||||||
|
<File name="svg.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="16" zoom_2="0">
|
||||||
|
<Cursor>
|
||||||
|
<Cursor1 position="16" topLine="0" />
|
||||||
|
</Cursor>
|
||||||
|
</File>
|
||||||
</CodeBlocks_layout_file>
|
</CodeBlocks_layout_file>
|
||||||
|
|||||||
14
main.cpp
14
main.cpp
@@ -1,8 +1,13 @@
|
|||||||
|
#include <math.h>
|
||||||
|
#include <vector>
|
||||||
|
#include <iostream>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include "histogram.h"
|
#include "histogram.h"
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include <iostream>
|
#include "svg.h"
|
||||||
#include <vector>
|
|
||||||
#include <math.h>
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
struct Input {
|
struct Input {
|
||||||
@@ -43,7 +48,6 @@ int main()
|
|||||||
|
|
||||||
auto in = input_data();
|
auto in = input_data();
|
||||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||||
show_histogram_text(bins, in.bin_count, in.n);
|
show_histogram_svg(bins);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
59
svg.cpp
Обычный файл
59
svg.cpp
Обычный файл
@@ -0,0 +1,59 @@
|
|||||||
|
#include "svg.h"
|
||||||
|
#include "histogram.h"
|
||||||
|
#include <math.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, string fill){
|
||||||
|
cout << "<rect x='" << x << "' y='" << y << "' width='" << width * 3 << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />";
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
show_histogram_svg(const vector<size_t>& bins) {
|
||||||
|
double max_count;
|
||||||
|
max_count = bins[0];
|
||||||
|
for (double x : bins) {
|
||||||
|
if (x > max_count) {
|
||||||
|
max_count = x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//10 - (bin * 9) / max_count
|
||||||
|
string fill;
|
||||||
|
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;
|
||||||
|
svg_begin(400, 300);
|
||||||
|
double top = 0;
|
||||||
|
for (size_t bin : bins) {
|
||||||
|
const double bin_width = BLOCK_WIDTH * bin;
|
||||||
|
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||||
|
fill = "#" + to_string(int(10 - (bin * 9) / max_count))+ to_string(int(10 - (bin * 9) / max_count))+ to_string(int(10 - (bin * 9) / max_count));
|
||||||
|
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,"red", fill);
|
||||||
|
top += BIN_HEIGHT;
|
||||||
|
}
|
||||||
|
svg_end();
|
||||||
|
}
|
||||||
|
|
||||||
10
svg.h
Обычный файл
10
svg.h
Обычный файл
@@ -0,0 +1,10 @@
|
|||||||
|
#ifndef SVG_H_INCLUDED
|
||||||
|
#define SVG_H_INCLUDED
|
||||||
|
#include <iostream>
|
||||||
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
|
||||||
|
void show_histogram_svg(const std::vector<size_t>& bins);
|
||||||
|
|
||||||
|
#endif // SVG_H_INCLUDED
|
||||||
4
text.cpp
4
text.cpp
@@ -1,6 +1,6 @@
|
|||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include <vector>
|
#include <math.h>
|
||||||
#include <iostream>
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -31,6 +31,12 @@
|
|||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Unit filename="doctest.h">
|
||||||
|
<Option target="<{~None~}>" />
|
||||||
|
</Unit>
|
||||||
|
<Unit filename="histogram.cpp" />
|
||||||
|
<Unit filename="histogram_internal.h" />
|
||||||
|
<Unit filename="unittest.cpp" />
|
||||||
<Extensions>
|
<Extensions>
|
||||||
<lib_finder disable_auto="1" />
|
<lib_finder disable_auto="1" />
|
||||||
</Extensions>
|
</Extensions>
|
||||||
|
|||||||
59
unittest.depend
Обычный файл
59
unittest.depend
Обычный файл
@@ -0,0 +1,59 @@
|
|||||||
|
# depslib dependency file v1.0
|
||||||
|
1693205331 source:c:\users\texas\desktop\lab01\histogram.cpp
|
||||||
|
"histogram.h"
|
||||||
|
|
||||||
|
1693204203 c:\users\texas\desktop\lab01\histogram.h
|
||||||
|
<vector>
|
||||||
|
|
||||||
|
1693241917 source:c:\users\texas\desktop\lab01\unittest.cpp
|
||||||
|
"doctest.h"
|
||||||
|
"histogram_internal.h"
|
||||||
|
|
||||||
|
1693241204 c:\users\texas\desktop\lab01\doctest.h
|
||||||
|
<signal.h>
|
||||||
|
<ciso646>
|
||||||
|
<cstddef>
|
||||||
|
<ostream>
|
||||||
|
<istream>
|
||||||
|
<type_traits>
|
||||||
|
"doctest_fwd.h"
|
||||||
|
<ctime>
|
||||||
|
<cmath>
|
||||||
|
<climits>
|
||||||
|
<math.h>
|
||||||
|
<new>
|
||||||
|
<cstdio>
|
||||||
|
<cstdlib>
|
||||||
|
<cstring>
|
||||||
|
<limits>
|
||||||
|
<utility>
|
||||||
|
<fstream>
|
||||||
|
<sstream>
|
||||||
|
<iostream>
|
||||||
|
<algorithm>
|
||||||
|
<iomanip>
|
||||||
|
<vector>
|
||||||
|
<atomic>
|
||||||
|
<mutex>
|
||||||
|
<set>
|
||||||
|
<map>
|
||||||
|
<unordered_set>
|
||||||
|
<exception>
|
||||||
|
<stdexcept>
|
||||||
|
<csignal>
|
||||||
|
<cfloat>
|
||||||
|
<cctype>
|
||||||
|
<cstdint>
|
||||||
|
<string>
|
||||||
|
<sys/types.h>
|
||||||
|
<unistd.h>
|
||||||
|
<sys/sysctl.h>
|
||||||
|
<AfxWin.h>
|
||||||
|
<windows.h>
|
||||||
|
<io.h>
|
||||||
|
<sys/time.h>
|
||||||
|
<unistd.h>
|
||||||
|
|
||||||
|
1693241001 c:\users\texas\desktop\lab01\histogram_internal.h
|
||||||
|
<vector>
|
||||||
|
|
||||||
10
unittest.layout
Обычный файл
10
unittest.layout
Обычный файл
@@ -0,0 +1,10 @@
|
|||||||
|
<?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="8" zoom_2="0">
|
||||||
|
<Cursor>
|
||||||
|
<Cursor1 position="391" topLine="0" />
|
||||||
|
</Cursor>
|
||||||
|
</File>
|
||||||
|
</CodeBlocks_layout_file>
|
||||||
Ссылка в новой задаче
Block a user