добавил svg файлы и изменил main

master
Platon (MiachinPY) 3 месяцев назад
Родитель cd8f26c9fe
Сommit 3145fd865b

@ -32,18 +32,18 @@
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
</Compiler> </Compiler>
<Unit filename="doctest.h" />
<Unit filename="histogram.cpp" /> <Unit filename="histogram.cpp" />
<Unit filename="histogram.h" /> <Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="historgam.cpp" />
<Unit filename="lab01.cbp" /> <Unit filename="lab01.cbp" />
<Unit filename="lab01.depend" /> <Unit filename="lab01.depend" />
<Unit filename="lab01.layout" /> <Unit filename="lab01.layout" />
<Unit filename="main.cpp" /> <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.cpp" />
<Unit filename="text.h" /> <Unit filename="text.h" />
<Unit filename="unittest.cpp" />
<Extensions /> <Extensions />
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>

@ -1,9 +1,10 @@
# depslib dependency file v1.0 # depslib dependency file v1.0
1745609797 source:c:\users\ïëàòîí\desktop\project\lab01\main.cpp 1746094194 source:c:\users\ïëàòîí\desktop\project\lab01\main.cpp
<iostream> <iostream>
<vector> <vector>
"histogram.h" "histogram.h"
"text.h" "text.h"
"svg.h"
1745611606 source:c:\users\ïëàòîí\desktop\project\lab01\historgam.cpp 1745611606 source:c:\users\ïëàòîí\desktop\project\lab01\historgam.cpp
<iostream> <iostream>
@ -78,3 +79,14 @@
<vector> <vector>
"histogram.h" "histogram.h"
1746094194 c:\users\ïëàòîí\desktop\project\lab01\svg.h
<vector>
1746094194 source:c:\users\ïëàòîí\desktop\project\lab01\svg.cpp
<math.h>
<iostream>
<conio.h>
<vector>
<string>
"svg.h"

@ -2,12 +2,22 @@
<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="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> <Cursor>
<Cursor1 position="795" topLine="2" /> <Cursor1 position="511" topLine="19" />
</Cursor> </Cursor>
</File> </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="0" tabpos="4" 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="0" 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>

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h"
using namespace std; using namespace std;
@ -22,7 +23,6 @@ input_data() {
cerr << "Enter Num[" << i << "]: "; cerr << "Enter Num[" << i << "]: ";
cin >> in.numbers[i]; cin >> in.numbers[i];
} }
cerr << "Enter bin count: "; cin >> bin_count;
cerr << "Enter bin count: "; cerr << "Enter bin count: ";
cin >> in.bin_count; cin >> in.bin_count;
return in; return in;
@ -31,7 +31,7 @@ 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); show_histogram_svg(bins);
return 0; return 0;
} }

@ -31,6 +31,10 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
</Compiler> </Compiler>
<Unit filename="doctest.h" />
<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>

@ -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>
Загрузка…
Отмена
Сохранить