Commit Graph

46 Commits

Author SHA1 Message Date
Brenno
c0c2a82336 Merge branch 'develop' into keyframe-refactor 2021-02-01 14:22:41 -03:00
FeRD (Frank Dana)
3ac7eb86a8 Keyframe: Remove Coordinate ctor unit test 2021-01-29 03:59:34 -05:00
Brenno
3f11361f09 Added support to attach a clip to another clip 2021-01-27 17:41:39 -03:00
Frank Dana
dbaac4debd Merge branch 'develop' into frac-python-types 2021-01-27 03:50:45 -05:00
FeRD (Frank Dana)
2f3615f706 Move Exceptions.h includes to .cpp files 2021-01-26 10:52:04 -05:00
Brenno
a5feadce1e Changed KeyframeBBox to TrackedObjectBBox and added TrackedObjectBase
Added new base class TrackedObjectBase, changed class KeyframeBBox to TrackedObjectBBox and changes it's inheritance from KeyframeBase to TrackedObjectBase.
2021-01-18 14:52:01 -03:00
Brenno
3d5d907c5d Updated Clip.cpp to support GUI to select attached object
Modified Clip.cpp PropertiesJSON function and applied minor fixes to Keyframe_Tests
2021-01-14 15:45:28 -03:00
Brenno
61accdfe95 Merge branch 'opencv' into keyframe-refactor 2021-01-14 15:00:04 -03:00
FeRD (Frank Dana)
c84d77d1d8 Merge branch 'develop' into frac-python-types 2021-01-03 20:52:50 -05:00
Frank Dana
2699e7d1d0 Unit tests: Don't use OpenShot.h header (#607)
- To prevent slow compiles of unit tests, replace all of the
  '#include "OpenShot.h"' invocations with includes of the
  individual headers actually needed by each test file.
2020-12-26 21:51:24 -05:00
FeRD (Frank Dana)
ed77db81d2 Unit tests: Don't use OpenShot.h header
- To prevent slow compiles of unit tests, replace all of the
  '#include "OpenShot.h"' invocations with includes of the
  individual headers actually needed by each test file.

Revert "Unit tests: Don't use OpenShot.h header"

This reverts commit e5cc4f8bf91fc60697996023a86dc618637f6161.

Unit tests: Don't use OpenShot.h header

- To prevent slow compiles of unit tests, replace all of the
  '#include "OpenShot.h"' invocations with includes of the
  individual headers actually needed by each test file.
2020-12-26 06:15:53 -05:00
Brenno
b579ea6499 Added functionality to link a clip to a tracked object (Animations)
- Added KeyframeBase class
- Adjusted the inheritance of KeyframeBase to KeyframeBBox and Keyframe
- Added feature to attach clip to bounding box
- Added support to select tracked object with a dropdown list and removed keyframebbox downcasting
2020-12-22 21:32:36 -03:00
Brenno
4fdd325ea3 Added rotation transform to the tracker bounding-box.
Changed the bounding-box struct point convention to (cx, cy, width, height, angle).
The GetFrame member function from Tracker class now uses the cv::RotatedRect object to represent the bounding-box and draw it on screen.
The JSON and Protobuf communication between the backend and frontend still uses the (x1,y1)(x2,y2) point convention, the backend performs the adequate transformations.
2020-12-14 18:08:44 -03:00
Brenno
60cec478d3 Refactored KeyframeBBox
-Moved the methods that handles protobuf data from Tracker to KeyframeBBox
-Displacement and scale keyframes are now properties of KeyframeBBox
-Changed interface that updates the KeyframeBBox properties.
2020-12-12 20:23:34 -03:00
FeRD (Frank Dana)
deae5b2de2 Keyframe: Replace pair vector w/ CoordinateVector 2020-12-04 12:06:26 -05:00
FeRD (Frank Dana)
d0a625c9f2 Keyframe: Unit tests for new constructors 2020-12-04 11:28:37 -05:00
Brenno
dd9e203695 Added transform handler for Tracker effect
It's now possible to adjust the tracked bounding box from the preview window. Some work is needed to make it generic to the ObjectDetection effect and future effects
2020-11-28 18:09:10 -03:00
Brenno
9113153be8 Added properties to Tracker effects
(still needs some fine-tuning)
2020-11-12 21:35:47 -03:00
Brenno
34aabcc6e2 Removed Excess information from json. 2020-11-12 21:30:11 -03:00
Brenno
1215d042c7 Added scale factor to class to replace OpFPS. 2020-11-12 21:25:27 -03:00
Brenno
5db1c0f453 Initial design of new keyframes specialized classes
The keyframe collections would better integrate with effects that uses bounding boxes, skeletons and facial points.
2020-10-29 00:34:31 -03:00
FeRD (Frank Dana)
fcebbead83 tests: Update include paths 2020-10-18 07:47:36 -04:00
Daniel Jour
89479bb01a Keyframe tests: Add test about large segment, including performance
This new test makes sure that a large segment is handled correctly and
also with reasonable performance.  The timeout of 10ms is still
relatively slow (on a mid-class laptop it takes 0.001ms currently) but
the test shouldn't fail when e.g. the build machine is under (mild to
heavy) load.
2019-12-06 01:35:31 +01:00
Daniel Jour
504fd0e3fa KeyFrame_Tests.cpp: Correct usage for CHECK_EQUAL
It's CHECK_EQUAL(expected, actual), not the other way around!
2019-11-24 21:12:33 +01:00
Daniel Jour
86c1df211a Update Keyframe test curve values; new curves are smoother
The curves generated by the new code are much smoother than the old
curves and align much better with what (at least gnuplot) says are the
"correct curves".  Some values therefore needed updating.
2019-11-24 21:00:37 +01:00