Skip to content
Snippets Groups Projects

Resolve "TrackMatrix API"

Merged Joan Solà Ortega requested to merge 453-trackmatrix-api into devel
3 files
+ 83
38
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -45,8 +45,8 @@ using std::list;
@@ -45,8 +45,8 @@ using std::list;
using std::pair;
using std::pair;
using std::shared_ptr;
using std::shared_ptr;
typedef map<TimeStamp, FeatureBasePtr> Track;
typedef map<TimeStamp, FeatureBasePtr> Track;
typedef map<TimeStamp, FeatureBaseConstPtr> TrackConst;
typedef map<TimeStamp, FeatureBaseConstPtr> TrackConst;
typedef map<SizeStd, FeatureBasePtr > Snapshot;
typedef map<SizeStd, FeatureBasePtr > Snapshot;
typedef map<SizeStd, FeatureBaseConstPtr > SnapshotConst;
typedef map<SizeStd, FeatureBaseConstPtr > SnapshotConst;
typedef map<SizeStd, pair<FeatureBasePtr, FeatureBasePtr> > TrackMatches; // matched feature pairs indexed by track_id
typedef map<SizeStd, pair<FeatureBasePtr, FeatureBasePtr> > TrackMatches; // matched feature pairs indexed by track_id
@@ -102,41 +102,40 @@ class TrackMatrix
@@ -102,41 +102,40 @@ class TrackMatrix
TrackMatrix();
TrackMatrix();
virtual ~TrackMatrix();
virtual ~TrackMatrix();
void newTrack (FeatureBasePtr _ftr);
void newTrack (FeatureBasePtr _ftr);
void add (const SizeStd& _track_id, const FeatureBasePtr& _ftr);
void add (const SizeStd& _track_id, const FeatureBasePtr& _ftr);
void add (const FeatureBasePtr& _ftr_existing, const FeatureBasePtr& _ftr_new);
void add (const FeatureBasePtr& _ftr_existing, const FeatureBasePtr& _ftr_new);
void remove (FeatureBasePtr _ftr);
void remove (FeatureBasePtr _ftr);
void remove (const SizeStd& _track_id);
void remove (const SizeStd& _track_id);
void remove (CaptureBasePtr _cap);
void remove (CaptureBasePtr _cap);
SizeStd numTracks () const;
SizeStd trackSize (const SizeStd& _track_id) const;
SizeStd numTracks () const;
TrackConst track (const SizeStd& _track_id) const;
SizeStd trackSize (const SizeStd& _track_id) const;
Track track (const SizeStd& _track_id);
TrackConst track (const SizeStd& _track_id) const;
SnapshotConst snapshot (CaptureBaseConstPtr _capture) const;
Track track (const SizeStd& _track_id);
Snapshot snapshot (CaptureBasePtr _capture);
SnapshotConst snapshot (CaptureBaseConstPtr _capture) const;
 
Snapshot snapshot (CaptureBasePtr _capture);
vector<FeatureBaseConstPtr> trackAsVector(const SizeStd& _track_id) const;
vector<FeatureBaseConstPtr> trackAsVector(const SizeStd& _track_id) const;
vector<FeatureBasePtr> trackAsVector(const SizeStd& _track_id);
vector<FeatureBasePtr> trackAsVector(const SizeStd& _track_id);
FeatureBaseConstPtrList snapshotAsList(CaptureBaseConstPtr _cap) const;
FeatureBaseConstPtrList snapshotAsList(CaptureBaseConstPtr _cap) const;
FeatureBasePtrList snapshotAsList(CaptureBasePtr _cap);
FeatureBasePtrList snapshotAsList(CaptureBasePtr _cap);
TrackMatchesConst matches (CaptureBaseConstPtr _cap_1, CaptureBaseConstPtr _cap_2) const;
TrackMatchesConst matches (CaptureBaseConstPtr _cap_1, CaptureBaseConstPtr _cap_2) const;
TrackMatches matches (CaptureBasePtr _cap_1, CaptureBasePtr _cap_2);
TrackMatches matches (CaptureBasePtr _cap_1, CaptureBasePtr _cap_2);
FeatureBaseConstPtr firstFeature(const SizeStd& _track_id) const;
FeatureBasePtr firstFeature(const SizeStd& _track_id);
FeatureBaseConstPtr firstFeature(const SizeStd& _track_id) const;
FeatureBaseConstPtr lastFeature (const SizeStd& _track_id) const;
FeatureBasePtr firstFeature(const SizeStd& _track_id);
FeatureBasePtr lastFeature (const SizeStd& _track_id);
FeatureBaseConstPtr lastFeature (const SizeStd& _track_id) const;
FeatureBaseConstPtr feature (const SizeStd& _track_id, CaptureBaseConstPtr _cap) const;
FeatureBasePtr lastFeature (const SizeStd& _track_id);
FeatureBasePtr feature (const SizeStd& _track_id, CaptureBasePtr _cap);
FeatureBaseConstPtr feature (const SizeStd& _track_id, CaptureBaseConstPtr _cap) const;
CaptureBaseConstPtr firstCapture(const SizeStd& _track_id) const;
FeatureBasePtr feature (const SizeStd& _track_id, CaptureBasePtr _cap);
CaptureBasePtr firstCapture(const SizeStd& _track_id);
CaptureBaseConstPtr firstCapture(const SizeStd& _track_id) const;
CaptureBasePtr firstCapture(const SizeStd& _track_id);
list<SizeStd> trackIds() const;
 
list<SizeStd> trackIds(CaptureBaseConstPtr _capture = nullptr) const;
// tracks across captures that belong to keyframe
// tracks across captures that belong to keyframe
TrackConst trackAtKeyframes(const SizeStd& _track_id) const;
TrackConst trackAtKeyframes(const SizeStd& _track_id) const;
Track trackAtKeyframes(const SizeStd& _track_id);
Track trackAtKeyframes(const SizeStd& _track_id);
const map<SizeStd, Track>& getTracks() {return tracks_;}
const map<CaptureBasePtr, Snapshot >& getSnapshots() {return snapshots_;}
private:
private:
Loading