Skip to content
Snippets Groups Projects
Commit 850e9a78 authored by Jake's avatar Jake
Browse files

Waypoint list behavioral changes

parent 51bec53a
No related branches found
No related tags found
No related merge requests found
......@@ -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());
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment