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.

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

check for variants of baseline parameter in config #3

Merged
merged 1 commit into from
Feb 2, 2017

Conversation

MichaelGrupp
Copy link

There are config files that have the parameter string Baseline instead of BaseLine.
See http://calib.stereolabs.com/?SN=4353 for an example.

I included a fix that checks which variant of the baseline parameter is present and loads accordingly.

Furthermore, I marked the zed_cpu_ros_node as required in the launch file such that roslaunch kills all other nodes if an error occurs in this node.

@@ -277,10 +284,6 @@ class ZedCameraROS {
right_info.D[3] = p1;
right_info.D[4] = p2;

// Intrinsic camera matrix
// [fx 0 cx]
// K = [ 0 fy cy]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you recover my comments? just for other people to understand

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes of course! don't even remember why this was deleted 😄

left_info.R.fill(0.0);
right_info.R.fill(0.0);
cv::Mat rvec = (cv::Mat_<double>(3, 1) << rx, ry, rz);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

according to
stereolabs/zed-ros-wrapper#39

the rx, ry, rz is RX, RY and CV.
It says the image published by SDK is rectified, but doesn't mean from the USB VideoCapture is rectified, since ZED doesn't have any onboard processor.
So this rx ry rz is useful. Please recover this.

@willdzeng
Copy link
Owner

willdzeng commented Feb 2, 2017

Hi Micheal,
Thanks for you contribution.
Can you rebase all your commit into one for simplicity?
ref: https://www.atlassian.com/git/tutorials/rewriting-history

added accidentaly removed breaks again

reverted small formatting errors

(tab vs. space) reverted small formatting errors

fix deleted lines

check for variants of baseline parameter in config & require node in launchfile
@MichaelGrupp
Copy link
Author

Hey,

I did the changes. Please check :)

@willdzeng willdzeng merged commit ad69413 into willdzeng:master Feb 2, 2017
@willdzeng
Copy link
Owner

Great! Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants