diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp index 7846be25d4b7b4cf9f58bf2b917c0fc28c107ee9..b4fbee5827cf49377a4591c60ec215542902994c 100644 --- a/groundStation/gui/MicroCART/mainwindow.cpp +++ b/groundStation/gui/MicroCART/mainwindow.cpp @@ -26,9 +26,6 @@ MainWindow::MainWindow(QWidget *parent) : /* Set up environment variables */ findChild<QLineEdit *>("socketPath")->setText(QProcessEnvironment::systemEnvironment().value("UCART_SOCKET")); - /* Idiot lights */ - findChild<QLabel *>("noGraphWarning1")->setStyleSheet("QLabel {color : red; }"); - /* Create a thread for workers */ QThread* workerThread = new QThread(this); @@ -119,6 +116,7 @@ void MainWindow::updateTracker(float x, float y, float z, float p, float r, floa void MainWindow::on_pbStart_clicked() { + QProcessEnvironment::systemEnvironment().insert("UCART_SOCKET", findChild<QLineEdit *>("socketPath")->text()); this->backendPid = startBackend(findChild<QLineEdit *>("backendPath")->text().toStdString().c_str(), &backendPipe); findChild<QPushButton *>("pbStart")->setEnabled(false); findChild<QPushButton *>("pbStop")->setEnabled(true); @@ -127,6 +125,7 @@ void MainWindow::on_pbStart_clicked() void MainWindow::on_pbConnect_clicked() { + QProcessEnvironment::systemEnvironment().insert("UCART_SOCKET", findChild<QLineEdit *>("socketPath")->text()); findChild<QPushButton *>("pbStart")->setEnabled(false); findChild<QPushButton *>("pbConnect")->setEnabled(false); findChild<QPushButton *>("pbStop")->setEnabled(true); @@ -299,8 +298,3 @@ void MainWindow::newControlGraph(QString graph) { findChild<QLabel *>("graphImage")->setPixmap(QPixmap(graph)); } - -void MainWindow::on_socketPath_returnPressed() -{ - QProcessEnvironment::systemEnvironment().insert("UCART_SOCKET", findChild<QLineEdit *>("socketPath")->text()); -} diff --git a/groundStation/gui/MicroCART/mainwindow.h b/groundStation/gui/MicroCART/mainwindow.h index 95d901e51acbd7bc63ae6b306c03da33008243d4..8e7d0351e91da987d18ea7a1c08250694bbbb266 100644 --- a/groundStation/gui/MicroCART/mainwindow.h +++ b/groundStation/gui/MicroCART/mainwindow.h @@ -57,8 +57,6 @@ private slots: void on_pbDeleteSetpoint_clicked(); - void on_socketPath_returnPressed(); - private: Ui::MainWindow *ui; pid_t backendPid; diff --git a/groundStation/gui/MicroCART/mainwindow.ui b/groundStation/gui/MicroCART/mainwindow.ui index 16d9d4abf2df3a24cd26a0a78f98d6b123fd32c4..d2a155240b54e69ef447cc7e5ba1e4279892b66b 100644 --- a/groundStation/gui/MicroCART/mainwindow.ui +++ b/groundStation/gui/MicroCART/mainwindow.ui @@ -37,7 +37,7 @@ <item row="0" column="1"> <widget class="QLineEdit" name="socketPath"> <property name="enabled"> - <bool>true</bool> + <bool>false</bool> </property> </widget> </item>