Skip to content
Snippets Groups Projects
Commit 1a97b8ec authored by Jake's avatar Jake
Browse files

Began adding env variables

parent 850e9a78
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@
#include <QThread>
#include <QTimer>
#include <QRegExp>
#include <QProcessEnvironment>
#include "wrappers.h"
#include "trackerworker.h"
......@@ -21,6 +22,9 @@ MainWindow::MainWindow(QWidget *parent) :
{
ui->setupUi(this);
/* Set up environment variables */
findChild<QLineEdit *>("socketPath")->setText(QProcessEnvironment::systemEnvironment().value("UCART_SOCKET"));
/* Create a thread for workers */
QThread* workerThread = new QThread(this);
......@@ -257,7 +261,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());
......@@ -282,3 +286,7 @@ void MainWindow::on_pbDeleteSetpoint_clicked()
setpointList->removeRow(findChild<QListView *>("setpointList")->currentIndex().row());
}
}
void MainWindow::on_socketPath_returnPressed()
{
}
......@@ -56,6 +56,8 @@ private slots:
void on_pbDeleteSetpoint_clicked();
void on_socketPath_returnPressed();
private:
Ui::MainWindow *ui;
pid_t backendPid;
......
......@@ -18,24 +18,45 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="backend">
<attribute name="title">
<string>Backend</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="socketPathLabel">
<property name="text">
<string>UCART_SOCKET_PATH</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="socketPath"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QPushButton" name="chooseBackend">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Choose Backend</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="backendPath_2"/>
<widget class="QLineEdit" name="backendPath_2">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
......@@ -591,6 +612,9 @@
<property name="dragEnabled">
<bool>true</bool>
</property>
<property name="dragDropOverwriteMode">
<bool>false</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::InternalMove</enum>
</property>
......
......@@ -32,6 +32,6 @@ void TrackerWorker::process()
struct frontend_tracker_data td;
frontend_track(conn, &td);
emit finished(td.height, td.lateral, td.longitudinal, td.pitch, td.roll, td.yaw);
emit finished(td.longitudinal, td.lateral, td.height, td.pitch, td.roll, td.yaw);
}
}
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