From 52fa2fc92bfb5102adb636f33956ffadf681b4b1 Mon Sep 17 00:00:00 2001
From: Jake <j@kedrahos.com>
Date: Sun, 9 Apr 2017 17:42:46 -0500
Subject: [PATCH] Setpoint choosers are working
---
groundStation/gui/MicroCART/controlworker.cpp | 1 +
groundStation/gui/MicroCART/mainwindow.ui | 26 +++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/groundStation/gui/MicroCART/controlworker.cpp b/groundStation/gui/MicroCART/controlworker.cpp
index 31bce2635..866c3656a 100644
--- a/groundStation/gui/MicroCART/controlworker.cpp
+++ b/groundStation/gui/MicroCART/controlworker.cpp
@@ -43,6 +43,7 @@ void ControlWorker::getNodes()
}
frontend_free_node_data(nd, num_nodes);
emit(gotNodes(nodes));
+ emit(gotConstantBlocks(const_block_nodes));
}
}
diff --git a/groundStation/gui/MicroCART/mainwindow.ui b/groundStation/gui/MicroCART/mainwindow.ui
index f278a0d3f..2c3a8a8b8 100644
--- a/groundStation/gui/MicroCART/mainwindow.ui
+++ b/groundStation/gui/MicroCART/mainwindow.ui
@@ -243,6 +243,19 @@
</item>
</layout>
</widget>
+ <widget class="QPushButton" name="pbRefresh">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>400</y>
+ <width>88</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Refresh</string>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="controlGraph">
<attribute name="title">
@@ -419,19 +432,6 @@
</widget>
</widget>
</widget>
- <widget class="QPushButton" name="pbRefresh">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>480</y>
- <width>88</width>
- <height>34</height>
- </rect>
- </property>
- <property name="text">
- <string>Refresh</string>
- </property>
- </widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
--
GitLab