From da9daa3bf82c876fd4a070ddd82b1d4308b31b5f Mon Sep 17 00:00:00 2001
From: "simon.fanetti" <simon.fanetti@etu.hesge.ch>
Date: Tue, 28 Apr 2020 20:11:06 +0200
Subject: [PATCH] fixe config stage
---
export.sh | 4 ++--
includes/calibrate.h | 3 +++
src/core/components/camera.cpp | 2 +-
src/sandbox.cpp | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/export.sh b/export.sh
index 9798966..e8758b0 100644
--- a/export.sh
+++ b/export.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-## Unsable script for now
-## LD_LIBRARY_PATH must contains dir's path to libsandbox.so
+## Usable script for now
+## LD_LIBRARY_PATH must contain dir's path to libsandbox.so
## Do the cmd in your terminal
REALTIVE_PATH_TO_SO=../ar_sandbox_lib && \
diff --git a/includes/calibrate.h b/includes/calibrate.h
index b4e690c..0715824 100644
--- a/includes/calibrate.h
+++ b/includes/calibrate.h
@@ -21,6 +21,9 @@ public:
{
matRotation = matrix.clone();
}
+ cv::Mat getMatrixRotation(){
+ return matRotation.clone();
+ }
void setDistancePlan(float distance)
{
distancePlan = distance;
diff --git a/src/core/components/camera.cpp b/src/core/components/camera.cpp
index ce694e1..0e98056 100644
--- a/src/core/components/camera.cpp
+++ b/src/core/components/camera.cpp
@@ -71,7 +71,7 @@ void Camera::captureFramesAlign()
// Trying to get color and aligned depth frames
rs2::video_frame color_frame = frameset.get_color_frame();
rs2::depth_frame depth_frame = frameset.get_depth_frame();
- //filterDepthFrame(depth_frame);
+ filterDepthFrame(depth_frame);
matDepth = Mat(Size(depth_frame.get_width(), depth_frame.get_height()), CV_16UC1, (void *)depth_frame.get_data(), Mat::AUTO_STEP);
Mat(Size(color_frame.get_width(), color_frame.get_height()), CV_8UC3, (void *)color_frame.get_data(), Mat::AUTO_STEP).copyTo(matRGB);
}
diff --git a/src/sandbox.cpp b/src/sandbox.cpp
index 040ccfe..25f0a6e 100644
--- a/src/sandbox.cpp
+++ b/src/sandbox.cpp
@@ -1,7 +1,7 @@
#include "../includes/sandbox.h"
Sandbox::Sandbox(){
- //controller = Controller();
+ controller = Controller();
}
cv::Mat Sandbox::getRGBFrame(){
--
GitLab