Commit Graph

277 Commits

Author SHA1 Message Date
Brenno
3f11361f09 Added support to attach a clip to another clip 2021-01-27 17:41:39 -03:00
Brenno
d6e0acb0cb ObjectDetection: show object's icons and transform handlers per frame
Only show the tracked object's icon (on the mini-GUI to attach a clip to it) and transform handler if the object appears on the screen (i.e. it has data for the requested frame)
2021-01-22 20:03:05 -03: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)
f21cf35d36 Remove OpenShot.h from OpenCV unit tests 2020-12-26 06:15:53 -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
FeRD (Frank Dana)
5cfe52b9f7 CMake: Add ENABLE_OPENCV option, use targets 2020-12-24 10:07:08 -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
e48405da9b Merge remote-tracking branch 'origin/develop' into keyframe-refactor 2020-12-17 22:36:41 -03:00
Brenno
5b5763eebb Merge remote-tracking branch 'origin/develop' into opencv 2020-12-17 22:19:10 -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
Frank Dana
ed5b2e2ae2 Switch to Github Actions for CI builds (#599)
* Use Github Actions for CI
* Incorporate coverage into os_test target
* CMake: Make 'test' an alias for 'os_test'
* Coverage in all clang builds
2020-12-12 08:36:59 -05:00
Frank Dana
e8b4dde32e Timeline::GetClip: Add anti-slicing unit tests (#596) 2020-12-04 09:25:30 -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
FeRD (Frank Dana)
2f6d88e168 various Readers: Fix GetCache return type
Tests: fix ImageWriter cache type
2020-11-27 03:28:03 -05: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
a4f4561d0a Merge branch 'opencv' into keyframe-refactor 2020-11-09 21:48:53 -03:00
Brenno
2d181430e7 Applied code review suggestions 2020-11-05 22:05:34 -03:00
Brenno
111883e23e Applied code review suggestions 2020-11-05 12:27:11 -03:00
Brenno
2bd6bd4456 Improved error handling for effect pre-processing 2020-11-05 11:17:03 -03:00
FeRD (Frank Dana)
6b4ed3a2b8 Color_Tests: Remove commented code, be const 2020-11-04 07:08:08 -05:00