From 94992117a9800019ac7e22f75fcfbe615d6c4e99 Mon Sep 17 00:00:00 2001 From: Brenno Date: Thu, 8 Apr 2021 22:07:03 -0300 Subject: [PATCH] Added default class colors --- src/TrackedObjectBBox.cpp | 7 +++++++ src/TrackedObjectBBox.h | 1 + src/effects/ObjectDetection.cpp | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/TrackedObjectBBox.cpp b/src/TrackedObjectBBox.cpp index 2099e509a..f4288876e 100644 --- a/src/TrackedObjectBBox.cpp +++ b/src/TrackedObjectBBox.cpp @@ -48,6 +48,13 @@ TrackedObjectBBox::TrackedObjectBBox() : delta_x(0.0), delta_y(0.0), scale_x(1.0 return; } +TrackedObjectBBox::TrackedObjectBBox(int Red, int Green, int Blue, int Alfa) : delta_x(0.0), delta_y(0.0), scale_x(1.0), scale_y(1.0), rotation(0.0), + stroke_width(2) , background_alpha(1.0), stroke_alpha(0.0), background_corner(0), + stroke(Red,Green,Blue,Alfa), background(0,0,255,0) +{ + this->TimeScale = 1.0; + return; +} // Add a BBox to the BoxVec map void TrackedObjectBBox::AddBox(int64_t _frame_num, float _cx, float _cy, float _width, float _height, float _angle) diff --git a/src/TrackedObjectBBox.h b/src/TrackedObjectBBox.h index d6a0d2d79..e50f3cf8b 100644 --- a/src/TrackedObjectBBox.h +++ b/src/TrackedObjectBBox.h @@ -179,6 +179,7 @@ namespace openshot /// Default Constructor TrackedObjectBBox(); + TrackedObjectBBox(int Red, int Green, int Blue, int Alfa); /// Add a BBox to the BoxVec map void AddBox(int64_t _frame_num, float _cx, float _cy, float _width, float _height, float _angle) override; diff --git a/src/effects/ObjectDetection.cpp b/src/effects/ObjectDetection.cpp index 215d493e5..48c996151 100644 --- a/src/effects/ObjectDetection.cpp +++ b/src/effects/ObjectDetection.cpp @@ -281,7 +281,7 @@ bool ObjectDetection::LoadObjDetectdData(std::string inputFilePath){ else { // There is no tracked object with that id, so insert a new one - TrackedObjectBBox trackedObj; + TrackedObjectBBox trackedObj((int)classesColor[classId](0), (int)classesColor[classId](1), (int)classesColor[classId](2), (int)0); trackedObj.AddBox(id, x+(w/2), y+(h/2), w, h, 0.0); std::shared_ptr trackedObjPtr = std::make_shared(trackedObj); trackedObjects.insert({objectId, trackedObjPtr});