diff --git a/lab_3.xcodeproj/project.pbxproj b/lab_3.xcodeproj/project.pbxproj index cd50b2f..881468f 100644 --- a/lab_3.xcodeproj/project.pbxproj +++ b/lab_3.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 35EA3A982A2D54F400ED69F1 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35EA3A972A2D54F400ED69F1 /* main.cpp */; }; 35EA3AA02A2D58E700ED69F1 /* histogram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35EA3A9E2A2D58E700ED69F1 /* histogram.cpp */; }; 35EA3AA32A2D591600ED69F1 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35EA3AA12A2D591600ED69F1 /* text.cpp */; }; + 35EA3ADA2A2D6B2100ED69F1 /* svg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35EA3AD82A2D6B2100ED69F1 /* svg.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,6 +33,8 @@ 35EA3AA12A2D591600ED69F1 /* text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = ""; }; 35EA3AA22A2D591600ED69F1 /* text.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = text.hpp; sourceTree = ""; }; 35EA3AA92A2D5D8400ED69F1 /* histogram_internal.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = histogram_internal.hpp; sourceTree = ""; }; + 35EA3AD82A2D6B2100ED69F1 /* svg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = svg.cpp; sourceTree = ""; }; + 35EA3AD92A2D6B2100ED69F1 /* svg.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = svg.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +52,8 @@ isa = PBXGroup; children = ( 35EA3A972A2D54F400ED69F1 /* main.cpp */, + 35EA3AD82A2D6B2100ED69F1 /* svg.cpp */, + 35EA3AD92A2D6B2100ED69F1 /* svg.hpp */, 35EA3AA12A2D591600ED69F1 /* text.cpp */, 35EA3AA22A2D591600ED69F1 /* text.hpp */, 35EA3A9E2A2D58E700ED69F1 /* histogram.cpp */, @@ -123,6 +128,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 35EA3ADA2A2D6B2100ED69F1 /* svg.cpp in Sources */, 35EA3AA02A2D58E700ED69F1 /* histogram.cpp in Sources */, 35EA3A982A2D54F400ED69F1 /* main.cpp in Sources */, 35EA3AA32A2D591600ED69F1 /* text.cpp in Sources */, diff --git a/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate b/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate index 9e907e1..91dde2c 100644 Binary files a/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate and b/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/lab_3.xcodeproj/xcuserdata/lesaminov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/lab_3.xcodeproj/xcuserdata/lesaminov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..83c740a --- /dev/null +++ b/lab_3.xcodeproj/xcuserdata/lesaminov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,6 @@ + + + diff --git a/main.cpp b/main.cpp index 742aae6..15e45ed 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,7 @@ #include #include "histogram.hpp" #include "text.hpp" +#include "svg.hpp" using namespace std; @@ -15,7 +16,7 @@ struct Input Input input_data() { size_t number_count; - cerr << "Enter number count: "; + cout << "Enter number count: "; cin >> number_count; // Кол-во чисел Input in; in.numbers.resize(number_count); @@ -23,7 +24,7 @@ Input input_data() { cin >> in.numbers[i]; } - cerr << "Enter bin count: "; + cout << "Enter bin count: "; cin >> in.bin_count; return in; } @@ -32,6 +33,6 @@ int main() { auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count); + show_histogram_svg(bins); return 0; } diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..9761ad3 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,76 @@ +#include +#include +#include +#include +#include "svg.hpp" +using namespace std; + +void +svg_begin(double width, double height) +{ + cout << "\n"; + cout << "\n"; +} + +void +svg_end() +{ + cout << "\n"; +} + +void +svg_text(double left, double baseline, string text) +{ + cout << "" << text << ""; +} + +void +svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") +{ + cout << "& 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 BOARD_COLOR = "black"; + const auto FILL_COLOR = "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 "; + top += BIN_HEIGHT; + } + + svg_end(); + } diff --git a/svg.hpp b/svg.hpp new file mode 100644 index 0000000..91d53ba --- /dev/null +++ b/svg.hpp @@ -0,0 +1,9 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED +#include + +void +show_histogram_svg(const std::vector& bins); + + +#endif // SVG_H_INCLUDED diff --git a/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate b/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate index 4b81c84..11cf15a 100644 Binary files a/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate and b/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate differ