diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp index 43296fab625d9128d1657c6607cb45310a9c28e8..0e3863a5019e814a9e17691595950a6339d490d3 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 bb0b008e42b08009fb6b22acccf9871ccdfbede4..bb89570dd2209ab2246714995e0c0b2485d4d580 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>