Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MicroCART
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Distributed Autonomous Networked Control Lab
MicroCART
Commits
e4d703a2
Commit
e4d703a2
authored
7 years ago
by
Jake
Browse files
Options
Downloads
Patches
Plain Diff
Added control graph warnings
parent
1a97b8ec
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
groundStation/gui/MicroCART/mainwindow.cpp
+2
-0
2 additions, 0 deletions
groundStation/gui/MicroCART/mainwindow.cpp
groundStation/gui/MicroCART/mainwindow.ui
+35
-3
35 additions, 3 deletions
groundStation/gui/MicroCART/mainwindow.ui
with
37 additions
and
3 deletions
groundStation/gui/MicroCART/mainwindow.cpp
+
2
−
0
View file @
e4d703a2
...
@@ -157,6 +157,8 @@ void MainWindow::newNodes(QStringList blocks)
...
@@ -157,6 +157,8 @@ void MainWindow::newNodes(QStringList blocks)
QComboBox
*
select
=
findChild
<
QComboBox
*>
(
"nodeSelect"
);
QComboBox
*
select
=
findChild
<
QComboBox
*>
(
"nodeSelect"
);
select
->
clear
();
/* Hopefully this clears the list */
select
->
clear
();
/* Hopefully this clears the list */
select
->
addItems
(
blocks
);
select
->
addItems
(
blocks
);
this
->
findChild
<
QLabel
*>
(
"noGraphWarning1"
)
->
setEnabled
(
true
);
this
->
findChild
<
QLabel
*>
(
"noGraphWarning2"
)
->
setEnabled
(
true
);
}
}
...
...
This diff is collapsed.
Click to expand it.
groundStation/gui/MicroCART/mainwindow.ui
+
35
−
3
View file @
e4d703a2
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
874
</width>
<width>
874
</width>
<height>
5
6
6
</height>
<height>
5
9
6
</height>
</rect>
</rect>
</property>
</property>
<property
name=
"windowTitle"
>
<property
name=
"windowTitle"
>
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<item>
<item>
<widget
class=
"QTabWidget"
name=
"tabWidget"
>
<widget
class=
"QTabWidget"
name=
"tabWidget"
>
<property
name=
"currentIndex"
>
<property
name=
"currentIndex"
>
<number>
2
</number>
<number>
0
</number>
</property>
</property>
<widget
class=
"QWidget"
name=
"backend"
>
<widget
class=
"QWidget"
name=
"backend"
>
<attribute
name=
"title"
>
<attribute
name=
"title"
>
...
@@ -35,7 +35,11 @@
...
@@ -35,7 +35,11 @@
</widget>
</widget>
</item>
</item>
<item
row=
"0"
column=
"1"
>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QLineEdit"
name=
"socketPath"
/>
<widget
class=
"QLineEdit"
name=
"socketPath"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
</widget>
</item>
</item>
</layout>
</layout>
</item>
</item>
...
@@ -297,6 +301,34 @@
...
@@ -297,6 +301,34 @@
<string>
Navigation
</string>
<string>
Navigation
</string>
</attribute>
</attribute>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_3"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_3"
>
<item>
<widget
class=
"QLabel"
name=
"noGraphWarning1"
>
<property
name=
"font"
>
<font>
<pointsize>
32
</pointsize>
<weight>
75
</weight>
<bold>
true
</bold>
<underline>
true
</underline>
</font>
</property>
<property
name=
"text"
>
<string>
NO CONTROL GRAPH LOADED!
</string>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignCenter
</set>
</property>
</widget>
</item>
<item>
<widget
class=
"QLabel"
name=
"noGraphWarning2"
>
<property
name=
"text"
>
<string>
These controls won't work right unless the correct control graph is loaded.
</string>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignCenter
</set>
</property>
</widget>
</item>
<item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_3"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_3"
>
<item>
<item>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment