Skip to content
Snippets Groups Projects
Commit 311d5e9c authored by Jake Drahos's avatar Jake Drahos
Browse files

Began adding control graph tab

parent f17cf020
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
groundStation/gui/MicroCART/MicroCART.pro
+ 4
− 2
View file @ 311d5e9c
...@@ -17,10 +17,12 @@ INCLUDEPATH += ../../src/frontend/ ...@@ -17,10 +17,12 @@ INCLUDEPATH += ../../src/frontend/
SOURCES += main.cpp\ SOURCES += main.cpp\
mainwindow.cpp \ mainwindow.cpp \
wrappers.c \ wrappers.c \
trackerworker.cpp trackerworker.cpp \
controlworker.cpp
HEADERS += mainwindow.h \ HEADERS += mainwindow.h \
wrappers.h \ wrappers.h \
trackerworker.h trackerworker.h \
controlworker.h
FORMS += mainwindow.ui FORMS += mainwindow.ui
groundStation/gui/MicroCART/MicroCART.pro.user
+ 1
− 1
View file @ 311d5e9c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.2.2, 2017-03-06T11:03:28. --> <!-- Written by QtCreator 3.2.2, 2017-03-24T14:09:55. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
......
groundStation/gui/MicroCART/controlworker.cpp 0 → 100644
+ 6
− 0
View file @ 311d5e9c
#include "controlworker.h"
controlworker::controlworker(QObject *parent) :
QObject(parent)
{
}
groundStation/gui/MicroCART/controlworker.h 0 → 100644
+ 23
− 0
View file @ 311d5e9c
#ifndef CONTROLWORKER_H
#define CONTROLWORKER_H
#include <QObject>
#include "frontend_common.h"
class controlworker : public QObject
{
Q_OBJECT
public:
explicit controlworker(QObject *parent = 0);
signals:
public slots:
private:
struct backend_conn * conn;
};
#endif // CONTROLWORKER_H
groundStation/gui/MicroCART/mainwindow.ui
+ 154
− 10
View file @ 311d5e9c
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>652</width> <width>798</width>
<height>454</height> <height>581</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>0</x>
<y>10</y> <y>10</y>
<width>461</width> <width>801</width>
<height>341</height> <height>471</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="backend"> <widget class="QWidget" name="backend">
<attribute name="title"> <attribute name="title">
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>451</width> <width>761</width>
<height>296</height> <height>341</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
...@@ -50,6 +50,9 @@ ...@@ -50,6 +50,9 @@
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="pbStart"> <widget class="QPushButton" name="pbStart">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Start</string> <string>Start</string>
</property> </property>
...@@ -65,6 +68,19 @@ ...@@ -65,6 +68,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QPushButton" name="pbStop"> <widget class="QPushButton" name="pbStop">
<property name="enabled"> <property name="enabled">
...@@ -228,12 +244,140 @@ ...@@ -228,12 +244,140 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="controlGraph">
<attribute name="title">
<string>Controller Graph</string>
</attribute>
<widget class="QWidget" name="verticalLayoutWidget_2">
<property name="geometry">
<rect>
<x>9</x>
<y>9</y>
<width>771</width>
<height>421</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="graphImage">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Node:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="nodeSelect">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Param:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="paramSelect"/>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Value:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="paramValue">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QPushButton" name="pbControlRefresh">
<property name="text">
<string>Refresh Controller Graph</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</widget> </widget>
<widget class="QPushButton" name="pbRefresh"> <widget class="QPushButton" name="pbRefresh">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>350</y> <y>480</y>
<width>88</width> <width>88</width>
<height>34</height> <height>34</height>
</rect> </rect>
...@@ -248,7 +392,7 @@ ...@@ -248,7 +392,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>652</width> <width>798</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment