Commit Graph

30 Commits

Author SHA1 Message Date
Brenno
d24c2e451c Added support to insert the image of a clip inside a Tracked Object 2021-02-04 15:45:33 -03:00
Brenno
2e47325c8f Added support to set the visibility of a Tracked Object
Added the property "Keyframe visible"  to TrackedObjectBase, so the user can set the Tracked Object to be visible or invisible  along the chosen frames.
2021-02-04 15:09:13 -03:00
Brenno
c0c2a82336 Merge branch 'develop' into keyframe-refactor 2021-02-01 14:22:41 -03:00
FeRD (Frank Dana)
be16403078 Add Exceptions.h include to new effects 2021-01-28 20:15:25 -05:00
Brenno
a94f09d105 ObjectDetection: updated object selection and transform handler
Removed the necessity to append the detected object index (related to the frame) to the effect JSON - which makes the JSON smaller and the performance better.
2021-01-27 17:18:23 -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
5eb9f60eea Added support to update the detected bounding-boxes keyframes
Added support to show transform handlers for the bounding-boxes (Tracked Objects) detected by the Object Detection effect and update their Keyframes.
2021-01-22 19:47:36 -03:00
Brenno
17463313fc Clip.cpp: Removed hard-coded Tracker effect check in AddEffect function
Added "has_tracked_object" property on EffectBase so that the AddEffect function checks for this property instead of the Tracker effect name - this way it's possible to support other effects that have tracked objects but different names.
2021-01-22 19:00:44 -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
61accdfe95 Merge branch 'opencv' into keyframe-refactor 2021-01-14 15:00:04 -03:00
Brenno
f6de53350f Minor fixes
- Moved TimeUtil from header to src
- Fixed issue with Qimage -> Mat conversion
2021-01-13 20:22:17 -03:00
FeRD (Frank Dana)
da02180c79 Rename protobuf packages to pb_foo 2021-01-13 13:36:15 -05:00
FeRD (Frank Dana)
d71631a6c7 OpenCV: Move 'using ns std', scrub whitespace 2021-01-13 12:08:39 -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
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
940840c904 Solved FPS bug. 2020-11-12 21:33:53 -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
a9274df96b Resolving conflicts 2020-10-20 01:04:59 -03:00
Brenno
483f2883c9 Added normalized bboxes for tracker and object detector
Also added tests for ObjectDetection and several bug fixes
2020-07-28 21:01:57 -03:00
Brenno
1a598b16df Added CVObjectDetection and ObjectDetection effect
Also included kalman filter functions and code for tracking the output boxes from DNN model
2020-07-26 16:19:55 -03:00
Brenno
6d6c156415 Tracker Effect minor fixes 2020-07-22 10:00:40 -03:00