Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Python] Yolo example + VS feature Inheritance #1413

Merged
merged 12 commits into from
Jun 11, 2024
Merged

[Python] Yolo example + VS feature Inheritance #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e2857cd
Add publicists in python generator to expose protected members to Python
SamFlt May 13, 2024
43fc280
Inheritance for BasicFeature
SamFlt May 13, 2024
d4aa8a4
Finish centering task example
SamFlt May 14, 2024
dcfbd46
Update example with model warmup to fix high velocity at first iteration
SamFlt May 14, 2024
1dc7513
Add generic display getter function
SamFlt May 14, 2024
736c24a
Fix image rendering in yolo example
SamFlt May 14, 2024
6f5ee3b
Show python specific api in documentation
SamFlt May 15, 2024
f763ccf
generate subclasses
SamFlt May 15, 2024
dcd2136
Small corrections for Yolo example
SamFlt May 23, 2024
b462734
Fix box indexing when multiple classes are found in the image
SamFlt May 31, 2024
dac3e29
Yolo centering task on afma6
SamFlt Jun 3, 2024
4dea2d9
Update copyright header
fspindle Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/python/bindings/include/blob.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
* Copyright (C) 2005 - 2024 by Inria. All rights reserved.
*
* This software is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -50,7 +50,7 @@ void bindings_vpDot2(py::class_<vpDot2, std::shared_ptr<vpDot2>, vpTracker> &pyD
vpImage<unsigned char> &I,
vpColor col = vpColor::blue,
bool trackDot = true) {
return vpDot2::defineDots(&dots[0], dots.size(), dotFile, I, col, trackDot);
return vpDot2::defineDots(&dots[0], dots.size(), dotFile, I, col, trackDot);
}, R"doc(
Wrapper for the defineDots method, see the C++ ViSP documentation.
)doc", py::arg("dots"), py::arg("dotFile"), py::arg("I"), py::arg("color"), py::arg("trackDot") = true);
Expand All @@ -59,8 +59,8 @@ Wrapper for the defineDots method, see the C++ ViSP documentation.
vpImage<unsigned char> &I,
std::vector<vpImagePoint> &cogs,
std::optional<std::vector<vpImagePoint>> cogStar) {
vpImagePoint *desireds = cogStar ? &((*cogStar)[0]) : nullptr;
vpDot2::trackAndDisplay(&dots[0], dots.size(), I, cogs, desireds);
vpImagePoint *desireds = cogStar ? &((*cogStar)[0]) : nullptr;
vpDot2::trackAndDisplay(&dots[0], dots.size(), I, cogs, desireds);
}, R"doc(
Wrapper for the trackAndDisplay method, see the C++ ViSP documentation.
)doc", py::arg("dots"), py::arg("I"), py::arg("cogs"), py::arg("desiredCogs"));
Expand Down
2 changes: 1 addition & 1 deletion modules/python/bindings/include/core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
* Copyright (C) 2005 - 2024 by Inria. All rights reserved.
*
* This software is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
16 changes: 8 additions & 8 deletions modules/python/bindings/include/core/arrays.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
* Copyright (C) 2005 - 2024 by Inria. All rights reserved.
*
* This software is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -232,7 +232,7 @@ void bindings_vpArray2D(py::class_<vpArray2D<T>, std::shared_ptr<vpArray2D<T>>>
vpArray2D<T> result(shape[0], shape[1]);
copy_data_from_np(np_array, result.data);
return result;
}), R"doc(
}), R"doc(
Construct a 2D ViSP array by **copying** a 2D numpy array.

:param np_array: The numpy array to copy.
Expand All @@ -256,7 +256,7 @@ void bindings_vpMatrix(py::class_<vpMatrix, std::shared_ptr<vpMatrix>, vpArray2D
vpMatrix result(shape[0], shape[1]);
copy_data_from_np(np_array, result.data);
return result;
}), R"doc(
}), R"doc(
Construct a matrix by **copying** a 2D numpy array.

:param np_array: The numpy array to copy.
Expand Down Expand Up @@ -288,7 +288,7 @@ void bindings_vpRotationMatrix(py::class_<vpRotationMatrix, std::shared_ptr<vpRo
throw std::runtime_error("Input numpy array is not a valid rotation matrix");
}
return result;
}), R"doc(
}), R"doc(
Construct a rotation matrix by **copying** a 2D numpy array.
This numpy array should be of dimensions :math:`3 \times 3` and be a valid rotation matrix.
If it is not a rotation matrix, an exception will be raised.
Expand All @@ -315,7 +315,7 @@ void bindings_vpHomogeneousMatrix(py::class_<vpHomogeneousMatrix, std::shared_pt
throw std::runtime_error("Input numpy array is not a valid homogeneous matrix");
}
return result;
}), R"doc(
}), R"doc(
Construct a homogeneous matrix by **copying** a 2D numpy array.
This numpy array should be of dimensions :math:`4 \times 4` and be a valid homogeneous matrix.
If it is not a homogeneous matrix, an exception will be raised.
Expand Down Expand Up @@ -343,7 +343,7 @@ void bindings_vpTranslationVector(py::class_<vpTranslationVector, std::shared_pt
vpTranslationVector result;
copy_data_from_np(np_array, result.data);
return result;
}), R"doc(
}), R"doc(
Construct a Translation vector by **copying** a 1D numpy array of size 3.

:param np_array: The numpy 1D array to copy.
Expand All @@ -367,7 +367,7 @@ void bindings_vpColVector(py::class_<vpColVector, std::shared_ptr<vpColVector>,
vpColVector result(shape[0]);
copy_data_from_np(np_array, result.data);
return result;
}), R"doc(
}), R"doc(
Construct a column vector by **copying** a 1D numpy array.

:param np_array: The numpy 1D array to copy.
Expand All @@ -394,7 +394,7 @@ void bindings_vpRowVector(py::class_<vpRowVector, std::shared_ptr<vpRowVector>,
vpRowVector result(shape[0]);
copy_data_from_np(np_array, result.data);
return result;
}), R"doc(
}), R"doc(
Construct a row vector by **copying** a 1D numpy array.

:param np_array: The numpy 1D array to copy.
Expand Down
Loading
Loading