From a4fdf7efff8ce121932b16f946d69ad69e849441 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 22 Aug 2015 02:08:26 +0900 Subject: [PATCH] Fixed argument dataset index in examples --- modules/datasets/samples/track_vot.cpp | 10 +++++----- modules/tracking/samples/multiTracker_dataset.cpp | 12 ++++++------ modules/tracking/samples/tracker_dataset.cpp | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/datasets/samples/track_vot.cpp b/modules/datasets/samples/track_vot.cpp index 7b843f28d..67525f21f 100644 --- a/modules/datasets/samples/track_vot.cpp +++ b/modules/datasets/samples/track_vot.cpp @@ -55,15 +55,15 @@ using namespace std; using namespace cv; using namespace cv::datasets; -#define DATASET_ID 1 - int main(int argc, char *argv[]) { const char *keys = "{ help h usage ? | | show this message }" - "{ path p |true| path to folder with dataset }"; + "{ path p |true| path to folder with dataset }" + "{ datasetID id |1| Dataset ID}"; CommandLineParser parser(argc, argv, keys); string path(parser.get("path")); + int datasetID(parser.get("datasetID")); if (parser.has("help") || path == "true") { parser.printMessage(); @@ -77,9 +77,9 @@ int main(int argc, char *argv[]) for (int i = 1; i <= dataset->getDatasetsNum(); i++) printf("\tDataset #%d size: %d\n", i, dataset->getDatasetLength(i)); - dataset->initDataset(DATASET_ID); + dataset->initDataset(datasetID); - for (int i = 0; i < dataset->getDatasetLength(DATASET_ID); i++) + for (int i = 0; i < dataset->getDatasetLength(datasetID); i++) { Mat frame; dataset->getNextFrame(frame); diff --git a/modules/tracking/samples/multiTracker_dataset.cpp b/modules/tracking/samples/multiTracker_dataset.cpp index 3c1cf3aad..9fd2f4bf5 100644 --- a/modules/tracking/samples/multiTracker_dataset.cpp +++ b/modules/tracking/samples/multiTracker_dataset.cpp @@ -65,9 +65,9 @@ Rect2d boundingBox; static const char* keys = { "{@tracker_algorithm | | Tracker algorithm }" -"{@dataset_path |true| Dataset path }" -"{@dataset_id |1| Dataset path }" "{@target_num |1| Number of targets }" +"{@dataset_path |true| Dataset path }" +"{@dataset_id |1| Dataset ID }" }; static void onMouse(int event, int x, int y, int, void*) @@ -119,7 +119,7 @@ static void help() "TLD dataset ID: 1~10, VOT2015 dataset ID: 1~60\n" "-- pause video [p] and draw a bounding boxes around the targets to start the tracker\n" "Example:\n" - "./example_tracking_multiTracker_dataset \n" + "./example_tracking_multiTracker_dataset \n" << endl; cout << "\n\nHot keys: \n" @@ -131,9 +131,9 @@ int main(int argc, char *argv[]) { CommandLineParser parser(argc, argv, keys); string tracker_algorithm = parser.get(0); - string datasetRootPath = parser.get(1); - int datasetID = parser.get(2); - targetsNum = parser.get(3); + targetsNum = parser.get(1); + string datasetRootPath = parser.get(2); + int datasetID = parser.get(3); if (tracker_algorithm.empty() || datasetRootPath.empty() || targetsNum < 1) { help(); diff --git a/modules/tracking/samples/tracker_dataset.cpp b/modules/tracking/samples/tracker_dataset.cpp index 27f8a5dd5..ffae624a8 100644 --- a/modules/tracking/samples/tracker_dataset.cpp +++ b/modules/tracking/samples/tracker_dataset.cpp @@ -65,7 +65,7 @@ static bool startSelection = false; static const char* keys = { "{@tracker_algorithm | | Tracker algorithm }" "{@dataset_path |true| Dataset path }" -"{@dataset_id |1| Dataset path }" +"{@dataset_id |1| Dataset ID }" }; static void onMouse(int event, int x, int y, int, void*)