From 83137324208c728c02682b5dbde0ff8dbbececac Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Mon, 9 Apr 2018 15:26:11 +0200
Subject: [PATCH] small fix
---
.../src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
index 0f4625d4..d86a3dd0 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
@@ -712,8 +712,8 @@ Setpoint MainWindow::correctSetpointBox(Setpoint setpoint, CrazyflieContext cont
corrected_setpoint = setpoint;
float x_size = context.localArea.xmax - context.localArea.xmin;
- float y_size = context.localArea.xmax - context.localArea.xmin;
- float z_size = context.localArea.xmax - context.localArea.xmin;
+ float y_size = context.localArea.ymax - context.localArea.ymin;
+ float z_size = context.localArea.zmax - context.localArea.zmin;
if(setpoint.x > x_size/2)
corrected_setpoint.x = x_size/2;
@@ -736,8 +736,8 @@ bool MainWindow::setpointInsideBox(Setpoint setpoint, CrazyflieContext context)
{
float x_size = context.localArea.xmax - context.localArea.xmin;
- float y_size = context.localArea.xmax - context.localArea.xmin;
- float z_size = context.localArea.xmax - context.localArea.xmin;
+ float y_size = context.localArea.ymax - context.localArea.ymin;
+ float z_size = context.localArea.zmax - context.localArea.zmin;
//position check
if((setpoint.x < -x_size/2) or (setpoint.x > x_size/2)) {
ROS_INFO_STREAM("x outside safety box");
--
GitLab