From 850e9a78b1fe7c4854e72b62234319dd5c15a4fd Mon Sep 17 00:00:00 2001
From: Jake <j@kedrahos.com>
Date: Tue, 11 Apr 2017 16:28:10 -0500
Subject: [PATCH] Waypoint list behavioral changes
---
groundStation/gui/MicroCART/mainwindow.cpp | 6 +++---
groundStation/gui/MicroCART/mainwindow.ui | 8 +++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 43296fab6..0e3863a50 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -235,9 +235,9 @@ void MainWindow::sendSetpoints()
void MainWindow::on_pbAppendSetpoint_clicked()
{
- QString str("<" + findChild<QLineEdit *>("xSetpoint")->text() + ", "+
+ QString str("[" + findChild<QLineEdit *>("xSetpoint")->text() + ", "+
findChild<QLineEdit *>("ySetpoint")->text() + ", " +
- findChild<QLineEdit *>("zSetpoint")->text() + ">");
+ findChild<QLineEdit *>("zSetpoint")->text() + "]");
setpointList->appendRow(new QStandardItem(str));
}
@@ -257,7 +257,7 @@ void MainWindow::on_pbNextSetpoint_clicked()
void MainWindow::sendSelectedSetpoint()
{
if (findChild<QListView *>("setpointList")->currentIndex().isValid()) {
- QRegExp regex("<(.*), (.*), (.*)>");
+ QRegExp regex("\[(.*), (.*), (.*)\]");
int row = findChild<QListView *>("setpointList")->currentIndex().row();
regex.indexIn(setpointList->item(row)->text());
diff --git a/groundStation/gui/MicroCART/mainwindow.ui b/groundStation/gui/MicroCART/mainwindow.ui
index bb0b008e4..bb89570dd 100644
--- a/groundStation/gui/MicroCART/mainwindow.ui
+++ b/groundStation/gui/MicroCART/mainwindow.ui
@@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="backend">
<attribute name="title">
@@ -566,6 +566,12 @@
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QLabel" name="label_8">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Waypoints</string>
</property>
--
GitLab