From 0411d543b0ffbc7640afdd7af80a6c3f554f8db5 Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Fri, 29 Nov 2019 14:37:40 +0100
Subject: [PATCH] Made the maximum step duration 20 seconds for the CS1
controller. And changed the default values displayed in the fields
---
.../GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui | 4 ++--
.../GUI_Qt/flyingAgentGUI/src/csonecontrollertab.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui
index a67692b9..20626a71 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui
@@ -635,7 +635,7 @@
</font>
</property>
<property name="text">
- <string>0.2</string>
+ <string>0.016</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -662,7 +662,7 @@
</font>
</property>
<property name="text">
- <string>1.5</string>
+ <string>4.0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/csonecontrollertab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/csonecontrollertab.cpp
index 7ee1c19a..1c58ecd9 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/csonecontrollertab.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/csonecontrollertab.cpp
@@ -259,9 +259,9 @@ void CsoneControllerTab::on_perform_step_button_clicked()
temp_duration = 2.0;
ui->lineEdit_step_duration->setText(QString::number( temp_duration, 'f', 0));
}
- else if (temp_duration > 60.0)
+ else if (temp_duration > 20.0)
{
- temp_duration = 60.0;
+ temp_duration = 20.0;
ui->lineEdit_step_duration->setText(QString::number( temp_duration, 'f', 0));
}
// Update the global variable
--
GitLab