Skip to content

Commit

Permalink
Merge pull request #280 from zivid/MISC-2024-07-05-bump-to-sdk-2.13.1
Browse files Browse the repository at this point in the history
Bump to Zivid SDK 2.13.1
  • Loading branch information
johningve authored Jul 5, 2024
2 parents a2ae070 + 8580ea0 commit 106f36a
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Zivid Python is the official Python package for Zivid 3D cameras. Read more abou
### Dependencies

* [Python](https://www.python.org/) version 3.7 or higher
* [Zivid SDK][zivid-download-software-url] version 2.13.0 (see [here][zivid-software-installation-url] for help)
* [Zivid SDK][zivid-download-software-url] version 2.13.1 (see [here][zivid-software-installation-url] for help)
* [Compiler](doc/CompilerInstallation.md) with C++17 support

*Ubuntu users must install Python headers (`apt install python3-dev`) in addition to the regular `python3` package.*
Expand Down
2 changes: 1 addition & 1 deletion continuous-integration/deployment/expected-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.13.0.2.13.0
2.13.1.2.13.1
2 changes: 1 addition & 1 deletion continuous-integration/versions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ZIVID_SDK_EXACT_VERSION": "2.13.0+99a4ce9e-1"
"ZIVID_SDK_EXACT_VERSION": "2.13.1+18e79e79-1"
}
3 changes: 3 additions & 0 deletions modules/zivid/_calibration/detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ def identifier(self):
def pose(self):
"""Get 3D pose of the marker.
The returned pose will be positioned at the center of the marker, and have an orientation such that its z-axis
points perpendicularly into the face of the marker.
Returns:
The Pose of the marker center (4x4 transformation matrix)
"""
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

# To be replaced by: from setuptools_scm import get_version
def get_version():
return "2.13.0"
return "2.13.1"


def _zivid_sdk_version():
return "2.13.0"
return "2.13.1"


def _zivid_python_version():
Expand Down
6 changes: 3 additions & 3 deletions test/test_data/marker_detection/expected_poses_1.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-0.996188,0.012585,0.086322,97.554245
-0.000475,0.988742,-0.149630,-49.818485
-0.087234,-0.149100,-0.984967,1097.975586
-0.996188,-0.012585,-0.086322,97.554245
-0.000475,-0.988742,0.149630,-49.818485
-0.087234,0.149100,0.984967,1097.975586
0.000000,0.000000,0.000000,1.000000
6 changes: 3 additions & 3 deletions test/test_data/marker_detection/expected_poses_2.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-0.187712,0.830468,-0.524488,172.941940
0.966205,0.060077,-0.250677,184.050980
-0.176669,-0.553818,-0.813679,1022.716431
-0.187712,-0.830468,0.524488,172.941940
0.966205,-0.060077,0.250677,184.050980
-0.176669,0.553818,0.813679,1022.716431
0.000000,0.000000,0.000000,1.000000
6 changes: 3 additions & 3 deletions test/test_data/marker_detection/expected_poses_3.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-0.997221,-0.039449,0.063202,-129.307327
-0.073562,0.655752,-0.751384,208.977020
-0.011803,-0.753945,-0.656832,982.244934
-0.997221,0.039449,-0.063202,-129.307327
-0.073562,-0.655752,0.751384,208.977020
-0.011803,0.753945,0.656832,982.244934
0.000000,0.000000,0.000000,1.000000
6 changes: 3 additions & 3 deletions test/test_data/marker_detection/expected_poses_4.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-0.051621,-0.732723,0.678566,-161.979538
-0.983619,-0.080204,-0.161432,-18.018311
0.172708,-0.675784,-0.716581,1018.047058
-0.051621,0.732723,-0.678566,-161.979538
-0.983619,0.080204,0.161432,-18.018311
0.172708,0.675784,0.716581,1018.047058
0.000000,0.000000,0.000000,1.000000

0 comments on commit 106f36a

Please sign in to comment.