From 6927c48ea06bfb57a6aa04931fc846ca3f13c923 Mon Sep 17 00:00:00 2001
From: "simon.fanetti" <simon.fanetti@etu.hesge.ch>
Date: Tue, 1 Sep 2020 16:56:23 +0200
Subject: [PATCH] cleaning
---
Makefile | 16 ----------------
beamer_config.sh | 4 ++--
display_levels/display_levels.cpp | 6 ++----
3 files changed, 4 insertions(+), 22 deletions(-)
delete mode 100644 Makefile
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2815fd5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-API_PATH=../ar_sandbox_lib
-CFLAGS=-std=c++11 -Wall -Wextra -g
-CCP=g++
-
-all:
- $(MAKE) -C apps
-
-run:
- $(MAKE) run -C apps
-
-setup:
- $(API_PATH)/app/SandboxSetup/SandboxSetup
-
-clean:
- $(MAKE) clean -C apps
diff --git a/beamer_config.sh b/beamer_config.sh
index 4636773..fd8f111 100755
--- a/beamer_config.sh
+++ b/beamer_config.sh
@@ -1,8 +1,8 @@
SCREEN=DVI-D-0
SCN_RES=1920x1080
BEAMER=HDMI-0
-#BM_RES=1400x1050
-BM_RES=1024x768
+BM_RES=1400x1050
+#BM_RES=1024x768
xrandr --output $SCREEN --rate 60 --mode $SCN_RES --fb $SCN_RES --panning $SCN_RES* \
diff --git a/display_levels/display_levels.cpp b/display_levels/display_levels.cpp
index b0c6579..a4343d2 100644
--- a/display_levels/display_levels.cpp
+++ b/display_levels/display_levels.cpp
@@ -40,8 +40,6 @@ void displayLevels(Sandbox &sandbox, float top, float height){
cv::Mat1f new_depth = cv::Mat(depth_cache.size(), CV_32F);
cv::Mat3b colorized = cv::Mat(depth_cache.size(), CV_8UC3);
cv::Mat3b res = cv::Mat(depth_cache.size(), CV_8UC3);
-
- cv::Mat_<cv::Vec3b> img = cv::imread("index.png");
do{
sandbox.captureFrame();
@@ -52,9 +50,9 @@ void displayLevels(Sandbox &sandbox, float top, float height){
new_depth.copyTo( depth_cache, (cv::abs(depth_cache-new_depth) > DEPTH_MARGIN_ERROR/2) );
colorized = colorizeDepth(depth_cache, top, height);
- res = sandbox.adjustProjection(img, depth_cache);
+ res = sandbox.adjustProjection(colorized, depth_cache);
- //cv::cvtColor(res, res, CV_RGB2BGR);
+ cv::cvtColor(res, res, CV_RGB2BGR);
cv::imshow(windowName, res);
} while (cv::waitKey(10) != ESCAPE_CHAR);
--
GitLab