openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Keyframe: Replace pair vector w/ CoordinateVector

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2020-12-04 12:06:26 -05:00
parent b280fbd082
commit deae5b2de2
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/KeyFrame.cpp
View File

@@ -129,9 +129,9 @@ Keyframe::Keyframe(double value) {
Keyframe::Keyframe(const std::vector<Point>& points) : Points(points) {};
// Constructor which takes a vector of std::pair tuples (and adds them all)
Keyframe::Keyframe(const std::vector<std::pair<double, double>>& coordinates) {
for (const auto& pair : coordinates) {
AddPoint(Point(pair.first, pair.second));
Keyframe::Keyframe(const std::vector<Coordinate>& coordinates) {
for (const auto& co : coordinates) {
AddPoint(Point(co));
}
}

6
src/KeyFrame.h
View File

@@ -61,6 +61,8 @@ namespace openshot {
std::vector<Point> Points; ///< Vector of all Points
public:
using CoordinateVector = std::vector<Coordinate>;
using PointsVector = std::vector<Point>;
/// Default constructor for the Keyframe class
Keyframe() = default;
@@ -69,10 +71,10 @@ namespace openshot {
Keyframe(double value);
/// Constructor which adds a supplied vector of Points
Keyframe(const std::vector<Point>& points);
Keyframe(const PointsVector& points);
/// Constructor which takes a vector of std::pair tuples
Keyframe(const std::vector<std::pair<double, double>>& coordinates);
Keyframe(const CoordinateVector& coordinates);
/// Add a new point on the key-frame. Each point has a primary coordinate, a left handle, and a right handle.
void AddPoint(Point p);

6
tests/KeyFrame_Tests.cpp
View File

@@ -506,10 +506,10 @@ TEST(Point_Vector_Constructor)
CHECK_CLOSE(30.0f, k1.GetValue(10), 0.0001);
}
TEST(Pair_Vector_Constructor)
TEST(Coordinate_Vector_Constructor)
{
std::vector<std::pair<double,double>> coordinates{
{1, 100}, {10, 500}, {1000, 80000}
std::vector<Coordinate> coordinates{
Coordinate(1, 100), Coordinate(10, 500), Coordinate(1000, 80000)
};
Keyframe k1(coordinates);