From 07dc050d57d5afde444fb772ebbe11b13f566bcd Mon Sep 17 00:00:00 2001
From: Mederic Fourmy <mederic.fourmy@gmail.com>
Date: Fri, 13 May 2022 17:31:19 +0200
Subject: [PATCH] Remove getTracks() usage
---
include/publisher_vision.h | 2 --
src/publisher_vision.cpp | 26 +-------------------------
2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/include/publisher_vision.h b/include/publisher_vision.h
index 31cd93d..b606ee0 100644
--- a/include/publisher_vision.h
+++ b/include/publisher_vision.h
@@ -126,8 +126,6 @@ class PublisherVisionDebug : public Publisher
/*
Search for the maximum and minimum of features in one track in the track matrix
*/
- std::pair<int,int> minMaxTrackLength(const std::map<SizeStd, Track>& _tracks) const;
-
std::pair<int, int> minMaxAliveTrackLength(const TrackMatrix &_track_matrix, CaptureBasePtr _cap_img) const;
/*
diff --git a/src/publisher_vision.cpp b/src/publisher_vision.cpp
index fe13ff8..3886035 100644
--- a/src/publisher_vision.cpp
+++ b/src/publisher_vision.cpp
@@ -211,27 +211,6 @@ void PublisherVisionDebug::publishDerived()
}
}
-std::pair<int, int> PublisherVisionDebug::minMaxTrackLength(const std::map<SizeStd, Track> &_tracks) const
-{
- int max = -1;
- int min = 10;
-
- for (auto itr = _tracks.begin(); itr != _tracks.end(); ++itr)
- {
- int count = itr->second.size();
-
- if (count > max)
- {
- max = count;
- }
- if (count < min)
- {
- min = count;
- }
- }
- return std::pair<int, int>(min, max);
-}
-
std::pair<int, int> PublisherVisionDebug::minMaxAliveTrackLength(const TrackMatrix &_track_matrix, CaptureBasePtr _cap_img) const
{
@@ -382,10 +361,7 @@ void PublisherVisionDebug::showTracks(cv::Mat _image,
{
std::pair<int, int> min_max_track_length;
- if (tracks_.min_max_on_alive_tracks_)
- min_max_track_length = minMaxAliveTrackLength(_track_matrix, _capture_img);
- else
- min_max_track_length = minMaxTrackLength(_track_matrix.getTracks());
+ min_max_track_length = minMaxAliveTrackLength(_track_matrix, _capture_img);
int min_track_length = min_max_track_length.first;
int max_track_length = min_max_track_length.second;
--
GitLab