Skip to content
Snippets Groups Projects
Commit 5b80f3fd authored by simon.fanetti's avatar simon.fanetti
Browse files

change default param in CameraFocus

parent 5d843966
No related branches found
No related tags found
No related merge requests found
......@@ -125,7 +125,7 @@
<item row="1" column="2">
<widget class="QSpinBox" name="sbxBrightness">
<property name="minimum">
<number>-255</number>
<number>-65025</number>
</property>
<property name="maximum">
<number>255</number>
......@@ -253,7 +253,7 @@
<number>0</number>
</property>
<property name="maximum">
<number>500</number>
<number>300</number>
</property>
<property name="value">
<number>100</number>
......@@ -344,7 +344,7 @@
<item row="1" column="1">
<widget class="QSlider" name="sldBrightness">
<property name="minimum">
<number>-255</number>
<number>-765</number>
</property>
<property name="maximum">
<number>255</number>
......
......@@ -84,7 +84,9 @@ int Beamer::findBeamerFrom(Camera *camera){
cv::Point3f Beamer::deprojectPixel(cv::Point3i circle, cv::Mat *depth, Camera *camera){
float coord[2] = {(float)circle.x, (float)circle.y};
float z = static_cast<float>(depth->at<uint16_t>(circle.y, circle.x));
return camera->deprojectPixelToPoint(coord, z / 1000.0);
// rs2.get_depth_frame().get_units()
float depth_unit = 1 / 1000.0;
return camera->deprojectPixelToPoint(coord, z * depth_unit);
}
void Beamer::findLinearLineFrom(std::vector<cv::Point3f> *capturedPoints, std::vector<cv::Point3d> *bases, std::vector<cv::Point3d> *directions){
......
......@@ -61,7 +61,9 @@ void Camera::capture(){
rs2::video_frame color_frame = frameset.get_color_frame();
rs2::depth_frame depth_frame = frameset.get_depth_frame();
filterDepthFrame(depth_frame);
// intrinsics.model : Brown Conrady
matDepth = cv::Mat(cv::Size(depth_frame.get_width(), depth_frame.get_height()), CV_16UC1, (void *)depth_frame.get_data(), cv::Mat::AUTO_STEP);
// depth_frame.get_distance(x,y) == ((float)matDepth.at<uint16_t>(y, x) * depth_frame.get_units())
cv::Mat(cv::Size(color_frame.get_width(), color_frame.get_height()), CV_8UC3, (void *)color_frame.get_data(), cv::Mat::AUTO_STEP).copyTo(matRGB);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment